diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 20be2002402..2300ee9c000 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -221,6 +221,16 @@ rec {
   isDerivation = x: isAttrs x && x ? type && x.type == "derivation";
 
 
+  /* Convert a store path to a fake derivation. */
+  toDerivation = path:
+    let path' = builtins.storePath path; in
+    { type = "derivation";
+      name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path'));
+      outPath = path';
+      outputs = [ "out" ];
+    };
+
+
   /* If the Boolean `cond' is true, return the attribute set `as',
      otherwise an empty attribute set. */
   optionalAttrs = cond: as: if cond then as else {};
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f4cd203e41d..c490b9ee979 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -151,6 +151,7 @@
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
   magnetophon = "Bart Brouns <bart@magnetophon.nl>";
   mahe = "Matthias Herrmann <matthias.mh.herrmann@gmail.com>";
+  makefu = "Felix Richter <makefu@syntax-fehler.de>";
   malyn = "Michael Alyn Miller <malyn@strangeGizmo.com>";
   manveru = "Michael Fellinger <m.fellinger@gmail.com>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
diff --git a/lib/strings.nix b/lib/strings.nix
index bac03c9d7ad..e72bdc6d968 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -218,4 +218,9 @@ rec {
 
   # Format a number adding leading zeroes up to fixed width.
   fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
+
+
+  # Check whether a value is a store path.
+  isStorePath = x: builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == builtins.storeDir;
+
 }
diff --git a/lib/types.nix b/lib/types.nix
index 49f24b022de..a7f9bf1946e 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -94,14 +94,16 @@ rec {
     # derivation is a reserved keyword.
     package = mkOptionType {
       name = "derivation";
-      check = isDerivation;
-      merge = mergeOneOption;
+      check = x: isDerivation x || isStorePath x;
+      merge = loc: defs:
+        let res = mergeOneOption loc defs;
+        in if isDerivation res then res else toDerivation res;
     };
 
     path = mkOptionType {
       name = "path";
       # Hacky: there is no ‘isPath’ primop.
-      check = x: builtins.unsafeDiscardStringContext (builtins.substring 0 1 (toString x)) == "/";
+      check = x: builtins.substring 0 1 (toString x) == "/";
       merge = mergeOneOption;
     };
 
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index 6d93dc5c009..ea5d1241876 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -106,6 +106,15 @@ options = {
     </listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>types.package</varname></term>
+    <listitem>
+      <para>A derivation (such as <literal>pkgs.hello</literal>) or a
+      store path (such as
+      <filename>/nix/store/1ifi1cfbfs5iajmvwgrbmrnrw3a147h9-hello-2.10</filename>).</para>
+    </listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>types.listOf</varname> <replaceable>t</replaceable></term>
     <listitem>
@@ -138,4 +147,4 @@ You can also create new types using the function
 <varname>mkOptionType</varname>.  See
 <filename>lib/types.nix</filename> in Nixpkgs for details.</para>
 
-</section>
\ No newline at end of file
+</section>
diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
new file mode 100644
index 00000000000..b2676b05a02
--- /dev/null
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -0,0 +1,81 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.system.autoUpgrade; in
+
+{
+
+  options = {
+
+    system.autoUpgrade = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to periodically upgrade NixOS to the latest
+          version. If enabled, a systemd timer will run
+          <literal>nixos-rebuild switch --upgrade</literal> once a
+          day.
+        '';
+      };
+
+      channel = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = https://nixos.org/channels/nixos-14.12-small;
+        description = ''
+          The URI of the NixOS channel to use for automatic
+          upgrades. By default, this is the channel set using
+          <command>nix-channel</command> (run <literal>nix-channel
+          --list</literal> to see the current value).
+        '';
+      };
+
+      flags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "-I" "stuff=/home/alice/nixos-stuff" "--option" "extra-binary-caches" "http://my-cache.example.org/" ];
+        description = ''
+          Any additional flags passed to <command>nixos-rebuild</command>.
+        '';
+      };
+
+    };
+
+  };
+
+  config = {
+
+    system.autoUpgrade.flags =
+      [ "--no-build-output" ]
+      ++ (if cfg.channel == null
+          then [ "--upgrade" ]
+          else [ "-I" "nixpkgs=${cfg.channel}/nixexprs.tar.xz" ]);
+
+    systemd.services.nixos-upgrade = {
+      description = "NixOS Upgrade";
+
+      restartIfChanged = false;
+      unitConfig.X-StopOnRemoval = false;
+
+      serviceConfig.Type = "oneshot";
+
+      environment = config.nix.envVars //
+        { inherit (config.environment.sessionVariables) NIX_PATH SSL_CERT_FILE;
+          HOME = "/root";
+        };
+
+      path = [ pkgs.gnutar pkgs.xz config.nix.package ];
+
+      script = ''
+        ${config.system.build.nixos-rebuild}/bin/nixos-rebuild test ${toString cfg.flags}
+      '';
+
+      startAt = mkIf cfg.enable "04:40";
+    };
+
+  };
+
+}
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 61744c39d60..04e4c1eb945 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -57,7 +57,9 @@ let
 in
 
 {
+
   config = {
+
     environment.systemPackages =
       [ nixos-build-vms
         nixos-install
@@ -70,5 +72,7 @@ in
     system.build = {
       inherit nixos-install nixos-generate-config nixos-option nixos-rebuild;
     };
+
   };
+
 }
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 409f2292087..93d378aa95f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -41,6 +41,7 @@
   ./hardware/video/bumblebee.nix
   ./hardware/video/nvidia.nix
   ./hardware/video/ati.nix
+  ./installer/tools/auto-upgrade.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index 3b18ae129b9..c353da227ae 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -7,6 +7,8 @@ with lib;
 
 {
   environment.noXlibs = mkDefault true;
-  i18n.supportedLocales = [ config.i18n.defaultLocale ];
+
+  # This isn't perfect, but let's expect the user specifies an UTF-8 defaultLocale
+  i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];
   services.nixosManual.enable = mkDefault false;
 }
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 68f26eefe27..7d70a3d05fa 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -86,8 +86,7 @@ rec {
       wantedBy = [ "multi-user.target" ];
       environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted}/lib/python2.7/site-packages/:.";
       preStart = ''
-        if [ ! -d ${cfg.varPath}/ ] ; then 
-            mkdir -p ${cfg.pidPath}
+        if [ ! -d ${cfg.varPath}/ ] ; then
             mkdir -p ${cfg.logPath}/tty
             mkdir -p ${cfg.logPath}/dl
             mkdir -p ${cfg.varPath}/keys
@@ -97,12 +96,15 @@ rec {
             cp ${pkgs.kippo}/src/txtcmds ${cfg.varPath} -r
 
             chmod u+rw ${cfg.varPath} -R
-            chmod u+rw ${cfg.pidPath}
             chown kippo.kippo ${cfg.varPath} -R
-            chown kippo.kippo ${cfg.pidPath}
             chown kippo.kippo ${cfg.logPath} -R
             chmod u+rw ${cfg.logPath} -R
         fi
+        if [ ! -d ${cfg.pidPath}/ ] ; then
+            mkdir -p ${cfg.pidPath}
+            chmod u+rw ${cfg.pidPath}
+            chown kippo.kippo ${cfg.pidPath}
+        fi
       '';
 
       serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 4289740322a..655fbab2a84 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -97,7 +97,7 @@ sub parseFstab {
 sub parseUnit {
     my ($filename) = @_;
     my $info = {};
-    parseKeyValues($info, read_file($filename));
+    parseKeyValues($info, read_file($filename)) if -f $filename;
     parseKeyValues($info, read_file("${filename}.d/overrides.conf")) if -f "${filename}.d/overrides.conf";
     return $info;
 }
@@ -157,7 +157,8 @@ while (my ($unit, $state) = each %{$activePrev}) {
 
     if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
         if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") {
-            $unitsToStop{$unit} = 1;
+            my $unitInfo = parseUnit($prevUnitFile);
+            $unitsToStop{$unit} = 1 if boolIsTrue($unitInfo->{'X-StopOnRemoval'} // "yes");
         }
 
         elsif ($unit =~ /\.target$/) {
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 712b3df9f25..011f4f15f5d 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,32 +1,61 @@
-{ stdenv, fetchFromGitHub, alsaLib, cmake, fftw
-, freeglut, libjack2, libXmu, qt4 }:
+# FIXME: upgrading qt5Full (Qt 5.3) to qt5.{base,multimedia} (Qt 5.4) breaks
+# the default Qt audio capture source!
+{ stdenv, fetchFromGitHub, fftw, freeglut, qt5Full
+, alsaSupport ? false, alsaLib ? null
+, jackSupport ? false, libjack2 ? null }:
 
-let version = "1.0.0"; in
+assert alsaSupport -> alsaLib != null;
+assert jackSupport -> libjack2 != null;
+
+let version = "1.0.5"; in
 stdenv.mkDerivation {
   name = "fmit-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "13y9csv34flz7065kg69h99hd7d9zskq12inmkf34l4qjyk7c185";
+    sha256 = "1p49ykg7mf62xrn08fqss8yr1nf53mm8w9zp2sgcy48bfsa9xbpy";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ alsaLib fftw freeglut libjack2 libXmu qt4 ];
-  nativeBuildInputs = [ cmake ];
+  buildInputs = [ fftw freeglut qt5Full ]
+    ++ stdenv.lib.optional alsaSupport [ alsaLib ]
+    ++ stdenv.lib.optional jackSupport [ libjack2 ];
+
+  postPatch = ''
+    substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
+    substituteInPlace distrib/fmit.desktop \
+      --replace "Icon=fmit" "Icon=$out/share/pixmaps/fmit.svg"
+    substituteInPlace src/main.cpp --replace "PREFIX" "\"$out\""
+  '';
+
+  configurePhase = ''
+    qmake \
+      CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \
+      CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \
+      fmit.pro
+  '';
 
   enableParallelBuilding = true;
 
+  installPhase = ''
+    install -D fmit $out/bin/fmit
+    install -Dm644 distrib/fmit.desktop $out/share/applications/fmit.desktop
+    install -Dm644 ui/images/fmit.svg $out/share/pixmaps/fmit.svg
+    mkdir -p $out/share/fmit
+    cp -R tr $out/share/fmit
+  '';
+
   meta = with stdenv.lib; {
     inherit version;
     description = "Free Musical Instrument Tuner";
     longDescription = ''
-      FMIT is a graphical utility for tuning your musical instruments, with
-      error and volume history and advanced features.
+      FMIT is a graphical utility for tuning musical instruments, with error
+      and volume history, and advanced features.
     '';
     homepage = http://gillesdegottex.github.io/fmit/;
     license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index c2d32ea3dad..56db4e8352e 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "pamixer-${version}";
-  version = "1.2.1";
+  version = "1.3";
 
   src = fetchurl {
     url = "https://github.com/cdemoulins/pamixer/archive/${version}.tar.gz";
-    sha256 = "1ad6b46hh02hs1978pgihrm2bnq4z2v0imrfm3wy74xdkr6xjxy4";
+    sha256 = "091676ww4jbf4jr728gjfk7fkd5nisy70mr6f3s1p7n05hjpmfjx";
   };
 
   buildInputs = [ boost libpulseaudio ];
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 7f4373c41ba..2f8848ca0dd 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, emacs, texinfo }:
+{ stdenv, fetchFromGitHub, emacs, texinfo }:
 
 let
-  version = "13.10";
+  version = "13.14-130-ga03bd9b";      # git describe --tags
 in
 stdenv.mkDerivation {
   name = "haskell-mode-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/haskell/haskell-mode/archive/v${version}.tar.gz";
-    sha256 = "0hcg7wpalcdw8j36m8vd854zrrgym074r7m903rpwfrhx9mlg02b";
+  src = fetchFromGitHub {
+    owner = "haskell";
+    repo = "haskell-mode";
+    rev = "v${version}";
+    sha256 = "0k4jfixzsvwpsz37f2pvbr9slz8fpcd9nwddcv2bvi4x20jp11ma";
   };
 
   buildInputs = [ emacs texinfo ];
 
-  makeFlags = "VERSION=${version} GIT_VERSION=${version}";
+  makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
 
   installPhase = ''
     mkdir -p $out/share/emacs/site-lisp
@@ -22,6 +24,11 @@ stdenv.mkDerivation {
     cp -v *.info* $out/share/info/
   '';
 
+  # The test suite must run *after* copying the generated files to $out
+  # because "make check" implies "make clean".
+  doInstallCheck = true;
+  installCheckTarget = "check";
+
   meta = {
     homepage = "http://github.com/haskell/haskell-mode";
     description = "Haskell mode for Emacs";
diff --git a/pkgs/applications/editors/emacs-modes/haskell/git.nix b/pkgs/applications/editors/emacs-modes/haskell/git.nix
deleted file mode 100644
index 20de1cae4d3..00000000000
--- a/pkgs/applications/editors/emacs-modes/haskell/git.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, texinfo }:
-
-let
-  version = "13.10-361-gfa09425";      # git describe --tags
-in
-stdenv.mkDerivation {
-  name = "haskell-mode-${version}";
-
-  src = fetchFromGitHub {
-    owner = "haskell";
-    repo = "haskell-mode";
-    rev = "v${version}";
-    sha256 = "1bq4gddzwjy2w1hbsmwxcamcy87amz7ksy1vmpwg0qij88fk4av9";
-  };
-
-  buildInputs = [ emacs texinfo ];
-
-  makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    cp *.el *.elc *.hs $out/share/emacs/site-lisp/
-    mkdir -p $out/share/info
-    cp -v *.info* $out/share/info/
-  '';
-
-  # The test suite must run *after* copying the generated files to $out
-  # because "make check" implies "make clean".
-  doInstallCheck = true;
-  installCheckTarget = "check";
-
-  meta = {
-    homepage = "http://github.com/haskell/haskell-mode";
-    description = "Haskell mode for Emacs";
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}
diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
index d57c591ec1e..e0057fd30ce 100644
--- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
@@ -1,4 +1,4 @@
-{trivialBuild, lib, fetchFromGitHub}:
+{lib, trivialBuild, fetchFromGitHub}:
 
 trivialBuild rec {
   pname    = "nyan-mode";
@@ -23,9 +23,8 @@ trivialBuild rec {
     cp -r mus $out
   '';
 
-  meta = with lib; {
+  meta = {
     description = "An analog indicator of the position in the buffer";
-    homepage = https://github.com/TeMPOraL/nyan-mode/;
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index b447b235bfa..1276e4754eb 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -2,11 +2,11 @@
 , texLiveAggregationFun }:
 
 stdenv.mkDerivation rec {
-  name = "org-8.3";
+  name = "org-8.3.1";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "0yqbl232hfppljz545jbjawwaw7qjdjsq97c0wf0cbkghgpln3wy";
+    sha256 = "0cn3k02b2dhp489rrlaz4g91h0ph99a7721gm8x7axicqhpv04rx";
   };
 
   buildInputs = [ emacs ];
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index bda364cb26f..98663a946ae 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
-  pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
+  qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qgis-2.10.1";
 
-  buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
+  buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql ] ++
-    (with pythonPackages; [ numpy psycopg2 ]);
+    (with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ];
 
   nativeBuildInputs = [ cmake makeWrapper ];
 
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index e6d5ee5528f..7557e19896f 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,23 +1,22 @@
 { stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
-, mpfr, gmp, glib, pkgconfig
+, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext
 }:
 
 stdenv.mkDerivation rec {
-  version = "2014.03";
+  version = "2015.03-1";
   name = "openscad-${version}";
 
   src = fetchurl {
     url = "http://files.openscad.org/${name}.src.tar.gz";
-    sha256 = "1hv1lmq1ayhlvrz5sqipg650xryq25a9k22ysdw0dsrwg9ixqpw6";
+    sha256 = "61e0dd3cd107e5670d727526700104cca5ac54a1f0a84117fcc9e57bf3b6b279";
   };
 
   buildInputs = [
     qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib
-    pkgconfig
+    pkgconfig harfbuzz qscintilla gettext
   ];
 
   configurePhase = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
     qmake PREFIX="$out" VERSION=${version}
   '';
 
diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix
index ccde370c292..20f2bcc1700 100644
--- a/pkgs/applications/misc/rofi/pass.nix
+++ b/pkgs/applications/misc/rofi/pass.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-pass-${version}";
-  version = "2015-06-08";
+  version = "1.0";
 
   src = fetchgit {
     url = "https://github.com/carnager/rofi-pass";
-    rev = "7e376b5ec64974c4e8478acf3ada8d111896f391";
-    sha256 = "1ywsxdgy5m63a2f5vd7np2f1qffz7y95z7s1gq5d87s8xd8myadl";
+    rev = "refs/tags/${version}";
+    sha256 = "16k7bj5mf5alfks8mylp549q3lmpbxjsrsgyj7gibdmhjz768jz3";
   };
 
   buildInputs = [ rofi wmctrl xprop xdotool ];
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index d190ed706c4..37a664a4918 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgs, python, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "1.4";
+  version = "1.4.2";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "071p7idprknpra6mrdjjka8lrr80ykag62rhbsaf6zcz1d9p55cp";
+    sha256 = "103ahwaaghxpih5bkbzqyqgxqmx6kc859vjla8fy8scg21cijghh";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 1b5da0763e7..96852e93cb9 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -41,7 +41,7 @@ let
 
   desktopItem = makeDesktopItem {
     name = "chromium";
-    exec = "chromium";
+    exec = "chromium %U";
     icon = "${chromium.browser}/share/icons/hicolor/48x48/apps/chromium.png";
     comment = "An open source web browser from Google";
     desktopName = "Chromium";
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index e8ad569adbf..98445cedfdc 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -17,8 +17,6 @@ let
     "s,^/,,"
   ]);
 
-  pre44 = versionOlder version "44.0.0.0";
-
 in stdenv.mkDerivation {
   name = "chromium-source-${version}";
 
@@ -46,9 +44,7 @@ in stdenv.mkDerivation {
     done
   '';
 
-  patches = if pre44
-            then singleton ./nix_plugin_paths_42.patch
-            else singleton ./nix_plugin_paths_44.patch;
+  patches = singleton ./nix_plugin_paths_44.patch;
 
   patchPhase = let
     diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";
diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch
deleted file mode 100644
index fb09763c997..00000000000
--- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
-index 8a205a6..d5c24e1 100644
---- a/chrome/common/chrome_paths.cc
-+++ b/chrome/common/chrome_paths.cc
-@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath>
-     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
- 
- // Gets the path for internal plugins.
--bool GetInternalPluginsDirectory(base::FilePath* result) {
--#if defined(OS_MACOSX) && !defined(OS_IOS)
--  // If called from Chrome, get internal plugins from a subdirectory of the
--  // framework.
--  if (base::mac::AmIBundled()) {
--    *result = chrome::GetFrameworkBundlePath();
--    DCHECK(!result->empty());
--    *result = result->Append("Internet Plug-Ins");
--    return true;
--  }
--  // In tests, just look in the module directory (below).
--#endif
--
--  // The rest of the world expects plugins in the module directory.
--  return PathService::Get(base::DIR_MODULE, result);
-+bool GetInternalPluginsDirectory(base::FilePath* result,
-+                                 const std::string& ident) {
-+  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
-+  const char* value = getenv(full_env.c_str());
-+  if (value == NULL)
-+      return PathService::Get(base::DIR_MODULE, result);
-+  else
-+      *result = base::FilePath(value);
- }
- 
- }  // namespace
-@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) {
-       create_dir = true;
-       break;
-     case chrome::DIR_INTERNAL_PLUGINS:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "ALL"))
-         return false;
-       break;
-     case chrome::DIR_PEPPER_FLASH_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
-         return false;
-       cur = cur.Append(kPepperFlashBaseDirectory);
-       break;
-@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) {
-       cur = cur.Append(FILE_PATH_LITERAL("script.log"));
-       break;
-     case chrome::FILE_FLASH_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "FILEFLASH"))
-         return false;
-       cur = cur.Append(kInternalFlashPluginFileName);
-       break;
-@@ -295,7 +288,7 @@ bool PathProvider(int key, base::FilePath* result) {
-       cur = cur.Append(chrome::kPepperFlashPluginFilename);
-       break;
-     case chrome::FILE_EFFECTS_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS"))
-         return false;
-       cur = cur.Append(kEffectsPluginFileName);
-       break;
-@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // We currently need a path here to look up whether the plugin is disabled
-     // and what its permissions are.
-     case chrome::FILE_NACL_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "NACL"))
-         return false;
-       cur = cur.Append(kInternalNaClPluginFileName);
-       break;
-@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) {
-         cur = cur.DirName();
-       }
- #else
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
-         return false;
- #endif
-       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
-@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // In the component case, this is the source adapter. Otherwise, it is the
-     // actual Pepper module that gets loaded.
-     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
-         return false;
-       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
-       break;
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 85a92e07e66..c3cc9c3ed18 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -13,9 +13,9 @@
     sha256bin64 = "14l8lka8jci1d90vbz5kpl20mk98n1ak4mw667dkz89cch5gal4s";
   };
   stable = {
-    version = "44.0.2403.125";
-    sha256 = "0li483phq72xlg0bpsgfk1rlxrmldk4g45ijx1xmnfs42g38wmkq";
-    sha256bin32 = "0h5a2wm13bvrq013skp3lq40bzx9519mb9kh8x3n4800lnanbjcb";
-    sha256bin64 = "1p9gfqpgyihvby4pb3fdn4ibg84fh4gksy18cvyi9zq7cibww2ff";
+    version = "44.0.2403.130";
+    sha256 = "055lccfiqdqwcjnx9l9xgzcilm2m341rg66nfnnadqa490prnxrp";
+    sha256bin32 = "0yzjhqyw2aaiwfv395c75avizcg28f3bn9zkqk2p3ifcv231w15v";
+    sha256bin64 = "1dzwlrdvnqyz6rpcl3pavpvqsx6la1d04cvgca3iaanq5xcana8b";
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
index e82d22f34fd..e079762420b 100755
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -11,22 +11,6 @@ source "$(nix-build --no-out-link "$base_path/update.nix" -A updateHelpers)";
 
 ver_sha_table=""; # list of version:sha256
 
-sha_lookup()
-{
-    version="$1";
-
-    for ver_sha in $ver_sha_table;
-    do
-        if [ "x${ver_sha%:*}" = "x$version" ];
-        then
-            echo "${ver_sha##*:}";
-            return 0;
-        fi;
-    done;
-
-    return 1;
-}
-
 sha_insert()
 {
     version="$1";
@@ -72,22 +56,15 @@ get_channel_exprs()
         channel="${chline%%,*}";
         version="${chline##*,}";
 
-        echo -n "Checking if sha256 of version $version is cached..." >&2;
-        if sha256="$(sha_lookup "$version")";
+        sha256="$(get_sha256 "$channel" "$version")";
+        if [ $? -ne 0 ];
         then
-            echo " yes: $sha256" >&2;
-        else
-            echo " no." >&2;
-            sha256="$(get_sha256 "$channel" "$version")";
-            if [ $? -ne 0 ];
-            then
-                echo "Whoops, failed to fetch $version, trying previous" \
-                     "versions:" >&2;
+            echo "Whoops, failed to fetch $version, trying previous" \
+                 "versions:" >&2;
 
-                sha_ver="$(get_prev_sha256 "$channel" "$version")";
-                sha256="${sha_ver%:*}";
-                version="${sha_ver#*:}";
-            fi;
+            sha_ver="$(get_prev_sha256 "$channel" "$version")";
+            sha256="${sha_ver%:*}";
+            version="${sha_ver#*:}";
         fi;
 
         sha_insert "$version" "$sha256";
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index ebb5348795c..6517097a19d 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 = "39.0";
+  version = "39.0.3";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "802ac533ba95ecfb4780f84d52698a2cc2d7ac82"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "3c000ef496165cb4e0e104d72a381040a3bc6787"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "6fa249f63fe690f3459f4b0112f4945a502a79eb"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "f22b92d0fb0ed21f0e6a3a47c5f2fe873b3bfb56"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "650c772ef89bc5ef6efe5129ddf8feaf993c8f1d"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "e722d65e3b9b706e6b9214ae79543130ad6dba95"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "8ff6fbc92e5b9cedfa17eda240fc89f14eb68f73"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "a1e94f56148a554e522cd317d0f2384073020278"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "c6815876c23117a462d79eb5da291610c1d96feb"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "629997b112da84852a01606f7fa4f15448c0ebb3"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "acda6aefe872e4982d0e8f3ac337d4243bb5e00f"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "181d998305bb75ea5e99bb1b4b5059b54a724ab9"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "230ebfaf61efac65c9daae983ec2fd854a9c1dac"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "a8ddb38542bce008924e4b593691ae84a839e564"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "47a242cd2c91cd7435c8c959d5eaa8595710f6aa"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "db62ad921f9df2683522db1968db9b79edfbadf2"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "c2fddb3667c5bb50fee3011cfb782b2dff7f4063"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "1b891a9df513e9f099f68fe2f0429b00bd12505b"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "0ad965be5c9ce5468e65667dcb0390a9afabd7b0"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "301b659d5689de81ca60f7092176efaf48a50a18"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "df99d9e80ebda8c146724f893ae2de77cf2518ab"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "4b4cc8e588a518af8a922d32163249af115fac42"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "39976bf6a0c7bdfc1832a6f2c48e92324f4a6727"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "ea66a36ea70486f39c7cf7abbf637d37c04d32ef"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "71eeeccd5bf5757d6ec4f9e1442c4fcfbf312d79"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "10911d28d56d4083aea7eb2174d0d7dd78772215"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "434532ff2cca7a0401a7aed8753d1c5578e98c1a"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "2a6aaed334856d06ce8c426282f3345d9bcaa435"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "e2445b13ab680f5dfd5d67e4e796170fbd6bd120"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "ef1df48bd465a3b05d1046bf4627c1ae4f60ee06"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "f95974e478e2d0fec7400424a33202e1e2b1e5b9"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "c521abab2bffe24863c087f02d57ffafae47def7"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "f11b050caae304029ccf23ce2906fe18115adbc8"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "800e0f3b649c9a03d4e9cd2a4ccd8f14bbb5ed95"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "b9502be9396e00b69946f0094c5939a8a57da64b"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "84fab2779bc055821afdb5d7ff45e3ffe95e2858"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "5eee946bc2182990b310ed57fbf527e82f93bc8b"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "8b3219b071e836ecc4966e153ec0adb4e691de89"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "9759c69061d6419edb949c55f7e797302b477c78"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "db5025d393a763c7cd4ed447d61b640ee77e7e79"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "4fdc423d6d15bd6a14030a526ad7017fd5bdf937"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "0d8637f1ca6acfe494f963c936d8510c6c11f8bf"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "e05722e42ea1d844d8fe40672026cacb19575ccf"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "8143b339d0ceedaf797b49ca4b54bcc0c91925e3"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "fac507eebec642fd50f248ac184dbde4538ad0bb"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "2670a80c7ca5d5390df9fcee907afbe7a01f9f37"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "a134117ddd446b63f325a38f818a80921adb5b2f"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "5b073a912221e8e734ba17ecfe735d820f5febf3"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "0e518d9fe0644a6ada9463ae14fa67c2c49bfd5f"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fa33935aa4abb696ea9a399cff0c1dc29beffab0"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "3c7df32ed5d2570e62e35dcb9f9d91588d7584d2"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "ced3821f7e334b2f0d5b5115cc04cbaf5bcdbe15"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "6af75a3e116162591dd6a15c8903ee5182afe03b"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "fa1ddbc5a3d9bd7c9cc424fe6c5e94c87d51eab2"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "8110bdf4c8657e88f71b8a6bec1ca92f2eac0538"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "30df4777fde7eba8724fab002cb7387203eeb82e"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "2f16472e5cd030a14e3cfa761a32c0ef5ffd395e"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "19a96b008a49e7a223ea2463edab7cda504e2ba5"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "786db5ad8d92324d3086f7b2b8da71767829a8f2"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "31273f797cb90615032611d2d86cac8cf6d28994"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "e2980430f1cd25edb401862b83fb49f2d730ff5e"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "dae850824c3eaaa31fec4aad19e38e2073d96f10"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "f865672eaa7815f3bb527baf3946c62c01c76dbb"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "aa207b51d24ca275b0cbd5ba4cd93ce16a6bd28a"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "30ef856ecdadeba171977859324f010d441a51e9"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "3ebbabc2346eeac01aaf88e91fd1fd55538c0770"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "4dd376ccc6811d46be052fcf1aab82e50a3e0999"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "f6409e276b400ecaa689d92fe5387662d1b5f2ab"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "751cd1092a58a8b6cde5d9e80790715d249ac11b"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "3cc75c55220f81b0291c16d2f237cb6a2d2609f0"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "2bfa436c566a4e2f0fe7847feccf3c157e026d4b"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "0b2ce0b246e107d99b13e497c64ad169e85eec51"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "3afc8ad8747bfcbc5a7e6f2e6de37cbefb3967e7"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "5bec8bcc0a67f304485b1efa7be5d952ce7985ce"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "8fa3dfdc0d2da19f6c98dc76363c9e0d9d10f978"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "4345cf5673267fb41c2c38f5fb92a3b0a9208cf0"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "e57883626a22d3935716417194e78a689c5535c2"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "be6095129ee3f3fc80f6705594a53c6ced996cb2"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "7ca70c0648b2f3928c1dc33288b48f488cf1d19b"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "f2eb7c6c33e8b4bc9a03bee587de4fe5b442ac95"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "32b242a2c6865fdad63ba4de701c566ffb33ef99"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "f83ceece81a71e6fb1494863b2970b2dc384d4c4"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "77f9c855e5f728dcd3b4ff27ed656aa67217dd35"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "f48bcf72d740f4a34bb7f888d977d4d39c141567"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "2db09bd59f3761bfdba8bad565e27e1b42a93727"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "99e0f119e5e79df5b20f686dd065fee5bda4511f"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "0d601a679675c517a535bf706e7cbad9882a5d7c"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "dbd3d180342d0946ab857bdd8d6bc30373e991b5"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "5f3e01cf375af38bee7014ff21fe75daf4e27071"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "a78fbb1cc4e6d10056cc7a3ccecf4750979c5953"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "7efc031614247ddb93a27531d3fa1d19ce21d516"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "e409bb73aad373791d83569dfb4a475bc617eac8"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "0e5c4e9173379457b6c8edd1812121fce84cda07"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "dc6cbffde61b6188080e458b4a31b634f4c0434c"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "d75318f8421f634eeacf15aaa91a28261324044c"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "b024d0e3498c3dd32757997a273d9f1051ccd47f"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "f74c1c567582a207efb501892845d1c28d7b8751"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "cb4151c0c1c6efa4c8ec5e4656de60b1abd65bac"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "1e9d43eedb0bab9f428a80ee3c2721a944961562"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "18a55f6ea18663922052411ebaed18c16c9f3050"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "f4f6af5a09072e004e7c8db7a10edc9ab8d474c3"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "43694f66fea7caf9b2f4d976564c00a99f7092e7"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "3a94f8a0cadc729e97bb6a7b273b02d79c9012dd"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "ec51644f69354aebac67f36e387d1a5b45d0dfa8"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "599de739c08799b8e4082190a53de3ae0dfc6617"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "338825804362d34911beaad146ca6d104bc69788"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "f2a6112a81043cc9608594cd56680a2e075dfd36"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "8650de76d89abdcba3d0e4bba8c2b90533e54ce6"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "0ea6e49b51dfd12150334b6023e26419716cdb65"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "a16c9e916462e3780159677528ffa35b9569a80b"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "0255634959aa739ae6807a1c249e4c78f51f8316"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "ada8dc2d3ea22c2afffac88b581dfc72a27f2f89"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "fa932b9e6d9798753e7b89b91a5db6565fe2b695"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "8a9252658d549d2cbc764197265275461db605b6"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "641c882870dfa7fb23bed9c07def585477ff459d"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "4b68d11f2a613bc8350d37dae899c2c65afe5dc9"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "f636e9b8d5e268f7c124ef3f35f6933de83fed62"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "ed98b20d8eb88a73b119c3a1435904f69529eabd"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "d5ef4d4dbf4d0b63f526d102e95f28078096032a"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "8e92bf456593359afb256c387578042c6085916f"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "d94320d0c8aee23b6d3c603664caab45180b6069"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "b9fdc0248d9656b3555c475643c7e07ca3c6b222"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "d49719c255a43151ed5e94d7024c39914ea27ec7"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "f2b1f00254ef350f817b5c1958384a9f5144f83e"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "cc54828041f57f623de691a49e4bb055bd059c54"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "5728a30bf53644a3b13bc00f5652e067cbe9100b"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0f69ddbd963a19d104ee96589c405c55aa7140b2"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "26af2b8cf928fedb5442c5257289f5e38c4f8432"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "2da0842ebe8ae5a8e80061d0fc159a5d408c4464"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "b7cc446178a493589d8654236f6e9113aee48455"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "dd81dc403366a7fd0d395338878b8b8fcb858365"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "2ca8cc4c491f0ded4cef8e3826a3c1419a580051"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "468d45392126ac7852012ed43d76d83e238dc2ac"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "ed20af16563516671f32bb588728e90f29955964"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "b197bca20e972ce2f8851dc128fb212a7d293454"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "2cd05329c3612330fdc1354fe651cc13ab8d9a5f"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "1087ba6ba17aa102888e929ccf7acc6b2476e447"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "aa1907c10e980a8466c1604519ffa08aaabb2d7c"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "fdb717a0f40b94a53077ff036a55c0f93b61a2cc"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "af10206080a7ad21e5fda9cdf66a734ee33b07ac"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "f08c67c6ea2a63c216f944453b4ce8b36f4ed840"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "07efb37804ffab35f117eb32f9f645b554ac1dd8"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "874f588d7ac5554ae4e8e134bfc272897f839f97"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "af64b6eb8d33d6bd78ce86e4785be50babe5c919"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "672523b996c7021e06b4a713f7ac1239a3b1800f"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "2e594b56230c079a9f1735e9bab9dc4a9d9e31ab"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "6edffa576d9829673c65400d4570b34dc787faad"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "7b506fedbf3a25cd1ed54b05c9b5cb7b8c237ad8"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "e8d1fea389b7cb75b7ccbf22ad5b8691e9bf1b6a"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "20163798733ee36ffa510987b18d1eb67b82aca1"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "9076d0e9de6adb7fbd26dbd3cd89dd5728939aab"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "352aeb9f5ccb1e3bb87c8e47f93e96a049991412"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "838c4c525a9f93117704851ad81b2c199a9c28fc"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "0139a064056da0ed1730fd768da1322a9661bca9"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "7d74018cd9948ee31e05b30ff1fb45a84d417494"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "85c43e2359f444faf111efd83fb0dc3e1b0edb48"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "bc95ee926f82aba58691d923eb4cb963aa4cb64a"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "7c8946d6180e2c48a80958b6a790bf6c9231591e"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "dfaad8f934869d714c94a95a775bcdcd67fda3c4"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "5523c6df4e2b03ae71c865aabe6bb0dd0446fc87"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "7a61ca88c832af3d15f197ba01d66c6fc43465d3"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "696823890791a05c6cf0230d1063a30012873090"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "4a3b932813ad0ab07f467a598e9e85b847bbe142"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "f847f3f0fb07f97053066f4b4314d93e9614e6cf"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "59eee567e30cf6321c234c60002b416faec07aa4"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "b64dfdbdc75f87003f00883173084646a2617a29"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "44e6b53ede97835847ed84defe4235cad513c653"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "bb6f84f58a19c6287bbc84e0e7101fcd48bd720a"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "1aec3ba9efd52a1f386e0bb075745a7c01c443a2"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "2ce2caccb638c0467ba1382a15146ef1cc33fa72"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "d8b339892c152254c89ec1d42ff9b7f128455aab"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "e4503686f2a997e1c793ef8e3c80bccd3dc0e2f0"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "d130fae691b91a1f1f7d15ca84f643ccf299b0e3"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "18b5d09571f4db7b18dbbdb3f3c29c80480a16aa"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "303816f99659e2bbb8ecc4f9b1c83932a0c9205d"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "238b50b8bb745f2d80099354592c9b710c55f1d8"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "9159a6fea44a97a33390c527abf7730cdbbc9216"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "74e3c2292aed9c2a7de24d6f3693ac1d0ba4c41f"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "4b732557876ff3e4d02ad480b7c73bd7abd6782d"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "0a63b048b33638ade924bcf7ae435423c9da906c"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "87349773cdb5e07aaa1387e75e08d03786df700d"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "137d3558eb674036d43e5764ca691a66f9a07782"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "db99f86de92b0d1782611926b3053b25ad302e8b"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "d000f9e8a983be0fa7d05176fb6cc0954bb06ad7"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "b794a584da47ee9197666ab6976863f23ff1972c"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "0319aec1942cd8311b236aef5772850897b36f64"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "83b83af48caf75bcdc39efb9c8a09333d6ae97b7"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "827463330470ab2abd4a71a92e15fea451957fb5"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "9f994c9374c53afa094271907fc6aecbf5a93eb4"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "611835134f1008fcff72f3ab264ce9448a6a0948"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "67339f5005bf8c805b6c8ed24fbed597865f5dd0"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "ecdd763f7d40bcb1ff6004fd0a3f511f5cbb9d9b"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "d6a7d84744c0ac6e4cb7f0a1f0025bbee053cdc2"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "051646e7d213099433bc198c74f85d99aeb6e846"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "28e48822cc2977037db1493ddc06ef106a11e8bf"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "7b59deab0fd2b35d2ec087947f5c5a85bd70cf4a"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "4c5bff7f6b3f664138a881479701cfea81ff60b8"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "3a659a5335d4b215ac2a0452264a61c702420c60"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "a641b87769d90db720fc5294ab06f6dae2a597d3"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "1c1e47f4012c765ce96e4d2581e47f9b61344370"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "0491cf87e0815079eba8f57ae8c6f392d2e5251f"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "abe34c6d4998ac2f4e2d1f2d4655f8ace9f0a857"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "40f2eb7fd72f4a05ee47cb136c73e75f139e9ed1"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a737c33921af68621d906702fb1298f5bf161f9"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "46cf625eea24a819d93741f2d11bc315a21361cc"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "be84a0a6e32fbbb977b654f195064add8881a853"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "ce507b8801646f3156bb38776c17dd7955ba9678"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "5b1599282512c66a8619202b494042dbe959adc0"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "9eb6a71214122e02e7e94b526b4ff1e0bad71680"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "4f21da86ab876bf916157fe7e1fd84502e8fb923"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "d175b55ebf05905531f28a74f9a075c4dd4467d1"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "62039edbacf4d5ed9b32f5ef2d993c0b6fc7a0cc"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "933cc29a7902f4de25fc593ffbaf6e62ccceb2fc"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "eb69a42286f7d4a7106ddd24ec0c1f1356101956"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "6683f985caece486b068a3ddd85e732903b1f738"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "fd92cd5ab674762fce35fddc54b7dcdfa4829dcf"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "91416a56f0221772a0f9691ad418602327d193e2"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "ce89cdb9c8c88d7c4dcd089eef006b98171f5d04"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "8322cad2eacba0c064eb9ef2f5cd1d426411c648"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "c4102cc705610d7ad5b0cc530c600b2170f55419"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "571067007e0dff64095b8eeb760aec7f78f367fd"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "64a0422e42cf1d19e558377d5ecee6536917b414"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "9f5611cd3043b1c267724b198ab04c16078b7818"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "3a22150e16a12d8fba9d21cef0c8e7ac434edf35"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "6502874b051c281e565cd0e0953698b88b69e5f5"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "3bdbcf6d324c43fbf7f3c71243df10a760f7fec2"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "83edce65b276d9989e66d11bfd4e9c1c87955364"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "6281d1d560fb7dd1a8bc1af0be046491a4ee4382"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "d394d731f7cde2b17bafd9d9d4cb6819fdbcbfd5"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b969107e5e840e1701672b3d5ba81ae3e53889be"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "a9c801142df7a932b2eba4d8f540b2579d0fabeb"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "96cb7bb0bd079d683304168b2b14255a1217fa92"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "c233e4da88f3fcc5eb5f2c45766c9197b5910dfc"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e04973316a340325888f0f2e06590773f81a7cf0"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "22c59e40b39aefe356e8b5305ce720d4a2cdd0b7"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "74256cbb8a76d835887727aa01f6e6a22936a43e"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "fa14a31fe15106f224df47a62c3e5ec16da1cb95"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "c8b6216d448f6f192e584ceb81fb22e5ac79a280"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "a1c67f4bec3f46de3cf6297e8a711d55f8189e3b"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "70d3b99652e8c690bbd05af7af9c65eeb780d455"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "1f42b51648eb296dfc339982c331e7d63bfbbd96"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "bd176a2bda1246e15dbbfb1b068f6b196a0ce266"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "2cd7757360efeca608b8a9b4b56c04f9aca89a79"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "dc130d8ab31c739e4406f8cc72dc32d3795db208"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "6dccfb2944006379271c308fa31d8f6a4bd6bb3d"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "aca6deabd521e29611fccbdeca3bf036a2239c1d"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "4ffb659a341308a097ad26f1873ae243e581bba9"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "340caff2afeb8f9f01c84f780b6aef079ab257e6"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "7adb1a44e0367b570437fdeae9f04c6f94f6702f"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "d427e6ca8287d97b27949ccb412207ef48d0cebe"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "2741c8bdcfad1edc36968bfac70c71b1a2837df4"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "430817ee768fd76dd29e76ae00488d6397f7b6f1"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "725c194c1e08293b44cbeb2a6791f4340a773b81"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "611e5f92796707379a9fd60ade840896eac4eabd"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "720ee20fa7a74dc321ab7fa8a95732ff2e9e5250"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "778496274c362d9d854b1cc6ac9b1806ce8e708c"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "f31729cecde50073e49d1387356c13060cf50c61"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "72e9c8c602c403d16e4d60fbeb1bf5a415aabf25"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "f2498d503005d0a1d7432bbc5a981be350421cfa"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "b003f7d484ec995fe4f10808d1141e20c6ed9bfc"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "de191039fb5acb5ca9ab556ef4ef6b6211b5b697"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "d5cd94ddd0b301dc0edf2f64bafa678864aa4595"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "cf66178d0a18fcabcde897d4ba869da8d82fe999"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b83bbf3fb4d3aabdc961b9ef669dd2aa9f05ee52"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "0550d016ad044fdac193beee822171a0d891a34d"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "4f5916dac9d8efb333e2ad21370bd8a3d961b68f"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b72515f5e194a4c543c8a6487c858abe07e24db0"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "aef7fdc2f59edbde165c4e98de10f7e20e203f9d"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "1db4444dbc9479cad1122925a9af73e358e09cbf"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "a826b23b1783fff4d51451284301610cd26b578f"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "2943bbe86e052280d610cbf3adceb89e949615b3"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "c1b0bb2f22c11974e5e3a2d9b221601da07a858d"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "2e3568872301c3897e83ee5692638a76fbef15fc"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "5af762e2487171f6b41a6c1654b672c86e6964f8"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "40c042713ee07d4d375327515c7425d6733b926f"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "0dd2808378e870f553e02066f5ee78b11543e420"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "294eb8f7345f6baffc183605988bd1a57bbdd880"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "fbd9524ac8c1286e4c4bcf77efa8c9bf86d03948"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "09b63d181398b1ff6a83849aa209952c0c5ce9b0"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "d7478ba2f1b59ef83b1447789034bbdca78fab77"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "72e1e6e225790e4438da20cd2f69dce6e455fe53"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "3ef27144bb335d7a3f168bbadc0592a5fd554d78"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "5ef7f628aeb20d20ffa01316c234afafc2a6e2c7"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "cbf6a8d123e98ef1b99221083c743e962ccec58c"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "46f34520fc023f9d20781c9d5f13c683bc7f86bd"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "c07c7ca26034e53d29e868315201605b95d83e65"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "8ab47bda33eeec6d135049f775f06478480394b2"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "82b0c898ebf2e3714763640f2cabd00dd14c9078"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "1dba01bbf772b38c67b90d5e68f7e1a5c20f0b02"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "ade71dce8572628f99bf59132e8c0efd01a77016"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "486411e211d5505ca696a936db64682e04d43392"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "0239e14c627499220518d1f9a3f643315c1846c6"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "d7f314a0caec40e367faa29e071a81da2e50d802"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "4ad6c120360f90dea82282a6891419f17d0b5068"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "14a6534cba54ff08695b4322f6566a375f9cb713"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "badad6dfe2d794d508c4f8b061ef2a91209a8c32"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "1602ac0a3ac5c8c49a370a64d450aa06b490c8b5"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "a8108ecee8557be024c35818a99c30dfd811da83"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "02952ca95545f83231b36e9c05adc51ab955f9e5"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "164c31da7ad4272500b8906ee5d29c69ac285618"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c09a24b8f00409c7c93686586b091bfc33f22e52"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "9124e6b86f947dd4a7d2d7c9b8860dd28647d2f4"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "fb2dbbda6817d8fbcf9870a3233396051ce7c67f"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "bbf1e039a02556df8c68d6d49aa30f821bfdfae9"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9ff1ae86d0989f81ae3324e9ccbda2d2069281be"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "2be8ac327c7aa90abb38ee6ccfb0181194d5592e"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "a6ff7bf9c96b1baa2d22e897d1083c9907300de5"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "4ab6eff3bf8c99f3404a313f54ea3e0d48842d9f"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "7ed256e6b3a5aec16eb0c5d3cab8c4cd5bf07999"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "da6511f215e206df0fe450225f2b2e4d8d541838"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "d3df1cc8647d6dc8576fcfd0c6a1e28a28c0ce8a"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "af999c2bcb0d865d38e336eaad5d6766fed291cc"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "7369a73558f6df1218dac14c3259e08cfa80ac52"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "bd21ac0aca091de913201d2df5f914b9eeb83c8d"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b9a5cf1259a824edb54d4db9aa7db3637ab041a"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "f8004907aac63d8e9e4196424aa94db4fa1ff8c0"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "3403690013738c55f87c56d52ed8f9923a496b42"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "3b00a49b87fa900ecea9fdedce1b49d2560a81dd"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "6e5f1e0460792c080aa9ac82d3be69c047862203"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "2f09d74e5e39f9016ab5594f95f61b369cd6467c"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "df7b6c0806b27ade147dc6d42d181d599cc2c28b"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "1dedbe2a377cee5b32ca4aa0ec54eb24261238b0"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "0309c2c97affcfa4c0d155eec2f9f4f586c940eb"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "890a17e8f1d771e12d3e9c03ee0c8069654dae66"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "73fbaabb4644ae3726681bd6c49f6efa25a74a1a"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "573ba7d8526147e47f49fedb5f8c2e3bf0aaee82"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "abacb4f8ad9ed7eb42d5bbf3ebdce4136557bff5"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "cd1dc2a385e1911b5eaf69bc0cab13f257d8f68d"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "5c1aff5bbf858e1e7f6fa2c2d996a396b8710124"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "a6d7e023615936b0d61e956a4dadb6431febaa0c"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "19a7147c4a7de505ef0106b121640f5f651d6dbd"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "f1120ddacc1d5a124512c405855a4014fc910034"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "d21616842495521d3b71877ff2b694e019a4c2c2"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "43b9236a33a803fc0b0dd41cef93a5bf9fd91472"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "17e06ab17369c234bef72b1a284bef39d5810671"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "8f8e2cb6acd475d7d75116c6494ab237b9531364"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "77fb9f32965af6a70275fbca308caf5bf88c3c8e"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "4a65de127708cbee44cc7238d14b9c0942d2673b"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "37a556dafc73e5de983cb62fdd545d01f32f698d"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "2f4549d5ef998449b553a5d6f62d01d0313c6c95"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "f6a10236fe0fcc9d11c3c5aee3bd84365bb06013"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "c2694589cc28b938fd7a079378e5fa99cdd7c98b"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "e7888b70a1a90613fd7d38a5a7735857385ae683"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "6ebef5649484bfda154c44232a9e3aae239c0990"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "fe5ffb931bd7e5bb403f6aef6b879c2c9446721e"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "4b53989b554929b085b120788e1e30d5232dedb4"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "bed269a3a7e3fc82d2fb1931632be9b04fe6b6da"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "786d51639cd7e952f4c73e9d91b50f6da0ba9242"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "db04c29c9038c856c67e99c77c0628c377bcd8f7"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "d9525ad0b0069ae05cad173ab567198b67fc13dc"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "2a8bbe15f2b2b242e9787704e542a6c0a9ed93bc"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "532e224a166addee7b6068bbcee7e6c0b1c3f6df"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "514bc01fe7055a050898a01f0c1ed4773fb33b7e"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "0d5154d3d5062c7e1ff33112ad0a1399ba548b29"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "291ee73bc5540f8089f6b7bbdf8160c931cc4dd7"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "16df041eeaf6a3885d52569db1781635e519fd3f"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 31375bd5a5b..c11eef3189b 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu
+, cairo, gst_all_1, icu, libpng, jemalloc
 , enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
@@ -16,14 +16,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "39.0"; in
+let version = "39.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 = "32785daee7ddb9da8d7509ef095258fc58fe838e";
+    sha1 = "e024e528317d6c531fb36a26d2ce3317d3510b42";
   };
 
   buildInputs =
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
       xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
       xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
       hunspell libevent libstartup_notification libvpx cairo
-      gstreamer gst_plugins_base icu
+      gst_all_1.gstreamer gst_all_1.gst-plugins-base icu libpng
+      jemalloc
     ]
     ++ lib.optional enableGTK3 gtk3;
 
@@ -48,26 +49,27 @@ stdenv.mkDerivation rec {
       "--with-system-nss"
       "--with-system-libevent"
       "--with-system-libvpx"
-      # "--with-system-png" # needs APNG support
-      # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0
+      "--with-system-png" # needs APNG support
+      "--with-system-icu"
       "--enable-system-ffi"
       "--enable-system-hunspell"
       "--enable-system-pixman"
       "--enable-system-sqlite"
       "--enable-system-cairo"
-      "--enable-gstreamer"
+      "--enable-gstreamer=1.0"
       "--enable-startup-notification"
-      # "--enable-content-sandbox"            # available since 26.0, but not much info available
-      # "--enable-content-sandbox-reporter"   # keeping disabled for now
+      "--enable-content-sandbox"            # available since 26.0, but not much info available
+      "--disable-content-sandbox-reporter"  # keeping disabled for now
       "--disable-crashreporter"
       "--disable-tests"
       "--disable-necko-wifi" # maybe we want to enable this at some point
       "--disable-installer"
       "--disable-updater"
       "--disable-pulseaudio"
+      "--enable-jemalloc"
     ]
     ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
-    ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
+    ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
                       else [ "--disable-debug" "--enable-release"
                              "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}"
                              "--enable-strip" ])
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index f9c34fdd29d..6f92ca5a6b7 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -19,6 +19,11 @@ in stdenv.mkDerivation rec {
     sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr";
   };
 
+  patches = [
+    # https://reviews.apache.org/r/36610/
+    ./rb36610.patch
+  ];
+
   buildInputs = [
     makeWrapper autoconf automake114x libtool curl sasl jdk maven
     python wrapPython boto distutils-cfg setuptools leveldb
diff --git a/pkgs/applications/networking/cluster/mesos/rb36610.patch b/pkgs/applications/networking/cluster/mesos/rb36610.patch
new file mode 100644
index 00000000000..c3b1b290422
--- /dev/null
+++ b/pkgs/applications/networking/cluster/mesos/rb36610.patch
@@ -0,0 +1,11 @@
+diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp
+index ea0891e320154b85a21ed2d138c192821efae9cd..7b24c377c9a28cad91738305c273fb53a4dc7365 100644
+--- a/src/linux/fs.cpp
++++ b/src/linux/fs.cpp
+@@ -19,6 +19,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <syscall.h>
+
+ #include <linux/limits.h>
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index d40693b5059..3fa6fb51ee1 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -19,11 +19,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.6.9";
+  version = "3.8.5";
   sha256 =
     {
-      "x86_64-linux" = "1i260mi40siwcx9b2sj4zwszxmj1l88mpmyqncsfa72k02jz22j3";
-      "i686-linux" = "0qqc8qbfaighbhjq9y22ka6n6apl8b6cr80a9rkpk2qsk99k8h1z";
+      "x86_64-linux" = "1r0wz2fsx2piasl04qsgwbl88bi0ajr0dm2swbslxwkf789vk18y";
+      "i686-linux" = "1dvfgp9dg3frhwmchwa6fyws4im9vgicchfsv0zzflvc7rm9fcig";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 7cbec61b5e2..04d4eaebaa7 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
 
     for src in \
       crypto.c \
+      notmuch-config.c \
       emacs/notmuch-crypto.el
     do
       substituteInPlace "$src" \
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
new file mode 100644
index 00000000000..0c5aec00405
--- /dev/null
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -0,0 +1,36 @@
+{ pkgs, lib, mercurial, pyPackages ? pkgs.python27Packages }:
+
+pkgs.buildPythonPackage rec {
+    name = "tortoisehg-${version}";
+    version = "3.4.2";
+    namePrefix = "";
+
+    src = pkgs.fetchurl {
+      url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
+      sha256 = "18a587c8fybfjxbcj8i2smypxy7vfzmmrzibs74n3zy6dlb949nj";
+    };
+
+    pythonPath = [ pkgs.pyqt4 mercurial ]
+       ++ (with pyPackages; [qscintilla iniparse]);
+
+    propagatedBuildInputs = with pyPackages; [ qscintilla iniparse ];
+    
+    doCheck = false;
+
+    postUnpack = ''
+     substituteInPlace $sourceRoot/setup.py \
+       --replace "/usr/share/" "$out/share/"
+    '';
+
+    postInstall = ''
+     ln -s $out/bin/thg $out/bin/tortoisehg     #convenient alias
+    '';
+
+    meta = {
+      description = "Qt based graphical tool for working with Mercurial";
+      homepage = http://tortoisehg.bitbucket.org/;
+      license = lib.licenses.gpl2;
+      platforms = lib.platforms.linux;
+      maintainers = [ "abcz2.uprola@gmail.com" ];
+    };
+}
\ No newline at end of file
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 30eac05c234..09b33099139 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -15,6 +15,7 @@
 , lzo, libcdio, libmodplug, libass, libbluray
 , sqlite, mysql, nasm, gnutls, libva, wayland
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
+, libcec, libcec_platform
 , dbus_libs ? null, dbusSupport ? true
 , udev, udevSupport ? true
 , libusb ? null, usbSupport ? false
@@ -24,7 +25,6 @@
 , rtmpdump ? null, rtmpSupport ? true
 , libvdpau ? null, vdpauSupport ? true
 , libpulseaudio ? null, pulseSupport ? true
-, libcec ? null, cecSupport ? true
 }:
 
 assert dbusSupport  -> dbus_libs != null;
@@ -33,7 +33,6 @@ assert usbSupport   -> libusb != null && ! udevSupport; # libusb won't be used i
 assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null;
 assert pulseSupport -> libpulseaudio != null;
-assert cecSupport   -> libcec != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
@@ -69,6 +68,7 @@ in stdenv.mkDerivation rec {
       lzo libcdio libmodplug libass libbluray
       sqlite mysql.lib nasm avahi libdvdcss lame
       curl bzip2 zip unzip glxinfo xdpyinfo
+      libcec libcec_platform
     ]
     ++ lib.optional dbusSupport dbus_libs
     ++ lib.optional udevSupport udev
@@ -76,7 +76,6 @@ in stdenv.mkDerivation rec {
     ++ lib.optional sambaSupport samba
     ++ lib.optional vdpauSupport libvdpau
     ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional cecSupport libcec
     ++ lib.optional rtmpSupport rtmpdump;
 
     dontUseCmakeConfigure = true;
@@ -93,9 +92,7 @@ in stdenv.mkDerivation rec {
       ./bootstrap
     '';
 
-    configureFlags = [
-      "--enable-external-libraries"
-    ]
+    configureFlags = [ ]
     ++ lib.optional (!sambaSupport) "--disable-samba"
     ++ lib.optional vdpauSupport "--enable-vdpau"
     ++ lib.optional pulseSupport "--enable-pulse"
@@ -112,6 +109,7 @@ in stdenv.mkDerivation rec {
           --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
+          --prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
       done
     '';
diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix
index be81e93e32a..6fd630b13f4 100644
--- a/pkgs/build-support/emacs/generic.nix
+++ b/pkgs/build-support/emacs/generic.nix
@@ -16,10 +16,14 @@ with lib;
 }@args:
 
 let
+
   defaultMeta = {
     broken = false;
     platforms = emacs.meta.platforms;
+  } // optionalAttrs ((args.src.meta.homepage or "") != "") {
+    homepage = args.src.meta.homepage;
   };
+
 in
 
 stdenv.mkDerivation ({
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index 607a1b4a5ef..5eaa995b412 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -31,7 +31,7 @@ let
   targets = concatStringsSep " " (if files == null then fileSpecs else files);
 
   defaultMeta = {
-    homepage = "http://melpa.org/#/${pname}";
+    homepage = args.src.meta.homepage or "http://melpa.org/#/${pname}";
   };
 
 in
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index f3191e430ef..65339574dfb 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     description = "GeoLite Legacy IP geolocation databases";
     homepage = https://geolite.maxmind.com/download/geoip;
     license = licenses.cc-by-sa-30;
-    platforms = with platforms; linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ nckx ];
   };
 
diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix
index 4d80b633bd3..c75af81af1a 100644
--- a/pkgs/desktops/e19/econnman.nix
+++ b/pkgs/desktops/e19/econnman.nix
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ];
-  propagatedBuildInputs = [ python27Packages.pythonefl_1_14 python27Packages.dbus e19.elementary ];
+  propagatedBuildInputs = [ python27Packages.pythonefl_1_15 python27Packages.dbus e19.elementary ];
   postInstall = ''
-    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_14}/lib/python2.7/site-packages
+    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_15}/lib/python2.7/site-packages
   '';
 
   meta = {
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index 7c2e0c3e378..10b69647c0e 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.14.1";
+  version = "1.15.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
-    sha256 = "16rj4qnpw1ya0bsp9a69w6zjmmhzni7vnc0z4wg819jg5k2njzjf";
+    sha256 = "1x5n2afy5z1akam5y187ajk52mq2k9lwmz7nlrxp92rvx1jf6li5";
   };
 
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix
index 15bdc08b6d3..17973d530ff 100644
--- a/pkgs/desktops/e19/elementary.nix
+++ b/pkgs/desktops/e19/elementary.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }:
+{ stdenv, fetchurl, pkgconfig, e19, libcap, automake, autoconf, libdrm, gdbm }:
 stdenv.mkDerivation rec {
   name = "elementary-${version}";
-  version = "1.14.1";
+  version = "1.15.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
-    sha256 = "100bfzw6q57dnzcqg4zm0rqpvkk7zykfklnn6kcymv80j43xg0p1";
+    sha256 = "085s2xw3dhv8xiy7ikaaim5gil423g08wclhk0psi76g0vavgd32";
   };
-  buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  buildInputs = [ pkgconfig e19.efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
   NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];
   patches = [ ./elementary.patch ];
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix
index 6aa4089f52f..a95759b6f17 100644
--- a/pkgs/desktops/e19/emotion.nix
+++ b/pkgs/desktops/e19/emotion.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, e19, vlc }:
 stdenv.mkDerivation rec {
   name = "emotion_generic_players-${version}";
-  version = "1.14.0";
+  version = "1.15.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
-    sha256 = "1n1a5n2wi68n8gjw4yk6cyf11djpqpac0025vysn5w6dqgccfic3";
+    sha256 = "08yl473aiklj0yfxbn88000hmnhl7dbhqixsn22ias8a90rxdfhh";
   };
   buildInputs = [ pkgconfig e19.efl vlc ];
   NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ];
diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix
index 7e770ffe00b..7a350d7396b 100644
--- a/pkgs/desktops/e19/enlightenment.nix
+++ b/pkgs/desktops/e19/enlightenment.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.19.5";
+  version = "0.19.8";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "0j66x7x76fbgqfw6fi77v8qy50slw3jnsq3vvs82rrfvniabm8wc";
+    sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi";
   };
   buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb
     xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2
diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix
index a35b4c58321..553abec576e 100644
--- a/pkgs/desktops/e19/evas.nix
+++ b/pkgs/desktops/e19/evas.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
 stdenv.mkDerivation rec {
   name = "evas_generic_loaders-${version}";
-  version = "1.14.0";
+  version = "1.15.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
-    sha256 = "04m8vsrigbsg9hm94lxac56frdxil1bib0bjmspa6xsfgi12afwl";
+    sha256 = "1k9bmswrgfara4a7znqcv3qbhq3zjbm0ks1zdb0jk5mfl6djr8na";
   };
   buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
   meta = {
diff --git a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
index c3c37c5fd76..ce43fe1637d 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3
 , pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool
-, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2, libtool }:
+, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "cheese-${gnome3.version}.1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
                   gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
                   gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
                   gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2
-                  libtool libcanberra_gtk3 ];
+                  libcanberra_gtk3 ];
 
   enableParallelBuilding = true;
 
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 11aaae1e6cb..5ca053d81b9 100644
--- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
@@ -3,11 +3,11 @@
 , bash, makeWrapper, itstool, libxml2, libxslt, icu }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-${gnome3.version}.0";
+  name = "yelp-${gnome3.version}.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0az2f1g8gz341i93zxnm6sabrqx416a348ylwfr8vzlg592am2r3";
+    sha256 = "1jk7aad1srykhgc3x0hd3q3dnlshmy1ak00alwjzaasxvy6hp0b0";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
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 979990c7e8e..c078297c803 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
@@ -4,11 +4,11 @@
 , gnome3, librsvg, gdk_pixbuf, file, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-tweak-tool-${gnome3.version}.0";
+  name = "gnome-tweak-tool-${gnome3.version}.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0pc62qwxgjrgxdhn3qqdzxpx0prrn6c948hqj66w2dy8r0yrdiqw";
+    sha256 = "0r5x67aj79dsw2xl98q4harxv3hjs52g0m6pw43vx29lbir07r5i";
   };
 
   doCheck = true;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9f0b5d4599a..c8a5377b090 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -14,6 +14,9 @@ self: super: {
   # Link statically to avoid runtime dependency on GHC.
   jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
 
+  # Apply NixOS-specific patches.
+  ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
+
   # Break infinite recursions.
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
@@ -250,24 +253,24 @@ self: super: {
   # https://github.com/tibbe/ekg/commit/95018646f48f60d9ccf6209cc86747e0f132e737, not yet in hackage
   ekg = doJailbreak super.ekg;
 
-  # https://github.com/diagrams/diagrams-rasterific/commit/2758e5760c64f8ca2528628bd11de502f354ab15, not yet in hackage
-  diagrams-rasterific = doJailbreak super.diagrams-rasterific;
-
   # https://github.com/NixOS/cabal2nix/issues/136
   glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
   gtk3 = super.gtk3.override { inherit (pkgs) gtk3; };
   gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
   gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
 
+  # webkit does not recognize its system library build input any more.
+  webkit = markBroken super.webkit; # http://hydra.cryp.to/build/1041942/nixlog/1/raw
+  ghcjs-dom-hello = dontDistribute super.ghcjs-dom-hello;       # depends on broken webkit
+  ghcjs-dom = dontDistribute super.ghcjs-dom;                   # depends on broken webkit
+  jsaddle-hello = dontDistribute super.jsaddle-hello;           # depends on broken webkit
+  reflex-dom = dontDistribute super.reflex-dom;                 # depends on broken webkit
+
   # Need WebkitGTK, not just webkit.
-  webkit = super.webkit.override { webkit = pkgs.webkitgtk24x; };
   webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
   webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
   websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
 
-  # https://github.com/jgm/zip-archive/issues/21
-  zip-archive = addBuildTool super.zip-archive pkgs.zip;
-
   # https://github.com/mvoidex/hsdev/issues/11
   hsdev = dontHaddock super.hsdev;
 
@@ -300,6 +303,7 @@ self: super: {
   dbmigrations = dontCheck super.dbmigrations;
   euler = dontCheck super.euler;                        # https://github.com/decomputed/euler/issues/1
   filestore = dontCheck super.filestore;
+  getopt-generics = dontCheck super.getopt-generics;
   graceful = dontCheck super.graceful;
   hakyll = dontCheck super.hakyll;
   Hclip = dontCheck super.Hclip;
@@ -331,6 +335,7 @@ self: super: {
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
   hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
   holy-project = dontCheck super.holy-project;          # http://hydra.cryp.to/build/502002/nixlog/1/raw
+  hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
   http-client = dontCheck super.http-client;            # http://hydra.cryp.to/build/501430/nixlog/1/raw
   http-conduit = dontCheck super.http-conduit;          # http://hydra.cryp.to/build/501966/nixlog/1/raw
   js-jquery = dontCheck super.js-jquery;
@@ -526,6 +531,7 @@ self: super: {
   stable-tree = dontDistribute super.stable-tree;
   synthesizer-llvm = dontDistribute super.synthesizer-llvm;
   optimal-blocks = dontDistribute super.optimal-blocks;
+  hs-blake2 = dontDistribute super.hs-blake2;
 
   # https://ghc.haskell.org/trac/ghc/ticket/9625
   vty = dontCheck super.vty;
@@ -561,7 +567,7 @@ self: super: {
   duplo = dontCheck super.duplo;
 
   # Nix-specific workaround
-  xmonad = appendPatch super.xmonad ./xmonad-nix.patch;
+  xmonad = appendPatch super.xmonad ./patches/xmonad-nix.patch;
 
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
@@ -582,31 +588,6 @@ self: super: {
   # no haddock since this is an umbrella package.
   cloud-haskell = dontHaddock super.cloud-haskell;
 
-  # Disable tests which couldn't be built.
-  distributed-process-async = dontCheck super.distributed-process-async;
-
-  # Disable tests which couldn't be built.
-  distributed-process-client-server = dontCheck super.distributed-process-client-server;
-
-  # Disable tests which couldn't be built.
-  distributed-process-extras = dontCheck super.distributed-process-extras;
-
-  # Make distributed-process-platform compile until next version
-  distributed-process-platform = overrideCabal super.distributed-process-platform (drv: {
-    patchPhase = "mv Setup.hs Setup.lhs";
-    doCheck = false;
-    doHaddock = false;
-  });
-
-  # Disable tests due to a failure (Sequential Shutdown Ordering test.)
-  distributed-process-supervisor = dontCheck super.distributed-process-supervisor;
-
-  # Disable network test and errorneous haddock.
-  distributed-process-tests = overrideCabal super.distributed-process-tests (drv: {
-    doCheck = false;
-    doHaddock = false;
-  });
-
   # This packages compiles 4+ hours on a fast machine. That's just unreasonable.
   CHXHtml = dontDistribute super.CHXHtml;
 
@@ -616,9 +597,6 @@ self: super: {
   # https://github.com/NixOS/nixpkgs/issues/6350
   paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
 
-  # https://github.com/seanparsons/wiring/issues/1
-  wiring = markBrokenVersion super.wiring;
-
   # https://github.com/jwiegley/simple-conduit/issues/2
   simple-conduit = markBroken super.simple-conduit;
 
@@ -631,12 +609,8 @@ self: super: {
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
-  # wxc needs help deciding which version of GTK to use.
-  wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: {
-    patches = [ ./wxc-no-ldconfig.patch ];
-    doHaddock = false;
-    postInstall = "cp -v dist/build/libwxc.so.${drv.version} $out/lib/libwxc.so";
-  });
+  # 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; };
 
   # Depends on QuickCheck 1.x.
@@ -783,7 +757,7 @@ self: super: {
   leksah = dontCheck super.leksah;
 
   # Patch to consider NIX_GHC just like xmonad does
-  dyre = appendPatch super.dyre ./dyre-nix.patch;
+  dyre = appendPatch super.dyre ./patches/dyre-nix.patch;
 
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;
@@ -903,4 +877,49 @@ self: super: {
   # https://github.com/hspec/mockery/issues/6
   mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
 
+  # https://github.com/diagrams/diagrams-lib/issues/258
+  # https://github.com/diagrams/diagrams-lib/issues/259
+  diagrams-lib = markBroken super.diagrams-lib;
+  diagrams-cairo = dontDistribute super.diagrams-cairo;
+  diagrams-gtk = dontDistribute super.diagrams-gtk;
+  diagrams-html5 = dontDistribute super.diagrams-html5;
+  diagrams-pandoc = dontDistribute super.diagrams-pandoc;
+  diagrams-postscript = dontDistribute super.diagrams-postscript;
+  diagrams-rasterific = dontDistribute super.diagrams-rasterific;
+  diagrams-rubiks-cube = dontDistribute super.diagrams-rubiks-cube;
+  diagrams-svg = dontDistribute super.diagrams-svg;
+  halma = dontDistribute super.halma;
+  midi-music-box = dontDistribute super.midi-music-box;
+  potrace-diagrams = dontDistribute super.potrace-diagrams;
+  SVGFonts = dontDistribute super.SVGFonts;
+  yesod-media-simple = dontDistribute super.yesod-media-simple;
+
+  # https://github.com/alphaHeavy/lzma-conduit/issues/5
+  lzma-conduit = dontCheck super.lzma-conduit;
+
+  # https://github.com/kazu-yamamoto/logger/issues/42
+  logger = dontCheck super.logger;
+
+  # https://github.com/edwinb/EpiVM/issues/13
+  # https://github.com/edwinb/EpiVM/issues/14
+  epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
+
+  # Upstream has no issue tracker.
+  dpkg = markBroken super.dpkg;
+
+  # https://github.com/ekmett/wl-pprint-terminfo/issues/7
+  wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
+
+  # https://github.com/bos/pcap/issues/5
+  pcap = addExtraLibrary super.pcap pkgs.libpcap;
+
+  # https://github.com/bscarlet/llvm-general/issues/143
+  llvm-general-pure = dontCheck super.llvm-general-pure;
+
+  # https://github.com/skogsbaer/hscurses/issues/24
+  hscurses = markBroken super.hscurses;
+
+  # https://github.com/qnikst/imagemagick/issues/34
+  imagemagick = dontCheck super.imagemagick;
+
 }
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 e9f2219f07e..88edc88b3f9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -47,13 +47,14 @@ self: super: {
   idris =
     let idris' = overrideCabal super.idris (drv: {
       # "idris" binary cannot find Idris library otherwise while building.
-      # After installing it's completely fine though.
-      # Seems like Nix-specific issue so not reported.
-      preBuild = ''
-        export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH
-      '';
+      # After installing it's completely fine though. Seems like Nix-specific
+      # issue so not reported.
+      preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
+      # https://github.com/idris-lang/Idris-dev/issues/2499
+      librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
     });
     in idris'.overrideScope (self: super: {
+      # https://github.com/idris-lang/Idris-dev/issues/2500
       zlib = self.zlib_0_5_4_2;
     });
 
@@ -205,7 +206,7 @@ self: super: {
   tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
 
   # http://hub.darcs.net/ivanm/graphviz/issue/5
-  graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./graphviz-fix-ghc710.patch));
+  graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch));
 
   # Broken with GHC 7.10.x.
   aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
@@ -219,6 +220,9 @@ self: super: {
   seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
   vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
 
+  # 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;
 
@@ -264,4 +268,7 @@ self: super: {
   # GHC 7.10.1 is affected by https://github.com/srijs/hwsl2/issues/1.
   hwsl2 = dontCheck super.hwsl2;
 
+  # https://github.com/haskell/haddock/issues/427
+  haddock = dontCheck super.haddock;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 6fbb28d026e..48e7c14f317 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -7,7 +7,7 @@ self: super: {
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
 
-  inherit (pkgs.haskell-ng.packages.ghc7101) jailbreak-cabal alex happy;
+  inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy;
 
   # Many packages fail with:
   #   haddock: internal error: expectJust getPackageDetails
@@ -87,7 +87,7 @@ self: super: {
   });
 
   ghc-paths = overrideCabal super.ghc-paths (drv: {
-    patches = [ ./ghc-paths-nix-ghcjs.patch ];
+    patches = [ ./patches/ghc-paths-nix-ghcjs.patch ];
   });
 
   reflex-dom = overrideCabal super.reflex-dom (drv: {
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 04158ae8e9b..ab3ac6930b9 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -3,8 +3,6 @@
 , overrides ? (self: super: {})
 }:
 
-with ./lib.nix;
-
 let
 
   fix = f: let x = f x // { __unfix__ = f; }; in x;
diff --git a/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch b/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch
deleted file mode 100644
index ec88c65f8bc..00000000000
--- a/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru3 edit-distance-0.2.1.2-old/edit-distance.cabal edit-distance-0.2.1.2/edit-distance.cabal
---- edit-distance-0.2.1.2-old/edit-distance.cabal	2015-04-17 22:46:50.964116064 +0300
-+++ edit-distance-0.2.1.2/edit-distance.cabal	2015-04-17 22:41:31.216027373 +0300
-@@ -36,7 +36,7 @@
-                                 Text.EditDistance.ArrayUtilities
-         
-         if flag(splitBase)
--                Build-Depends:  base >= 3 && < 4.8, array >= 0.1, random >= 1.0, containers >= 0.1.0.1
-+                Build-Depends:  base >= 3 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1
-         else
-                 Build-Depends:  base < 3
-         
-@@ -54,7 +54,7 @@
-         else            
-                 Build-Depends:          test-framework >= 0.1.1, QuickCheck >= 1.1 && < 2.0, test-framework-quickcheck
-                 if flag(splitBase)
--                        Build-Depends:  base >= 3 && < 4.8, array >= 0.1, random >= 1.0
-+                        Build-Depends:  base >= 3 && < 5, array >= 0.1, random >= 1.0
-                 else
-                         Build-Depends:  base < 3
- 
-@@ -65,7 +65,7 @@
-                 Buildable:      False
-         else
-                 if flag(splitBase)
--                        Build-Depends:  base >= 3 && < 4.8, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0,
-+                        Build-Depends:  base >= 3 && < 5, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0,
-                                         deepseq >= 1.2, unix >= 2.3, criterion >= 0.6
-                 else
-                         Build-Depends:  base < 3,
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index b4d1461d1d2..6378f4c1e63 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -113,7 +113,7 @@ let
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
-                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends);
+                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b6a18d7653c..9c95632413e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12,12 +12,11 @@ self: {
        sha256 = "13b7n9mdx7f6a2ghikc7xvscbj8wp0dxcbm5alinnic433sandy5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT OpenGL random ];
+       executableHaskellDepends = [ base GLUT OpenGL random ];
        jailbreak = true;
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples";
        description = "Examples of 3D graphics programming with OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "3dmodels" = callPackage
@@ -26,7 +25,9 @@ self: {
        pname = "3dmodels";
        version = "0.3.0";
        sha256 = "00pp8g1b59950i5ik9ycimxd284vsv1hnfgxgg1mjvxwaj2pbyhr";
-       buildDepends = [ attoparsec base bytestring linear packer ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring linear packer
+       ];
        jailbreak = true;
        homepage = "https://github.com/capsjac/3dmodels";
        description = "3D model parsers";
@@ -42,7 +43,9 @@ self: {
        sha256 = "1lya7320jf2cvd69prvjfwdlci2j17m21qcqaqxaczlrv4aykg6w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo containers gtk haskell98 mtl ];
+       executableHaskellDepends = [
+         base cairo containers gtk haskell98 mtl
+       ];
        jailbreak = true;
        homepage = "http://lambdacolyte.wordpress.com/2009/08/06/tetris-in-haskell/";
        description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
@@ -56,7 +59,7 @@ self: {
        pname = "AAI";
        version = "0.2.0.1";
        sha256 = "0vdq0hscpbl5a9bpf8fiykmyg2c3yvivb0mzcdy99ha0j1p4rwfh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Abstract Application Interface";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69,8 +72,8 @@ self: {
        pname = "ABList";
        version = "0.0.3";
        sha256 = "06hj35k3lbcxh9yn70sa4bw0jafxmxyi2237d6r48dznk4a5fvq1";
-       buildDepends = [ base linear newtype ];
-       testDepends = [
+       libraryHaskellDepends = [ base linear newtype ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -84,7 +87,7 @@ self: {
        pname = "AC-Angle";
        version = "1.0";
        sha256 = "0ra97a4im3w2cq3mf17j8skn6bajs7rw7d0mmvcwgb9jd04b0idm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Angles in degrees and radians";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95,7 +98,7 @@ self: {
        pname = "AC-Boolean";
        version = "1.1.0";
        sha256 = "0id19wgp2jg2pf1gdhfzkyknjj19jii3pz0lva29x3lcck38rw2b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Handle Boolean values generatically";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106,7 +109,7 @@ self: {
        pname = "AC-BuildPlatform";
        version = "1.1.0";
        sha256 = "0vlhakc6mc4zzyvb54rgmskkj8hp43zy35giimk0g7i5068r2czh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118,7 +121,7 @@ self: {
        pname = "AC-Colour";
        version = "1.1.6";
        sha256 = "02v3b1pfhwnf3cl8kbxfkk0a7hdp0gqq5v4w9ka32zl1p007rz19";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Efficient RGB colour types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129,7 +132,7 @@ self: {
        pname = "AC-EasyRaster-GTK";
        version = "1.1.3";
        sha256 = "082il76032biyan170p4qp13154nmkzil4v2wv7fmjn9z7v8w49b";
-       buildDepends = [ array base gtk ];
+       libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141,7 +144,7 @@ self: {
        pname = "AC-HalfInteger";
        version = "1.2.1";
        sha256 = "0wwnb7a6dmzgh122qg322mi3vpyk93xw52cql6dx18sqdbxyxdbb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153,7 +156,7 @@ self: {
        pname = "AC-MiniTest";
        version = "1.1.1";
        sha256 = "0ish59q50npljgmfrcffcyx6scf99xdncmy1kpwy1i5622r1kcps";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165,7 +168,7 @@ self: {
        pname = "AC-PPM";
        version = "1.1.1";
        sha256 = "0y2wzwfnlx50rzkdigmjy3dg5f91pmkf4gmnzjhs3r916d296gkq";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Trivial package for writing PPM images";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176,7 +179,7 @@ self: {
        pname = "AC-Random";
        version = "0.1";
        sha256 = "1c00pcz0c4l2sdaj61zcmw68ckmqb7xlfykv489xms7ak4xl8nc1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A pure Haskell PRNG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187,7 +190,7 @@ self: {
        pname = "AC-Terminal";
        version = "1.0";
        sha256 = "0d0vdqf7i49d2hsdm7x9ad88l7kfc1wvkzppzhs8k9xf4gbrvl43";
-       buildDepends = [ ansi-terminal base ];
+       libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199,7 +202,7 @@ self: {
        pname = "AC-VanillaArray";
        version = "1.1.2";
        sha256 = "044kiwc5g2irky0k3fg9l2qqnvcnh9vdx0yz8m1awnkab6mk0i3v";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        description = "Immutable arrays with plain integer indicies";
        license = stdenv.lib.licenses.bsd3;
@@ -212,7 +215,7 @@ self: {
        pname = "AC-Vector";
        version = "2.3.2";
        sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223,7 +226,7 @@ self: {
        pname = "AC-Vector-Fancy";
        version = "2.4.0";
        sha256 = "0wcan2s75c89s1mxhcvvjgbpn8xqrhmwnfbsrszkzydw3x46465y";
-       buildDepends = [ AC-Angle AC-Vector base ];
+       libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -236,7 +239,9 @@ self: {
        pname = "ACME";
        version = "0.0.0.1";
        sha256 = "103mil8lixg0v2wjizy0pqyy9ywbmrk56mc0n37wwvz0qkjaqnds";
-       buildDepends = [ base list-extras mtl random random-shuffle void ];
+       libraryHaskellDepends = [
+         base list-extras mtl random random-shuffle void
+       ];
        homepage = "http://alkalisoftware.net";
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
@@ -256,12 +261,12 @@ self: {
        sha256 = "06ff9f4wdf7dr0v2cwhzsjn00bmaijgqznhnyf5fp9jyw8ffbbzp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bits containers ghc-prim mmorph monad-primitive mtl
          OrderedBits primitive PrimitiveArray QuickCheck strict
          template-haskell th-orphans transformers tuple vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -280,10 +285,11 @@ self: {
        sha256 = "1zzm6974mfwzswhx9dfh4w1qrlk44w5k8pajqmrgs8hwnx3k8awa";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers criterion deepseq directory QuickCheck random
-         test-framework test-framework-quickcheck2
+       libraryHaskellDepends = [
+         base containers criterion deepseq QuickCheck random test-framework
+         test-framework-quickcheck2
        ];
+       executableHaskellDepends = [ base containers directory ];
        jailbreak = true;
        homepage = "http://code.google.com/p/aern/";
        description = "foundational type classes for approximating exact real numbers";
@@ -299,7 +305,7 @@ self: {
        pname = "AERN-Net";
        version = "0.2.1.1";
        sha256 = "1h7yw85zp8dlyjfi5mr3zvb8cn3xbfxw19nqkz6r7v6s5hfg50qg";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Real AERN-RnToRm base binary containers html stm time
        ];
        jailbreak = true;
@@ -317,7 +323,7 @@ self: {
        pname = "AERN-Real";
        version = "2011.1.0.1";
        sha256 = "1m8fc3agvm5r5vgzsxhjdmmxl679n68isa5cwbbfrv38c20s2p6v";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Basics base criterion QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -339,7 +345,11 @@ self: {
        sha256 = "0hwbw2nibgfddqfhbq8fcm1anibdfa9kgbbxnsbxvkkl6l52cbg2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         AERN-Basics AERN-Real AERN-Real-Interval base ieee-utils QuickCheck
+         test-framework test-framework-quickcheck2
+       ];
+       executableHaskellDepends = [
          AERN-Basics AERN-Real AERN-Real-Interval base criterion ieee-utils
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -358,7 +368,7 @@ self: {
        pname = "AERN-Real-Interval";
        version = "2011.1.0.1";
        sha256 = "1myh6r2cg4sg7k21y3p415pwm2vjfggi92631wzcjxk8ygcafbwv";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Basics AERN-Real base deepseq QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -377,7 +387,7 @@ self: {
        pname = "AERN-RnToRm";
        version = "0.5.0.1";
        sha256 = "0rx93h1h303r4gf9jq32gl08lg4jkfc12kzjnjxampwx75b4lgjv";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Real base binary containers directory filepath html QuickCheck
          time
        ];
@@ -397,7 +407,7 @@ self: {
        pname = "AERN-RnToRm-Plot";
        version = "0.2.0.3";
        sha256 = "0zpp0s90q2jhpagf6iswbmm6hyi0x2hns8vqd5swwa8d258avrbq";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Real AERN-RnToRm base binary containers directory filepath
          glade glib gtk gtkglext mtl OpenGL stm time
        ];
@@ -415,10 +425,10 @@ self: {
      mkDerivation {
        pname = "AES";
        version = "0.2.9";
-       revision = "1";
        sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc";
+       revision = "1";
        editedCabalFile = "9e51c1b1687fe35ccd0f2983e861b5b0441399803ff76b192530984724a68d6f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal monads-tf random transformers
        ];
        description = "Fast AES encryption/decryption for bytestrings";
@@ -431,7 +441,9 @@ self: {
        pname = "AGI";
        version = "1.3";
        sha256 = "1h0hcdvdjs635inq96fpyh2g3d482ilpqn474vk1xkycww0xgsnv";
-       buildDepends = [ base mtl network parsec random syb unix ];
+       libraryHaskellDepends = [
+         base mtl network parsec random syb unix
+       ];
        homepage = "http://src.seereason.com/haskell-agi";
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
@@ -444,8 +456,8 @@ self: {
        pname = "ALUT";
        version = "2.4.0.0";
        sha256 = "0g8rzzk54y8d567dvj32bq0h409ag0am196kkirsjd6f58vgjp0g";
-       buildDepends = [ base OpenAL StateVar transformers ];
-       extraLibraries = [ freealut ];
+       libraryHaskellDepends = [ base OpenAL StateVar transformers ];
+       librarySystemDepends = [ freealut ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -459,7 +471,7 @@ self: {
        pname = "AMI";
        version = "0.1";
        sha256 = "00w6kcikc5ac26786fwshwbh8ndj9aq1w7wz263j5rnhdf12irky";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl network pureMD5 stm
        ];
        homepage = "http://redmine.iportnov.ru/projects/ami";
@@ -474,7 +486,7 @@ self: {
        pname = "ANum";
        version = "0.1.1.0";
        sha256 = "0ilgz1akz66cwwvxd8dkz2fq9gyplc4m206jpmp380ys5n37b4q9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/DanBurton/ANum#readme";
        description = "Num instance for Applicatives provided via the ANum newtype";
        license = stdenv.lib.licenses.bsd3;
@@ -488,7 +500,7 @@ self: {
        pname = "ASN1";
        version = "0.0.1.1";
        sha256 = "188mf1k8p4h8ryngpcs6ldz9n2590h9wfxzxsj396is5r8rxscmh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HUnit mtl NewBinary old-time pretty QuickCheck
        ];
        homepage = "http://www.haskell.org/asn1";
@@ -502,7 +514,7 @@ self: {
        pname = "AVar";
        version = "0.0.5.1";
        sha256 = "0jggzjyms1w4p1ynv8m5yvya64kbxkjdis7wvy3lildmp0w0x0c7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Mutable variables with Exception handling and concurrency support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -513,7 +525,7 @@ self: {
        pname = "AWin32Console";
        version = "1.1";
        sha256 = "0il5bngj4919mmpm0rwmbx74ih3sfbqkaph6w12p49fs466sxkh1";
-       buildDepends = [ base regex-compat Win32 ];
+       libraryHaskellDepends = [ base regex-compat Win32 ];
        description = "A binding to a part of the ANSI escape code for the console";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -525,7 +537,7 @@ self: {
        pname = "AbortT-monadstf";
        version = "1.0";
        sha256 = "1ijv4bs299ijqbkspbg1kry627ra6p6qlkd74q4y2pvamrm4dn6f";
-       buildDepends = [ AbortT-transformers base monads-tf ];
+       libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
        homepage = "http://github.com/gcross/AbortT-transformers";
        description = "Monads-tf instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -537,7 +549,7 @@ self: {
        pname = "AbortT-mtl";
        version = "1.0";
        sha256 = "17rp4v5ibna9fplm526x31k8df8zwkm1imv71yqzpgcqcn48pps2";
-       buildDepends = [ AbortT-transformers base mtl ];
+       libraryHaskellDepends = [ AbortT-transformers base mtl ];
        jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-mtl";
        description = "mtl instances for the AbortT monad transformer";
@@ -552,8 +564,8 @@ self: {
        pname = "AbortT-transformers";
        version = "1.0.1.1";
        sha256 = "00q3c2pr9rl2110624rndn7j2843rl62vh5569q96l2vzfpccgbp";
-       buildDepends = [ base transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
@@ -573,11 +585,15 @@ self: {
        sha256 = "0dsfgclgx4kqjnvn54vvxcbn8l8jyy9gb06qp13hfm5l7lxfjzxq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers gloss gloss-juicy lens mtl OpenGL StateVar
          template-haskell
        ];
-       testDepends = [ base hspec ];
+       executableHaskellDepends = [
+         base containers gloss gloss-juicy lens mtl OpenGL StateVar
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec ];
        jailbreak = true;
        homepage = "https://github.com/egonSchiele/actionkid";
        description = "An easy-to-use video game framework for Haskell";
@@ -593,7 +609,7 @@ self: {
        sha256 = "0n27d8dvk0qq68zp4l5bsj5y9xqmrk9d25psrrf29mmw1f43wp8c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -607,7 +623,7 @@ self: {
        sha256 = "08iblifpyi569zh55ha5bi0nfibz0zlqiibwaimx2k1nd6n6yv5a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -621,7 +637,7 @@ self: {
        sha256 = "16grzya42pzn3zaahs77lw5n2ka138bs0g3vgi0qbxlvxwy5ikyy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 mtl ];
+       executableHaskellDepends = [ base haskell98 mtl ];
        jailbreak = true;
        description = "Lisperati's adventure game in Lisp translated to Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -636,10 +652,10 @@ self: {
        pname = "AesonBson";
        version = "0.2.2";
        sha256 = "1p7636bjczcwwi2c0cdzvpj95vx2fr27qnmh8pcs8hqgmisagq8s";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bson unordered-containers vector
        ];
-       testDepends = [ aeson base bson hspec HUnit text ];
+       testHaskellDepends = [ aeson base bson hspec HUnit text ];
        jailbreak = true;
        homepage = "https://github.com/nh2/AesonBson";
        description = "Mapping between Aeson's JSON and Bson objects";
@@ -655,7 +671,7 @@ self: {
        pname = "Agata";
        version = "0.2.1.1";
        sha256 = "0v8gy2gdbn9133yki7s71a7ph50xzawdvciiahr463apbn6439hm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl QuickCheck tagged template-haskell
        ];
        jailbreak = true;
@@ -676,19 +692,21 @@ self: {
      mkDerivation {
        pname = "Agda";
        version = "2.4.2.3";
-       revision = "1";
        sha256 = "09vvipvab6bys8g7cdka1iirs0wc0jzcyynncccgb614wd2yyvdw";
+       revision = "1";
        editedCabalFile = "25fe17a2302a30f23a57bedf6bc66a8966f4d5f6b10353e2502e18ba98f80eeb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary boxes bytestring containers data-hash deepseq
          directory edit-distance equivalence filepath geniplate-mirror
          hashable hashtables haskeline haskell-src-exts mtl parallel pretty
          process QuickCheck strict template-haskell text time transformers
          transformers-compat unordered-containers xhtml zlib
        ];
-       buildTools = [ alex cpphs emacs happy ];
+       libraryToolDepends = [ alex cpphs happy ];
+       executableHaskellDepends = [ base directory filepath process ];
+       executableToolDepends = [ emacs ];
        postInstall = ''
          $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
          $out/bin/agda-mode compile
@@ -696,7 +714,6 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) emacs;};
 
   "Agda-executable" = callPackage
@@ -707,12 +724,11 @@ self: {
        sha256 = "156nzvpmqi7yizjr4yym2ybc0iv4nqfp84qrpdxcha682k298ib1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ Agda base ];
+       executableHaskellDepends = [ Agda base ];
        jailbreak = true;
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "Command-line program for type-checking and compiling Agda programs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AhoCorasick" = callPackage
@@ -722,7 +738,9 @@ self: {
        pname = "AhoCorasick";
        version = "0.0.3";
        sha256 = "171im3xhrgdzhpxmi1350323apy58pisap0dskcibd3g4jmzslza";
-       buildDepends = [ array base hashable mtl unordered-containers ];
+       libraryHaskellDepends = [
+         array base hashable mtl unordered-containers
+       ];
        homepage = "http://github.com/lymar/AhoCorasick";
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -737,7 +755,7 @@ self: {
        sha256 = "0avkxhw5hp00znhmqw3kqxx165ba5y5kgq8b9ahp679p0qf84a3c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl pretty ];
+       executableHaskellDepends = [ base containers mtl pretty ];
        homepage = "https://github.com/mgrabmueller/AlgorithmW";
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
        license = stdenv.lib.licenses.bsd3;
@@ -751,7 +769,7 @@ self: {
        pname = "AlignmentAlgorithms";
        version = "0.0.2.0";
        sha256 = "110vhp7kdg9l5j3w19wbimmfpq4c05xgx680vb938r1pgpx9s76r";
-       buildDepends = [
+       libraryHaskellDepends = [
          ADPfusion base containers fmlist FormalGrammars GrammarProducts
          PrimitiveArray vector
        ];
@@ -770,11 +788,11 @@ self: {
        sha256 = "0lmkfa6wk0hqin43lf6ll3227c4h7qvya7s6k6sfz8syy51ggqx7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers enummapset-th filepath LambdaHack template-haskell
          text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers enummapset-th filepath LambdaHack template-haskell
          text
        ];
@@ -794,7 +812,7 @@ self: {
        sha256 = "1ksmxhriqy8z3fymnvhg7bwaj032nrsvq3gygfwkg3m8538v9xyc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdtheline containers mtl network opml pretty
          process QuickCheck split transformers xml
        ];
@@ -810,7 +828,7 @@ self: {
        pname = "Animas";
        version = "0.2";
        sha256 = "01vpw9s93qq8c0zymp4qzv0ljn9jrnwi3x68qx9lcjr6spa0rkvm";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        homepage = "https://github.com/eamsden/Animas";
        description = "Updated version of Yampa: a library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -823,11 +841,10 @@ self: {
        pname = "Annotations";
        version = "0.2.1";
        sha256 = "1iqcg47rklibps6xjs7zw76npycpa1jj3x68zz75np3r0fnwiqhj";
-       buildDepends = [ base mtl multirec parsec ];
-       testDepends = [ base mtl multirec parsec ];
+       libraryHaskellDepends = [ base mtl multirec parsec ];
+       testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ansi2Html" = callPackage
@@ -838,7 +855,7 @@ self: {
        sha256 = "1dqq1rnx1w0cn4w11knmxvn7qy4lg4m39dgw4rs6r2pjqzgrwarh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl parsec xhtml ];
+       executableHaskellDepends = [ base mtl parsec xhtml ];
        homepage = "http://janzzstimmpfle.de/~jens/software/Ansi2Html/";
        description = "Convert ANSI Terminal Sequences to nice HTML markup";
        license = stdenv.lib.licenses.bsd3;
@@ -854,9 +871,10 @@ self: {
        sha256 = "0dw52pj17fggi605zf4px852479yc6m6ksbidyw84lkys5dyll3r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring haskell98 json mtl network
        ];
+       executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -868,7 +886,7 @@ self: {
        pname = "AppleScript";
        version = "0.2.0.1";
        sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -881,7 +899,7 @@ self: {
        pname = "ApproxFun-hs";
        version = "0.1.0.0";
        sha256 = "1s7amy8ij5bgv8afbjdzqd3lflvhzrrh3cs3krl1rf73y8b1nqpy";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/ApproxFun.hs";
        description = "Function approximation";
@@ -894,7 +912,7 @@ self: {
        pname = "ArrayRef";
        version = "0.1.3.1";
        sha256 = "1yb209v3lab3knggplmwih1ww6qalf8v86j8ggv1gkhm5jkwz1yq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/Library/ArrayRef";
        description = "Unboxed references, dynamic arrays and more";
        license = stdenv.lib.licenses.bsd3;
@@ -907,7 +925,7 @@ self: {
        pname = "ArrowVHDL";
        version = "1.1";
        sha256 = "1lv76m4qc1sabagllaagi7bpqf1mnmzsra333a77b6134mk2f9hb";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        jailbreak = true;
        homepage = "https://github.com/frosch03/arrowVHDL";
        description = "A library to generate Netlist code from Arrow descriptions";
@@ -920,10 +938,12 @@ self: {
      mkDerivation {
        pname = "AspectAG";
        version = "0.3.6.1";
-       revision = "1";
        sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf";
+       revision = "1";
        editedCabalFile = "d5b68030eaf2111998f6d5774a1d26d5afb685fe6b087fe1aed7ef90084a0070";
-       buildDepends = [ base containers HList mtl template-haskell ];
+       libraryHaskellDepends = [
+         base containers HList mtl template-haskell
+       ];
        jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG";
        description = "Attribute Grammars in the form of an EDSL";
@@ -940,10 +960,10 @@ self: {
        pname = "AttoBencode";
        version = "0.3.1.0";
        sha256 = "0rzzi4asfmkg8nqlxdyq3gwg0q10hqrnvlmq4fjcxvxgvz1ys9hb";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -961,7 +981,7 @@ self: {
        pname = "AttoJson";
        version = "0.5.10";
        sha256 = "0mavq6akhx7pjdz15ckgnmgf8z9zhi5fm97lvjpjdfiggfy191d2";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-show containers mtl
          utf8-string
        ];
@@ -978,7 +998,9 @@ self: {
        sha256 = "0spvvgkf33km969l524580kwn7y43rjm2k0lqp9bl60nbvlsw760";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base colour GLUT OpenGL random ];
+       executableHaskellDepends = [
+         array base colour GLUT OpenGL random
+       ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/rhz/StrangeAttractors";
        description = "Visualisation of Strange Attractors in 3-Dimensions";
@@ -994,7 +1016,7 @@ self: {
        sha256 = "0n51j50qlpkgkq64n7w96qkv270lwxac1h7ariqq7w70zgdgiqf5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parsec pretty ];
+       executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1008,7 +1030,7 @@ self: {
        pname = "AutoForms";
        version = "0.4.2";
        sha256 = "14dd6s3j9w738dvhyhxb9q8w9m0xhd6fm0d40b3gzl5sjb6g16zf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base haskell98 mtl syb-with-class template-haskell wx wxcore
        ];
        homepage = "http://autoforms.sourceforge.net/";
@@ -1023,7 +1045,7 @@ self: {
        pname = "AvlTree";
        version = "4.2";
        sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx";
-       buildDepends = [ base COrdering ];
+       libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1035,7 +1057,7 @@ self: {
        pname = "BASIC";
        version = "0.1.5.0";
        sha256 = "1ypq7m09ki5wbwkvmqdl7ch40cbdfhb91kq8n17im184r5liyxlc";
-       buildDepends = [ base containers llvm random timeit ];
+       libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1052,10 +1074,15 @@ self: {
        sha256 = "1693kg8hxr1jl8h0ri11dbrbyhyznipkvcp0cvvx9chn97761ys4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring bytestring-lexing cereal colour conduit
-         conduit-extra data-default-class matrices optparse-applicative
-         resourcet split transformers unordered-containers vector zlib
+       libraryHaskellDepends = [
+         base bytestring cereal colour conduit conduit-extra
+         data-default-class matrices transformers unordered-containers
+         vector zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring bytestring-lexing cereal conduit conduit-extra
+         data-default-class optparse-applicative resourcet split
+         unordered-containers
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
@@ -1073,14 +1100,15 @@ self: {
        sha256 = "0d3zcxspxcpnifv3kqg8d6gp01wxybakcbw7jh69gqg8rzfmzgi1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ array base ];
+       executableHaskellDepends = [
          array base containers deepseq directory filepath mtl pretty process
        ];
-       testDepends = [
+       executableToolDepends = [ alex happy ];
+       testHaskellDepends = [
          array base containers deepseq directory doctest filepath hspec
          HUnit mtl pretty process QuickCheck temporary
        ];
-       buildTools = [ alex happy ];
        homepage = "http://bnfc.digitalgrammars.com/";
        description = "A compiler front-end generator";
        license = stdenv.lib.licenses.gpl2;
@@ -1094,13 +1122,12 @@ self: {
        pname = "BNFC-meta";
        version = "0.4.0.3";
        sha256 = "10rfljhygdl75ibmj0xqj7qwdk0ppjr8iw4wmvzdpl28mqjshny2";
-       buildDepends = [
+       libraryHaskellDepends = [
          alex-meta array base happy-meta haskell-src-meta syb
          template-haskell
        ];
        description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Baggins" = callPackage
@@ -1108,10 +1135,10 @@ self: {
      mkDerivation {
        pname = "Baggins";
        version = "1.0";
-       revision = "1";
        sha256 = "0mgxq8zqyfmwkvn91y91c2vjhrni3br0vgiih2ynlafnas1ji0bc";
+       revision = "1";
        editedCabalFile = "654cbc7a4109bf3baaa2491f10a7f49d1831008129d4d5ef9e0e558a5a374098";
-       buildDepends = [ base cairo containers mtl ];
+       libraryHaskellDepends = [ base cairo containers mtl ];
        jailbreak = true;
        homepage = "http://pageperso.lif.univ-mrs.fr/~pierre-etienne.meunier/Baggins";
        description = "Tools for self-assembly";
@@ -1127,7 +1154,9 @@ self: {
        pname = "Bang";
        version = "0.1.1.0";
        sha256 = "1y68k1xsx2fksz70z5b8wdf5brk3vqsc6sih2asp4f97nwlkm5fw";
-       buildDepends = [ base bifunctors hmidi mtl stm time transformers ];
+       libraryHaskellDepends = [
+         base bifunctors hmidi mtl stm time transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/5outh/Bang/";
        description = "A Drum Machine DSL for Haskell";
@@ -1146,7 +1175,13 @@ self: {
        sha256 = "0i8b6g2jvwg5r5gi1q3fgckh675pc6viqdvncl4ycr4zf72r4jj3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         adhoc-network array base bytestring containers Crypto dataenc
+         directory filepath gtk HaXml heap hsgnutls mtl network old-locale
+         parsec pkcs1 random regex-compat stm time unix utf8-string
+         xml-parsec
+       ];
+       executableHaskellDepends = [
          adhoc-network array base bytestring containers Crypto dataenc
          directory filepath gtk HaXml heap hsgnutls mtl network old-locale
          parsec pkcs1 random regex-compat stm time unix utf8-string
@@ -1166,7 +1201,7 @@ self: {
        sha256 = "1hs4p5s30ml97yrr91ahy7275jh4vyvh2l5p0p3jvpfysvg9sl6l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base mtl random ];
+       executableHaskellDepends = [ array base mtl random ];
        jailbreak = true;
        homepage = "http://coder.bsimmons.name/blog/2010/05/befunge-93-interpreter-on-hackage";
        description = "An interpreter for the Befunge-93 Programming Language";
@@ -1184,7 +1219,7 @@ self: {
        sha256 = "07qdadcs76h7yd0k4hn3x3yqdiq7hp5lflxbxxlicx76k20fgl99";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cassava deepseq directory statistics time vector
        ];
        homepage = "https://github.com/choener/BenchmarkHistory";
@@ -1198,8 +1233,8 @@ self: {
        pname = "BerkeleyDB";
        version = "0.8.7";
        sha256 = "0q1qc6rds05bkxl2m3anp7x75cwinp9nhy8j0g1vaj2scasvki62";
-       buildDepends = [ base bytestring extensible-exceptions ];
-       extraLibraries = [ db ];
+       libraryHaskellDepends = [ base bytestring extensible-exceptions ];
+       librarySystemDepends = [ db ];
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB binding";
        license = stdenv.lib.licenses.bsd3;
@@ -1213,8 +1248,8 @@ self: {
        pname = "BerkeleyDBXML";
        version = "0.7.2";
        sha256 = "1ymdi5qi4hxaikqf8min830r1rs1z4bvy9bdybsq378v7mrgfihp";
-       buildDepends = [ base BerkeleyDB bytestring ];
-       extraLibraries = [ db dbxml xercesc xqilla ];
+       libraryHaskellDepends = [ base BerkeleyDB bytestring ];
+       librarySystemDepends = [ db dbxml xercesc xqilla ];
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
@@ -1228,7 +1263,7 @@ self: {
        pname = "BerlekampAlgorithm";
        version = "0.1.0.0";
        sha256 = "14wjpfr9d8fpgl1jkpm2123lprr3hf3a6smkaflzkgxqlgcrkmyr";
-       buildDepends = [ base besout ];
+       libraryHaskellDepends = [ base besout ];
        jailbreak = true;
        description = "Factorization of polynomials over finite field";
        license = stdenv.lib.licenses.bsd3;
@@ -1242,7 +1277,7 @@ self: {
        sha256 = "19fxxbgj67rz2fpxd6f307xd6p7blwynq6gcakjnc7kdq8ghfrgz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bmp bytestring gloss ];
+       executableHaskellDepends = [ array base bmp bytestring gloss ];
        homepage = "https://github.com/mchakravarty/BigPixel";
        description = "Image editor for pixel art";
        license = stdenv.lib.licenses.bsd3;
@@ -1254,7 +1289,7 @@ self: {
        pname = "Binpack";
        version = "0.4.1";
        sha256 = "0am0487l7njngp2k6h3qfbhjs61d9ir9rp8iw1r5448b20n4fxas";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Common bin-packing heuristics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1270,7 +1305,7 @@ self: {
        pname = "Biobase";
        version = "0.3.1.1";
        sha256 = "1zrslhf3aiwc3y0b628j1w93z78v9apcjm2sxyw5qcq6r48zrmcc";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq directory either-unwrap
          file-embed filemanip filepath ghc-prim HsTools mtl parsec
          ParsecTools primitive PrimitiveArray split tuple utility-ht vector
@@ -1289,7 +1324,7 @@ self: {
        pname = "BiobaseBlast";
        version = "0.0.0.1";
        sha256 = "1p7f2azq92shmxvs3n683mr5965qkmijbj4ya6333cd7nilwgl0f";
-       buildDepends = [ array base BiobaseXNA containers ];
+       libraryHaskellDepends = [ array base BiobaseXNA containers ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
@@ -1302,7 +1337,7 @@ self: {
        pname = "BiobaseDotP";
        version = "0.1.0.0";
        sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w";
-       buildDepends = [ base bytestring iteratee ];
+       libraryHaskellDepends = [ base bytestring iteratee ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Vienna / DotBracket / ExtSS parsers";
        license = stdenv.lib.licenses.gpl3;
@@ -1317,7 +1352,7 @@ self: {
        pname = "BiobaseFR3D";
        version = "0.2.3.0";
        sha256 = "1y8aqxb8gq4k4l0i2wcrn2yi6f7lcmbhbvs4n063r4hgda6xfgch";
-       buildDepends = [
+       libraryHaskellDepends = [
          base BiobaseXNA bytestring containers filemanip iteratee tuple
        ];
        jailbreak = true;
@@ -1337,9 +1372,10 @@ self: {
        sha256 = "035pr31mrmfhmpja8llw81jyxy11aba62bfph34gf3rsi96iylnw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base biocore bytestring cmdargs conduit containers transformers
+       libraryHaskellDepends = [
+         base biocore bytestring conduit containers transformers
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "conduit-based FASTA parser";
@@ -1357,7 +1393,7 @@ self: {
        pname = "BiobaseInfernal";
        version = "0.7.1.0";
        sha256 = "19ga8qaqfp3jkd3mn8p1qrxv0frp4f4qkzhn0p0n8as6dlsifd2s";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base BiobaseXNA biocore bytestring
          bytestring-lexing conduit containers either-unwrap lens primitive
          PrimitiveArray repa transformers tuple vector
@@ -1375,7 +1411,7 @@ self: {
        pname = "BiobaseMAF";
        version = "0.5.0.0";
        sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r";
-       buildDepends = [ base bytestring containers iteratee ];
+       libraryHaskellDepends = [ base bytestring containers iteratee ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Multiple Alignment Format";
        license = stdenv.lib.licenses.gpl3;
@@ -1392,10 +1428,11 @@ self: {
        sha256 = "0qqyj3y2ivxj4d1c4bl5mdi7xm649dvksl57ba0wl0awimi5xn2s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base BiobaseDotP BiobaseFR3D BiobaseXNA bytestring cmdargs
-         either-unwrap iteratee vector
+       libraryHaskellDepends = [
+         base BiobaseDotP BiobaseFR3D BiobaseXNA bytestring either-unwrap
+         iteratee vector
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "RNA folding training data";
@@ -1412,7 +1449,7 @@ self: {
        pname = "BiobaseTurner";
        version = "0.3.1.1";
        sha256 = "1h6yn6nwl8ifbz8y1rq5xklhmnbbjibfi9qz4n79xmv7y9bgkbxf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base BiobaseXNA bytestring bytestring-lexing conduit containers
          filepath lens primitive PrimitiveArray repa split vector
        ];
@@ -1433,19 +1470,18 @@ self: {
        pname = "BiobaseTypes";
        version = "0.1.1.0";
        sha256 = "1z3vhxqqyc1bn1byvld21psi7am8zwmxsa7aiqshppw5hqyslwvl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary cereal cereal-text data-default deepseq hashable
          log-domain primitive PrimitiveArray QuickCheck stringable text
          text-binary vector vector-binary-instances vector-th-unbox
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
        homepage = "https://github.com/choener/BiobaseTypes";
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -1456,7 +1492,7 @@ self: {
        pname = "BiobaseVienna";
        version = "0.3.0.0";
        sha256 = "0bv100rmr04w8wbzabihv43lxilr0b2rm97rx54bhln1sy0ih1wj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector
        ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
@@ -1477,12 +1513,13 @@ self: {
        sha256 = "1ck6yba372w3cbzgifcbfdd2m4nfyy7zd8zygkji3zbxymz2ak18";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bimaps binary bytes bytestring cereal cereal-vector
-         cmdargs containers csv deepseq file-embed hashable lens primitive
+         containers csv deepseq file-embed hashable lens primitive
          PrimitiveArray split text tuple vector vector-binary-instances
          vector-th-unbox
        ];
+       executableHaskellDepends = [ base cmdargs ];
        homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
@@ -1496,7 +1533,7 @@ self: {
        sha256 = "14wbnxjyg75vc7zwg42cpk8a1cb7gm4881c52yaq1bq053g5dsz2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 ];
+       executableHaskellDepends = [ base haskell98 ];
        jailbreak = true;
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
@@ -1511,7 +1548,7 @@ self: {
        pname = "BitSyntax";
        version = "0.3.2";
        sha256 = "1kz9s9g05b5qzw9p7vvyw8zmy9sx1wzn83ay6prdyv74x0wycjbl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring haskell98 QuickCheck template-haskell
        ];
        homepage = "http://www.imperialviolet.org/bitsyntax";
@@ -1526,7 +1563,7 @@ self: {
        pname = "Bitly";
        version = "0.1.0";
        sha256 = "1pmmgg6n6pc0qvp5r4qxan32887132si0cayd0xh1g5v98fa9ari";
-       buildDepends = [ base HTTP json2 ];
+       libraryHaskellDepends = [ base HTTP json2 ];
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
        description = "A library to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
@@ -1540,10 +1577,10 @@ self: {
      mkDerivation {
        pname = "BlastHTTP";
        version = "1.2.0";
-       revision = "1";
        sha256 = "0vhnwjgamc1zry8w7m6jb7ambz3lqqr00j05xymzwcapgwg8v9b5";
+       revision = "1";
        editedCabalFile = "7076650ad04d2c5945b96ec1a8d5db8ee680314d4dc4cff54f264316e7f69bba";
-       buildDepends = [
+       libraryHaskellDepends = [
          base biocore biofasta blastxml bytestring conduit HTTP http-conduit
          hxt mtl network transformers
        ];
@@ -1562,7 +1599,10 @@ self: {
        sha256 = "09mpf3qwr38x0ljz4ziyhdcwl5j37i353wc2dkpc6hjki9p08rgl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory HaXml polyparse pretty wx wxcore
+       ];
+       executableHaskellDepends = [
          base containers directory HaXml polyparse pretty wx wxcore
        ];
        homepage = "http://www.cs.york.ac.uk/fp/darcs/Blobs/";
@@ -1584,12 +1624,13 @@ self: {
        sha256 = "02q0i2p892adpmi7p4hh8666qzrpi76bxwljf575hiaz018yixlb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bool-extras bytestring cmdargs containers
          data-default directory filepath HaXml haxr highlighting-kate
          hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
          process split strict temporary transformers
        ];
+       executableHaskellDepends = [ base cmdargs ];
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -1606,10 +1647,11 @@ self: {
        sha256 = "190wny2ggqahsiv5ar23pndf3ngparb5mrrjp7his5crp6xvk66m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base BlogLiterately containers diagrams-builder diagrams-lib
          diagrams-rasterific directory filepath JuicyPixels pandoc safe
        ];
+       executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1621,7 +1663,7 @@ self: {
        pname = "BluePrintCSS";
        version = "0.1";
        sha256 = "0ryjgi70isgfv3nw3djzvb1saky40xqy536h6sr3mfpy2iqnim0c";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://git.ierton.ru/?p=BluePrint.git;a=summary";
        description = "Html document layout library";
        license = stdenv.lib.licenses.bsd3;
@@ -1649,11 +1691,11 @@ self: {
        sha256 = "1h23ncphq717xqvg3bhij0ypmi6whm0aibhmiwak71sjkzv604in";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath pandoc pandoc-citeproc
          pandoc-types parseargs
        ];
-       testDepends = [ base process ];
+       testHaskellDepends = [ base process ];
        homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
@@ -1666,7 +1708,7 @@ self: {
        pname = "Boolean";
        version = "0.2.3";
        sha256 = "1lsm06y7hgjp9qmlr6csf24x3wgna7sbf8dgh6sfl2rhs7fn8kgn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generalized booleans and numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1677,7 +1719,7 @@ self: {
        pname = "BoundedChan";
        version = "1.0.3.0";
        sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Implementation of bounded channels";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1690,7 +1732,7 @@ self: {
        pname = "Bravo";
        version = "0.1.0.1";
        sha256 = "16li42rl77jvhyp14fjic66c7d6qm2fjln93gyw4bqbykai291in";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta mtl parsec syb
          template-haskell
        ];
@@ -1707,7 +1749,7 @@ self: {
        pname = "BufferedSocket";
        version = "0.2.0.0";
        sha256 = "0sgwglnzsqwz1k11jbzp7lpb29h9ap2mny2lv9m9nrlr0ydhcdqf";
-       buildDepends = [ base bytestring network text ];
+       libraryHaskellDepends = [ base bytestring network text ];
        jailbreak = true;
        description = "A socker wrapper that makes the IO of sockets much cleaner";
        license = stdenv.lib.licenses.mit;
@@ -1725,11 +1767,11 @@ self: {
        sha256 = "12zchy3sqdcqdgbb7d29jrsqifz4hfdx94s514v2mmyzzr0m8xqd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring conduit data-default errors hinotify hslogger
          http-conduit http-types transformers unbounded-delays unix yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring errors hslogger hspec hspec-expectations
          http-conduit http-types string-qq temporary unix yaml
        ];
@@ -1749,10 +1791,10 @@ self: {
        pname = "CBOR";
        version = "0.1.0.1";
        sha256 = "03h8lp5sm8prbphq98c7ar93rl9yfy29pvwrkrskdjhx79pd1w6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-bits bytestring data-binary-ieee754
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary binary-bits bytestring data-binary-ieee754 doctest
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -1768,7 +1810,7 @@ self: {
        pname = "CC-delcont";
        version = "0.2";
        sha256 = "0bl71vj1ypzplx92kz27hhbpnwnxkz5g2q86m4fcmjmp4fym8kc1";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://code.haskell.org/~dolio/CC-delcont";
        description = "Delimited continuations and dynamically scoped variables";
        license = "unknown";
@@ -1783,10 +1825,10 @@ self: {
        pname = "CC-delcont-alt";
        version = "0.1.1.1";
        sha256 = "0s6z5bcxmcx1vzgjc6r2i4898j6s3ngjjdqhggp893hmhpxlbgsv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base CC-delcont-cxe CC-delcont-exc CC-delcont-ref mtl
        ];
-       testDepends = [ base doctest mtl ];
+       testHaskellDepends = [ base doctest mtl ];
        description = "Three new monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1798,7 +1840,7 @@ self: {
        pname = "CC-delcont-cxe";
        version = "0.1.0.2";
        sha256 = "1s6bql9r78yfzgarm3i4f2glhc5w8qq91adhs15cnqj6h7768a5c";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1810,7 +1852,7 @@ self: {
        pname = "CC-delcont-exc";
        version = "0.1.0.0";
        sha256 = "07v388bzs8x9k1p677310rbh8baj1fdq3bhbqyvxqzx93kv8g381";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1822,7 +1864,7 @@ self: {
        pname = "CC-delcont-ref";
        version = "0.1.0.0";
        sha256 = "0fzjr73id8rlrcmf0j3y1qn4jnc8incqhhkp9wl35lig20kqy82m";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1834,7 +1876,7 @@ self: {
        pname = "CC-delcont-ref-tf";
        version = "0.1.0.2";
        sha256 = "0zavw824xcr1jhmlpz9hmabhhi459y0s7z434lxalzha01j1wfih";
-       buildDepends = [ base ref-tf transformers ];
+       libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1850,10 +1892,9 @@ self: {
        sha256 = "05zv1vha31fgw4ddvrnbvk5pzhq8lkvfx1xrgja5ggy451zrs6aw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base containers ghc-prim haskell-src syb template-haskell
-       ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ base ghc-prim syb template-haskell ];
+       executableHaskellDepends = [ array base containers haskell-src ];
+       executableToolDepends = [ happy ];
        homepage = "not available";
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
        license = stdenv.lib.licenses.bsd3;
@@ -1866,7 +1907,9 @@ self: {
        pname = "CHXHtml";
        version = "0.2.0";
        sha256 = "0pr2mvcnrz3240wnpd44g3pz9x8am6vhhfvl0lyl129kvc33v99q";
-       buildDepends = [ base bytestring hxt-regex-xmlschema utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring hxt-regex-xmlschema utf8-string
+       ];
        homepage = "http://fuzzpault.com/chxhtml";
        description = "A W3C compliant (X)HTML generating library";
        license = stdenv.lib.licenses.bsd3;
@@ -1880,7 +1923,7 @@ self: {
        pname = "CLASE";
        version = "2009.2.11";
        sha256 = "10jab7jxlhppmqqw31g653l8jmz4vz8f9h9wr2i9fjf6bipvgfi3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath mtl parsec template-haskell
        ];
        homepage = "http://www.zonetora.co.uk/clase/";
@@ -1895,8 +1938,8 @@ self: {
        pname = "CLI";
        version = "0.1.0.0";
        sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall";
-       buildDepends = [ base directory split time ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base directory split time ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        description = "CLI tools";
        license = stdenv.lib.licenses.bsd3;
@@ -1912,9 +1955,10 @@ self: {
        sha256 = "1ccjyn0cc8yx7fgnvsjap0swlxql3gdygb5mabzvkgk84zc3bh2b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base BiobaseInfernal BiobaseXNA cmdargs containers lens
+       libraryHaskellDepends = [
+         array base BiobaseInfernal BiobaseXNA containers lens
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://www.tbi.univie.ac.at/software/cmcompare/";
        description = "Infernal covariance model comparison";
@@ -1930,7 +1974,7 @@ self: {
        pname = "CMQ";
        version = "0.0.12";
        sha256 = "0zskbcjdd4s8bkll7jvb8qzyq8pa52li4db9r5wg16pd2l3m0fpb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers iproute mtl network PSQueue stm
          time
        ];
@@ -1945,7 +1989,7 @@ self: {
        pname = "COrdering";
        version = "2.3";
        sha256 = "1lkav4wkyrraq1f6kyqfyjrxasgkayg4hmyv8a1gkr4h484b1cx8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1959,7 +2003,7 @@ self: {
        sha256 = "041bm02xar8g6ppz6g0fdgs4ywavlcn4pqkncydx0lw5wp9ygwwn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 ];
+       executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1973,7 +2017,9 @@ self: {
        sha256 = "1hm2slnvcp1fqdrgx505wkj3w511x9896h2hj9riyky6vg2mzgr7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl parsec readline ];
+       executableHaskellDepends = [
+         array base containers mtl parsec readline
+       ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1985,7 +2031,7 @@ self: {
        pname = "CSPM-CoreLanguage";
        version = "0.3.0.3";
        sha256 = "0vr6zpdz5lnpkyzwhig72pv8ncvqdjyp1nn76zpx3v6xlpzrs3q2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Definition of a FDR-compatible CSP core-language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1998,7 +2044,7 @@ self: {
        pname = "CSPM-FiringRules";
        version = "0.4.3.0";
        sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers CSPM-CoreLanguage mtl parallel-tree-search
          QuickCheck random tree-monad
        ];
@@ -2016,11 +2062,11 @@ self: {
        pname = "CSPM-Frontend";
        version = "0.10.0.0";
        sha256 = "0wmfk9givv604ajzkg60586lz08xqcx60bnqgslpfzkh458mz9z3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers dlist either ghc-prim mtl parsec2 prettyclass
          syb transformers
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
        jailbreak = true;
        description = "A CSP-M parser compatible with FDR-2.91";
        license = stdenv.lib.licenses.bsd3;
@@ -2035,7 +2081,7 @@ self: {
        pname = "CSPM-Interpreter";
        version = "0.7.0.0";
        sha256 = "0shf0bb4zqnxvclsavvxnsy697xbl5q1xjqww8makps6dirwk0qn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers CSPM-CoreLanguage CSPM-Frontend mtl
          prettyclass syb
        ];
@@ -2053,7 +2099,7 @@ self: {
        pname = "CSPM-ToProlog";
        version = "0.5.2.0";
        sha256 = "0qy2zdxgdm9vacm2ickf1lvyj6wrcnpifaxgh25apg9j9v6g0h12";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers CSPM-Frontend ghc-prim pretty
        ];
        jailbreak = true;
@@ -2073,7 +2119,12 @@ self: {
        sha256 = "1lhfq8gjls2g3xwskwa7vx1kj6n83b4msx4fc6769li4r2xn1bc9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules
+         CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty
+         prettyclass syb transformers xml
+       ];
+       executableHaskellDepends = [
          base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules
          CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty
          prettyclass syb transformers xml
@@ -2092,7 +2143,7 @@ self: {
        pname = "CTRex";
        version = "0.6";
        sha256 = "0cjinznkvdrswbqrsha49b6hch7sjv2qq9xllx780klf01kdahi6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable mtl unordered-containers
        ];
        homepage = "http://www.haskell.org/haskellwiki/CTRex";
@@ -2113,17 +2164,17 @@ self: {
        pname = "CV";
        version = "0.3.7";
        sha256 = "0c200jn6q4y744k39jll7xw418js7y86vvihz49i8kk2316vakmr";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bindings-DSL carray containers deepseq directory
          filepath lazysmallcheck mtl mwc-random parallel parallel-io
          primitive QuickCheck storable-complex storable-tuple vector
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [
+       librarySystemDepends = [
          opencv_calib3d opencv_contrib opencv_core opencv_features2d
          opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_legacy
          opencv_ml opencv_objdetect opencv_video
        ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "http://aleator.github.com/CV/";
        description = "OpenCV based machine vision library";
@@ -2145,17 +2196,16 @@ self: {
        pname = "Cabal";
        version = "1.18.1.6";
        sha256 = "15nn6f8bnqzy7pqxb45hdf30qid2hw608dcqgmwrcfrd8zrrvylw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory extensible-exceptions filepath HUnit
          process QuickCheck regex-posix test-framework test-framework-hunit
          test-framework-quickcheck2 unix
        ];
        jailbreak = true;
-       preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
@@ -2171,17 +2221,16 @@ self: {
        pname = "Cabal";
        version = "1.20.0.3";
        sha256 = "0vq1xcwvvk74jkzp7386ldyrls8qszg3rj4l37fyq3fvjkqnx80v";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory extensible-exceptions filepath HUnit
          process QuickCheck regex-posix test-framework test-framework-hunit
          test-framework-quickcheck2 unix
        ];
        jailbreak = true;
-       preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
@@ -2198,17 +2247,16 @@ self: {
        pname = "Cabal";
        version = "1.22.4.0";
        sha256 = "19nwapy5rvsrk8jc75ql5klp8hikzrwd3c5x07nisl73d2r8ssmr";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          HUnit old-time process QuickCheck regex-posix test-framework
          test-framework-hunit test-framework-quickcheck2 unix
        ];
        jailbreak = true;
-       preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
@@ -2225,11 +2273,11 @@ self: {
        pname = "Cabal-ide-backend";
        version = "1.23.0.0";
        sha256 = "07s9gkq2d4sz8nrjayrnb3gbjm58sp7gfl3hnl8n1gsxsfbl2cgw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring Cabal containers directory extensible-exceptions
          filepath HUnit old-time process QuickCheck regex-posix
          test-framework test-framework-hunit test-framework-quickcheck2 unix
@@ -2250,7 +2298,7 @@ self: {
        sha256 = "181k2rybbyhjmwf1fq69hiaf14a0rzcvnv4j9w03n2v7cal4k08b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath HDBC HDBC-sqlite3 process unix
        ];
        jailbreak = true;
@@ -2265,7 +2313,7 @@ self: {
        pname = "Capabilities";
        version = "0.1.0.0";
        sha256 = "0nd5yvhbxmabs0890y9gjjiq37h8c3blpplv2m13k29zkijwad04";
-       buildDepends = [ base compdata directory free unix ];
+       libraryHaskellDepends = [ base compdata directory free unix ];
        jailbreak = true;
        homepage = "https://github.com/Icelandjack/Capabilities";
        description = "Separate and contain effects of IO monad";
@@ -2279,7 +2327,7 @@ self: {
        pname = "Cardinality";
        version = "0.2";
        sha256 = "01bp045vl08sixvi6h0i21vvmjirnyzlmwxx8yq5njbcxrgbq6dn";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Measure container capacity. Use it to safely change container.";
        license = "LGPL";
      }) {};
@@ -2290,7 +2338,7 @@ self: {
        pname = "CarneadesDSL";
        version = "1.3";
        sha256 = "06ri47cfskvpm65zb63kjrwwhzlmcp2f0z99hqkfw216p85648a3";
-       buildDepends = [ base containers fgl parsec ];
+       libraryHaskellDepends = [ base containers fgl parsec ];
        homepage = "http://www.cs.nott.ac.uk/~bmv/CarneadesDSL/";
        description = "An implementation and DSL for the Carneades argumentation model";
        license = stdenv.lib.licenses.bsd3;
@@ -2305,7 +2353,9 @@ self: {
        sha256 = "0gmrc778zan5rrkb7rip61736rzx13abfzyjcj4bgdvc3fhih1rx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base CarneadesDSL cmdargs containers Dung fgl ];
+       libraryHaskellDepends = [
+         base CarneadesDSL cmdargs containers Dung fgl
+       ];
        homepage = "http://www.cs.nott.ac.uk/~bmv/CarneadesIntoDung/";
        description = "A translation from the Carneades argumentation model into Dung's AFs";
        license = stdenv.lib.licenses.bsd3;
@@ -2317,7 +2367,7 @@ self: {
        pname = "Cascade";
        version = "0.1.0.0";
        sha256 = "1ih8ydc29axckgidc5xvsdac5558gprscw667msh8qh41j9sshng";
-       buildDepends = [ base comonad ghc-prim mtl void ];
+       libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
        jailbreak = true;
        homepage = "http://github.com/rampion/Cascade";
        description = "Playing with reified categorical composition";
@@ -2331,7 +2381,7 @@ self: {
        pname = "Catana";
        version = "0.3";
        sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2345,7 +2395,7 @@ self: {
        pname = "Chart";
        version = "1.5.1";
        sha256 = "0jm1wr2nb1r8rxqc564nmnclns160y7girc7j2ihvyhm0v34p59g";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
@@ -2362,7 +2412,7 @@ self: {
        pname = "Chart-cairo";
        version = "1.5.1";
        sha256 = "1fwjgms76z2spgfw3kfmzivkgp6gdkx24mp5nb562kza4y6yjz7f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
        ];
@@ -2381,7 +2431,7 @@ self: {
        pname = "Chart-diagrams";
        version = "1.5.1";
        sha256 = "1slsq9p9mq9jxlyhpd90bh32s6fqvy149p4cb7ckygzd77r1aqxz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
          diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts
@@ -2401,7 +2451,7 @@ self: {
        pname = "Chart-gtk";
        version = "1.5.1";
        sha256 = "025snbbsnd2gsldw2j8r3vxh94jrv57h8z4qvkq3dwyh2mvq21lw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
        ];
@@ -2418,7 +2468,7 @@ self: {
        pname = "Chart-simple";
        version = "1.3.3";
        sha256 = "0kk81jz4lciga8qc78gm9khw02n84snyclzf5lcmlz9rs50z3v5r";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo Chart Chart-cairo Chart-gtk colour
          data-default-class gtk mtl old-locale time
        ];
@@ -2436,8 +2486,12 @@ self: {
        pname = "ChasingBottoms";
        version = "1.3.0.13";
        sha256 = "1fb86jd6cdz4rx3fj3r9n8d60kx824ywwy7dw4qnrdran46ja3pl";
-       buildDepends = [ base containers mtl QuickCheck random syb ];
-       testDepends = [ array base containers mtl QuickCheck random syb ];
+       libraryHaskellDepends = [
+         base containers mtl QuickCheck random syb
+       ];
+       testHaskellDepends = [
+         array base containers mtl QuickCheck random syb
+       ];
        description = "For testing partial and infinite values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -2450,7 +2504,7 @@ self: {
        sha256 = "1pw6sssdmxpsjclkhsaf1b06vlimi4w11rxy65ccyj8c9zgs2g23";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory ];
+       executableHaskellDepends = [ base containers directory ];
        homepage = "http://cheatsheet.codeslower.com";
        description = "A Haskell cheat sheet in PDF and literate formats";
        license = stdenv.lib.licenses.bsd3;
@@ -2462,7 +2516,7 @@ self: {
        pname = "Checked";
        version = "0.0.0.2";
        sha256 = "1mr323rhh3lr6a5ni60n2kxz2k57763a3rrf7c6i18hxs9d4w2s4";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "Inbuilt checking for ultra reliable computing";
        license = stdenv.lib.licenses.bsd3;
@@ -2476,7 +2530,7 @@ self: {
        sha256 = "0qf6a1xmpv29hpwcrn3acfvpcx0f95dq980mv5mijzfsznz4d43k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring mtl network ];
+       executableHaskellDepends = [ base binary bytestring mtl network ];
        homepage = "https://github.com/ckkashyap/Chitra";
        description = "A platform independent mechanism to render graphics using vnc";
        license = stdenv.lib.licenses.bsd3;
@@ -2491,7 +2545,7 @@ self: {
        pname = "ChristmasTree";
        version = "0.2.1.1";
        sha256 = "1xng99msiyck127zv12cbksgyprwr6i6nwwjplc9c0jdfiisa9n8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fgl template-haskell TTTAS uulib
        ];
        jailbreak = true;
@@ -2507,7 +2561,7 @@ self: {
        pname = "CirruParser";
        version = "0.0.1";
        sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9";
-       buildDepends = [ aeson base text vector ];
+       libraryHaskellDepends = [ aeson base text vector ];
        homepage = "https://github.com/Cirru/parser.hs";
        description = "Cirru Parser in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -2519,7 +2573,7 @@ self: {
        pname = "ClassLaws";
        version = "0.3.1.0";
        sha256 = "1277vn384hpxd7xnzg0gpr7ilnw5cqhsi11c24g9zsfqa36llwgk";
-       buildDepends = [ base ChasingBottoms mtl QuickCheck ];
+       libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
        jailbreak = true;
        homepage = "http://wiki.portal.chalmers.se/cse/pmwiki.php/FP/ClassLaws";
        description = "Stating and checking laws for type class methods";
@@ -2533,7 +2587,7 @@ self: {
        pname = "ClassyPrelude";
        version = "0.1";
        sha256 = "1yvkrzd3l7ijh3fqvkbzqv5vp4nv5z26fbxy91sfwh3zqlscpim9";
-       buildDepends = [ base strict ];
+       libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2545,7 +2599,7 @@ self: {
        pname = "Clean";
        version = "0.6";
        sha256 = "0kr9i13ch2wbcnxchrnx562r8ar7kb84gmk3cqxc40x5w416205f";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "A light, clean and powerful utility library";
        license = stdenv.lib.licenses.bsd3;
@@ -2558,7 +2612,7 @@ self: {
        pname = "Clipboard";
        version = "2.2.0.3";
        sha256 = "0qpcfgpfgw426v4040ch63pc2zl7amd2ljapx4xv0j4hwc4rsqz3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/Clipboard";
        description = "System clipboard interface";
        license = stdenv.lib.licenses.bsd3;
@@ -2574,8 +2628,9 @@ self: {
        sha256 = "1xblyxmwbhmfkm2d2a87qnryk6mg5n1zarzr9d3xjh9qx3mbbclb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs either-unwrap parsec vector ];
-       testDepends = [ base hspec parsec ];
+       libraryHaskellDepends = [ base parsec vector ];
+       executableHaskellDepends = [ base cmdargs either-unwrap ];
+       testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing Clustal tools output";
        license = "GPL";
      }) {};
@@ -2589,7 +2644,7 @@ self: {
        pname = "Coadjute";
        version = "0.1.1";
        sha256 = "1crbs8dk93cff252c3nj2brdbjbfygpvlrm4lrp7vpnwfz2709b3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-csv containers directory fgl
          filepath mtl old-time pretty pureMD5 safe utf8-string
        ];
@@ -2606,7 +2661,7 @@ self: {
        pname = "Codec-Compression-LZF";
        version = "0.2";
        sha256 = "0jj2iaa632s60dckj8s46g4vrlqc8x9fndkq0kzk8rk4jzwlbwsn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/Codec-Compression-LZF/";
        description = "LZF compression bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -2618,8 +2673,8 @@ self: {
        pname = "Codec-Image-DevIL";
        version = "0.2.3";
        sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz";
-       buildDepends = [ array base ];
-       extraLibraries = [ libdevil ];
+       libraryHaskellDepends = [ array base ];
+       librarySystemDepends = [ libdevil ];
        description = "An FFI interface to the DevIL library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2638,7 +2693,7 @@ self: {
        sha256 = "0dx5pysxyk5c0fa33khjr86zgm43jz7nwhgl0w8jngyai8b1rbra";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array attoparsec base bytestring cereal containers deepseq
          directory filepath hopenssl hslogger HTTP HUnit mtl network
          network-bytestring parsec pretty PSQueue QuickCheck random
@@ -2656,7 +2711,7 @@ self: {
        pname = "Command";
        version = "0.0.7";
        sha256 = "043dwvjkc1m2cz0rgiib7gv19ds1vn4cmf27lyw68nmc0lcm2v3d";
-       buildDepends = [ base directory process ];
+       libraryHaskellDepends = [ base directory process ];
        homepage = "https://github.com/tonymorris/command";
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
@@ -2672,7 +2727,11 @@ self: {
        sha256 = "1wfpxaj9j68knf1fp3zngxrc1acqvhzrzbblar4ckq9y5kxjwwsj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base data-default fsnotify optparse-applicative process
+         system-fileio system-filepath text
+       ];
+       executableHaskellDepends = [
          base data-default fsnotify optparse-applicative process
          system-fileio system-filepath text
        ];
@@ -2680,6 +2739,7 @@ self: {
        homepage = "https://github.com/sordina/Commando";
        description = "Watch some files; Rerun a command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ComonadSheet" = callPackage
@@ -2691,7 +2751,7 @@ self: {
        pname = "ComonadSheet";
        version = "0.3.0.0";
        sha256 = "1jpxc5ymhjdk18nggw9fjr6dmqhlz0jwwailyw9i8yzs5dzbn67z";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-numbers base comonad containers distributive
          IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers
        ];
@@ -2710,7 +2770,7 @@ self: {
        pname = "ConcurrentUtils";
        version = "0.4.2.0";
        sha256 = "1bxw8jrniczwc0pprva7zp6kzzrp5cj05r19j024fbgfw6vq9xz4";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers crypto-random cryptohash
          network parallel process reexport-crypto-random RSA securemem
          tagged
@@ -2727,7 +2787,7 @@ self: {
        pname = "Concurrential";
        version = "0.5.0.0";
        sha256 = "1fcl1ckinzv9c0iyfvhh3sm649jn7q8yv2r9vz99l139dw25l5vb";
-       buildDepends = [ async base ];
+       libraryHaskellDepends = [ async base ];
        jailbreak = true;
        homepage = "http://github.com/avieth/Concurrential";
        description = "Mix concurrent and sequential computation";
@@ -2744,10 +2804,11 @@ self: {
        sha256 = "0vrflmjyc1h0mfvc07p3p3wqfscyza7pyxxp7bn1glprg6c9ph5p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base binary containers glider-nlp text ];
+       executableHaskellDepends = [
          base binary containers directory filepath glider-nlp text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary Cabal containers glider-nlp HUnit text
        ];
        jailbreak = true;
@@ -2765,7 +2826,7 @@ self: {
        sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers MissingH mtl parsec ];
+       libraryHaskellDepends = [ base containers MissingH mtl parsec ];
        homepage = "http://software.complete.org/configfile";
        description = "Configuration file reading & writing";
        license = stdenv.lib.licenses.bsd3;
@@ -2777,7 +2838,9 @@ self: {
        pname = "ConfigFileTH";
        version = "0.2";
        sha256 = "1349vkrnl2z0cfcvdalqf77jajhz0izmnlsbiv84vvj23n04rj9h";
-       buildDepends = [ base ConfigFile parsec template-haskell ];
+       libraryHaskellDepends = [
+         base ConfigFile parsec template-haskell
+       ];
        description = "Template haskell for reading ConfigFiles";
        license = "LGPL";
      }) {};
@@ -2788,7 +2851,7 @@ self: {
        pname = "Configger";
        version = "0.1";
        sha256 = "0fk7165abh4rw4jk6wy4f6y0qpakxlrs4mwrs3r2q7lz03jsyig2";
-       buildDepends = [ base Dangerous MissingH mtl parsec ];
+       libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2800,7 +2863,7 @@ self: {
        pname = "Configurable";
        version = "0.1.0.0";
        sha256 = "1if0hff6fn7zjj1vh16gxf2kldibh1dkscm8n33d1admvpjpw9sb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/tel/Configurable";
        description = "Declare types as Configurable then specialize them all in one place";
@@ -2813,7 +2876,7 @@ self: {
        pname = "ConsStream";
        version = "0.1";
        sha256 = "1ywhrj2wq24my4cji5fm5cwb3j4yjwzch9hxncr7k989smjdmjpz";
-       buildDepends = [ base Stream ];
+       libraryHaskellDepends = [ base Stream ];
        homepage = "github";
        description = "Trivial re-export of Wouter Swierstra's Stream package, avoiding module name clash";
        license = stdenv.lib.licenses.bsd3;
@@ -2827,7 +2890,7 @@ self: {
        sha256 = "0hiz3wjnvfp9n440kmwq7a88k7m7vq5s49nq85v520j7qnf4y82n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        jailbreak = true;
        homepage = "https://github.com/sordina/Conscript";
        description = "Restart a command on STDIN activity";
@@ -2840,7 +2903,7 @@ self: {
        pname = "ConstraintKinds";
        version = "1.3.0";
        sha256 = "0rhy5wq3v5hdryjn8pcsgqy4k772agj1rgq3021pjki7n3zm3dza";
-       buildDepends = [ base dlist ghc-prim vector ];
+       libraryHaskellDepends = [ base dlist ghc-prim vector ];
        jailbreak = true;
        description = "Repackages standard type classes with the ConstraintKinds extension";
        license = stdenv.lib.licenses.bsd3;
@@ -2852,7 +2915,7 @@ self: {
        pname = "Consumer";
        version = "1.2";
        sha256 = "03ham35vh49h780h7dxb6zs85rkdlry0nwi8wp6p9iamw952xi6i";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://src.seereason.com/ghc6103/haskell-consumer";
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
@@ -2865,7 +2928,7 @@ self: {
        pname = "ContArrow";
        version = "0.0.5";
        sha256 = "1paj8wx2k86i5xb11scbyca4fb2fnxgln5d661mcwxvs0i91jj1b";
-       buildDepends = [ arrows base ];
+       libraryHaskellDepends = [ arrows base ];
        jailbreak = true;
        description = "Control.Arrow.Transformer.Cont";
        license = stdenv.lib.licenses.bsd3;
@@ -2877,7 +2940,7 @@ self: {
        pname = "Contract";
        version = "0.1";
        sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.cs.kent.ac.uk/~oc/contracts.html";
        description = "Practical typed lazy contracts";
        license = stdenv.lib.licenses.bsd3;
@@ -2890,7 +2953,7 @@ self: {
        pname = "Control-Engine";
        version = "1.1.0.1";
        sha256 = "1jyj42xrja8ic3lajgrfmign9n2bdfkaplnlhzcifd5wf30qj6fa";
-       buildDepends = [ base BoundedChan stm ];
+       libraryHaskellDepends = [ base BoundedChan stm ];
        homepage = "http://www.haskell.org/haskellwiki/Control-Engine";
        description = "A parallel producer/consumer engine (thread pool)";
        license = stdenv.lib.licenses.bsd3;
@@ -2905,8 +2968,10 @@ self: {
        pname = "Control-Monad-MultiPass";
        version = "0.1.0.0";
        sha256 = "0pdayn1v9dw5600fgzlag2bqy1p68i4yzpxzqna9p7jk0iyvfy0i";
-       buildDepends = [ array base containers Control-Monad-ST2 mtl ];
-       testDepends = [
+       libraryHaskellDepends = [
+         array base containers Control-Monad-ST2 mtl
+       ];
+       testHaskellDepends = [
          array base containers Control-Monad-ST2 mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -2924,8 +2989,8 @@ self: {
        pname = "Control-Monad-ST2";
        version = "0.1.0.1";
        sha256 = "02nl4dbh7lk2gx5vacnn9mlcbs5j4b68jj0db94j51mqwj22y0zk";
-       buildDepends = [ array base QuickCheck SafeSemaphore ];
-       testDepends = [
+       libraryHaskellDepends = [ array base QuickCheck SafeSemaphore ];
+       testHaskellDepends = [
          array base mtl QuickCheck SafeSemaphore test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -2941,7 +3006,7 @@ self: {
        pname = "CoreErlang";
        version = "0.0.2";
        sha256 = "1wiwk4947h5x2swi9k6bh4zyhp849ibxhc5458kn5vipngrp4k78";
-       buildDepends = [ base parsec pretty ];
+       libraryHaskellDepends = [ base parsec pretty ];
        homepage = "http://github.com/amtal/CoreErlang";
        description = "Manipulating Core Erlang source code";
        license = stdenv.lib.licenses.bsd3;
@@ -2957,11 +3022,11 @@ self: {
        pname = "CoreFoundation";
        version = "0.1";
        sha256 = "0mra2aswl0gfic19l55i63a6il6i13caph56fdk8g7shcw3j605l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq filepath network property-list
          tagged text time transformers vector
        ];
-       buildTools = [ c2hs ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "https://github.com/reinerp/CoreFoundation";
        description = "Bindings to Mac OSX's CoreFoundation framework";
@@ -2975,7 +3040,7 @@ self: {
        pname = "Coroutine";
        version = "0.1.0.0";
        sha256 = "1cad9j7ivd6mfcff44773v8z3z2ilparxfikbnv0gab6csc9p1nw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2989,11 +3054,11 @@ self: {
        pname = "CouchDB";
        version = "1.2.2";
        sha256 = "0imzpwrynr54as3bzx2222vqcnmmrzx6dis5qa2vmclf6yd8q1z8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HTTP json mtl network network-uri
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers HTTP HUnit json mtl network network-uri
          utf8-string
        ];
@@ -3011,7 +3076,9 @@ self: {
        sha256 = "1qrsjkwr1njdsyiryskdjmy6nhbbzin4r0ja7mib26injzmrx45p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HUnit mtl old-locale QuickCheck time ];
+       libraryHaskellDepends = [
+         base HUnit mtl old-locale QuickCheck time
+       ];
        jailbreak = true;
        homepage = "http://www.haskellcraft.com/";
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
@@ -3027,7 +3094,9 @@ self: {
        sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base HUnit pretty QuickCheck random ];
+       libraryHaskellDepends = [
+         array base HUnit pretty QuickCheck random
+       ];
        description = "Collects together existing Haskell cryptographic functions into a package";
        license = "unknown";
      }) {};
@@ -3047,15 +3116,18 @@ self: {
        sha256 = "1mjgxbmwf37wqbdbhfbq3pj4mmgkf1w0lv49gagx1m5yny21q3l3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array async attoparsec attoparsec-conduit base binary blaze-builder
          blaze-textual bytestring conduit containers data-default
          fast-logger hashable lens lifted-base monad-control monad-logger
-         mtl network network-conduit optparse-applicative stm system-fileio
-         system-filepath template-haskell text time transformers
-         transformers-base unordered-containers
+         mtl network network-conduit stm system-fileio system-filepath
+         template-haskell text time transformers transformers-base
+         unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base network-conduit optparse-applicative system-filepath
+       ];
+       testHaskellDepends = [
          base conduit directory doctest filepath hspec lifted-base mtl stm
        ];
        description = "CurryDB: In-memory Key/Value Database";
@@ -3073,7 +3145,7 @@ self: {
        sha256 = "1yyr63r6ziljvcxacs7zn66lnkzgmlvcr36ic60c3z1r2rd2nflk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers directory filepath gtk mtl time
        ];
        description = "Real-Time Game Tournament Evaluator";
@@ -3094,7 +3166,12 @@ self: {
        sha256 = "0bkwcgxisp1ipnc1v63z16mcw40dy6fxszjrr2b251sfah5h1ad8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers data-default either
+         exceptions http-client http-client-tls http-types lens mtl
+         transformers transformers-base utf8-string xml-conduit xml-hamlet
+       ];
+       executableHaskellDepends = [
          base bytestring case-insensitive containers data-default either
          exceptions http-client http-client-tls http-types lens mtl network
          network-uri optparse-applicative transformers transformers-base
@@ -3113,7 +3190,7 @@ self: {
        sha256 = "1lic2ml1q16idg9rk2ky2xi030kln4m8nz1vyvy7w37qxhddvl2f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parsec ];
+       executableHaskellDepends = [ base containers parsec ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/DBlimited/";
        description = "A command-line SQL interface for flat files (tdf,csv,etc.)";
@@ -3126,7 +3203,7 @@ self: {
        pname = "DBus";
        version = "0.5.1";
        sha256 = "0l212yy40w8sjkv5m7rnd24fkihvnadv7szf10g9n5r34m4jb6lh";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/alexkay/hdbus";
        description = "D-Bus bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -3139,7 +3216,7 @@ self: {
        pname = "DCFL";
        version = "0.1.6.0";
        sha256 = "10f0c3y0y39rmvvvrvz426srb18wsv4qfzzx9r9zjac2m14b96jx";
-       buildDepends = [ base deepseq HUnit parallel random ];
+       libraryHaskellDepends = [ base deepseq HUnit parallel random ];
        homepage = "https://github.com/Poincare/DCFL";
        description = "Communication Free Learning-based constraint solver";
        license = stdenv.lib.licenses.mit;
@@ -3156,7 +3233,7 @@ self: {
        sha256 = "00dhky0hnda85lvrs155jgwxnpqfm36cqakj3wp0yrn2xlz383ad";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary directory distributed-process
          distributed-process-simplelocalnet hint MuCheck
          network-transport-tcp unix
@@ -3165,7 +3242,6 @@ self: {
        homepage = "https://bitbucket.com/osu-testing/d-mucheck";
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DOM" = callPackage
@@ -3174,7 +3250,7 @@ self: {
        pname = "DOM";
        version = "2.0.1";
        sha256 = "13zj4jg78y5s05gfi3j83izxw6d2csbvznd7mq900zlv4xwddw2b";
-       buildDepends = [ base mtl WebBits ];
+       libraryHaskellDepends = [ base mtl WebBits ];
        jailbreak = true;
        description = "DOM Level 2 bindings for the WebBits package";
        license = stdenv.lib.licenses.bsd3;
@@ -3189,7 +3265,7 @@ self: {
        pname = "DP";
        version = "0.1.1";
        sha256 = "03gjwkzna2mf0a103g0kiwnbd9ra6hss6vm73i7vhl87zgrwsh8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers list-tries mtl QuickCheck safe semiring
        ];
        jailbreak = true;
@@ -3211,12 +3287,13 @@ self: {
        sha256 = "03rf2s9qinfahqsc870cxv5117g4hmqza2dbj7s5hi50sh32xkjc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers convertible darcs directory
          filepath HSH HTF HTTP mtl network old-locale pretty process
          regex-posix split syb time unix
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ array base bytestring HTF ];
        jailbreak = true;
        description = "Darcs Patch Manager";
        license = "GPL";
@@ -3233,11 +3310,11 @@ self: {
        pname = "DRBG";
        version = "0.5.4";
        sha256 = "03nkcrjkaj36bs4sasf1286ca3wam1ndahq3y88bib2q0h5psqdx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cipher-aes128 crypto-api
          cryptohash-cryptoapi entropy mtl parallel prettyclass tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring cereal cipher-aes128 crypto-api
          crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel
          prettyclass QuickCheck tagged test-framework test-framework-hunit
@@ -3256,11 +3333,11 @@ self: {
        pname = "DSA";
        version = "1";
        sha256 = "0js67dj7dls7ivvdw1hvxc1cw0rl4bvnfip16ygmgwg98344bfwl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types ghc-prim
          integer-gmp SHA tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types DRBG ghc-prim
          HUnit integer-gmp QuickCheck SHA tagged test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -3283,15 +3360,18 @@ self: {
        sha256 = "1m69phqjrb4wg6fji5plw1mghyz7jzzqixljaa5gb5s0cy5gfkfy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
          dlist either hashable HUnit kure mtl process QuickCheck random
          semigroups template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
        ];
+       executableHaskellDepends = [
+         aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
+         mtl semigroups template-haskell text time vector
+       ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DSTM" = callPackage
@@ -3304,7 +3384,12 @@ self: {
        sha256 = "084yscqbwypkb32avjm2b92a7s4qpvps3pjfgpy14sligww3hifb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers haskell98 network process unix ];
+       libraryHaskellDepends = [
+         base containers haskell98 network process unix
+       ];
+       executableHaskellDepends = [
+         base containers haskell98 network process unix
+       ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3316,7 +3401,7 @@ self: {
        pname = "DTC";
        version = "1.1.0.1";
        sha256 = "0m3697zw0j2l9fxx8flr83n8x03pva1hn74rgilgxdrsrifhds5l";
-       buildDepends = [ base haskell-src-exts ];
+       libraryHaskellDepends = [ base haskell-src-exts ];
        homepage = "https://github.com/Daniel-Diaz/DTC";
        description = "Data To Class transformation";
        license = stdenv.lib.licenses.bsd3;
@@ -3329,7 +3414,7 @@ self: {
        pname = "Dangerous";
        version = "0.3.2";
        sha256 = "0pnywhva7s5xp9xlxk6h56n3fjflna6zhk5qdb8wax7i1qbp85vs";
-       buildDepends = [ base MaybeT mtl ];
+       libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3346,12 +3431,17 @@ self: {
        sha256 = "1f7svqvlywj0jgzssdgrhvbbfm0yjnq0qr2c7xqc501y6wr3msym";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers Crypto data-binary-ieee754
          deepseq directory filepath mtl process random time transformers
          utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base binary bytestring containers Crypto data-binary-ieee754
+         deepseq directory filepath mtl process random time transformers
+         utf8-string
+       ];
+       testHaskellDepends = [
          array base binary bytestring containers Crypto data-binary-ieee754
          deepseq directory filepath mtl process random time transformers
          utf8-string
@@ -3367,7 +3457,7 @@ self: {
        pname = "DarcsHelpers";
        version = "0.1";
        sha256 = "02nqaphxd3xlh191wxpx3rcixms70v8d6h4a3lxg24d7lcyf82n3";
-       buildDepends = [ base HaXml mtl parsec safe xml-parsec ];
+       libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ];
        jailbreak = true;
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
@@ -3382,7 +3472,7 @@ self: {
        pname = "Data-Hash-Consistent";
        version = "0.1.1";
        sha256 = "1vblfzndfzb458j6ygfcq0mfzzc5c87gwpmcx31v10fxpqnfmm65";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring digest utf8-string vector vector-algorithms
        ];
        homepage = "https://github.com/bradclawsie/haskell-Data.Hash.Consistent";
@@ -3396,7 +3486,7 @@ self: {
        pname = "Data-Rope";
        version = "0.2";
        sha256 = "0zvp9h06f2ylkn325d35cap3y67zpfyc70nqad3426p64p1xmnrw";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3411,7 +3501,7 @@ self: {
        pname = "DataTreeView";
        version = "0.1.1";
        sha256 = "0z54kr79bjv8w1gnsrxq9vkwdhasdwzrsi48q7ndsg8x7k30gpdj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq glib gtk lifted-base ListLike
          MissingH monad-control mtl syb transformers-base
        ];
@@ -3432,12 +3522,17 @@ self: {
        sha256 = "03vs4pvca80wwgfgm1a6hbincvsmlxyyz319ihk9pw22zqiq5qvs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring containers hashable lens
+         mtl network network-uri random safe scientific stm text time
+         transformers unordered-containers vector websockets
+       ];
+       executableHaskellDepends = [
          aeson base base64-bytestring bytestring containers hashable
          haskeline lens mtl network network-uri random safe scientific stm
          text time transformers unordered-containers vector websockets
        ];
-       testDepends = [ base doctest QuickCheck ];
+       testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "http://github.com/sordina/Deadpan-DDP";
        description = "Write clients for Meteor's DDP Protocol";
        license = stdenv.lib.licenses.mit;
@@ -3450,7 +3545,7 @@ self: {
        pname = "DebugTraceHelpers";
        version = "0.12";
        sha256 = "0yjv3awhp3jsfqqn36xc0jpisp4hfypx3hkibad3yqrrn61bkzy8";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Convenience functions and instances for Debug.Trace";
        license = "GPL";
      }) {};
@@ -3463,8 +3558,8 @@ self: {
        pname = "Decimal";
        version = "0.4.2";
        sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base deepseq HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -3479,7 +3574,7 @@ self: {
        pname = "DecisionTree";
        version = "0.0";
        sha256 = "14yprfh2b5x7dswp6kyaym3z2f32nqvgrfhvwsiv7brxq80cfvbd";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://page.mi.fu-berlin.de/~aneumann/decisiontree.html";
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
@@ -3492,7 +3587,7 @@ self: {
        pname = "DeepArrow";
        version = "0.4.0";
        sha256 = "1jbvb8yk291iimpqi8h302r8554k4j2p3k42znzppv1wqrbhvjyc";
-       buildDepends = [ base haskell-src mtl TypeCompose ];
+       libraryHaskellDepends = [ base haskell-src mtl TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/DeepArrow";
        description = "Arrows for \"deep application\"";
        license = stdenv.lib.licenses.bsd3;
@@ -3508,7 +3603,7 @@ self: {
        sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers GLUT HTTP MaybeT mtl network
          peakachu random time utility-ht zlib
        ];
@@ -3524,7 +3619,7 @@ self: {
        pname = "DescriptiveKeys";
        version = "0.0.4";
        sha256 = "0ywipcmnr3ysmx8m61yrymyn10lnizjfkk2q2scdfkrkgh7ayj7v";
-       buildDepends = [ base containers xmonad xmonad-contrib ];
+       libraryHaskellDepends = [ base containers xmonad xmonad-contrib ];
        homepage = "https://bitbucket.org/dibblego/descriptive-keys/";
        description = "A library for specifying xmonad key bindings with functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -3538,8 +3633,8 @@ self: {
        pname = "Dflow";
        version = "0.0.1";
        sha256 = "00gzs5fdybfrvqidw4qzk6i69qzq4jaljzhb49ah2hsv3gqjr1iq";
-       buildDepends = [ base containers QuickCheck stm time ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers QuickCheck stm time ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Processing Real-time event streams";
@@ -3552,10 +3647,10 @@ self: {
      mkDerivation {
        pname = "Diff";
        version = "0.3.2";
-       revision = "1";
        sha256 = "13iqqmpadcm7fvqwbfrz94w030rvjh66w2bdls1253128ac2n0vz";
+       revision = "1";
        editedCabalFile = "86ab9f6bcb253cabff2673437995faa4c130be7c3898df778b27a801c5361328";
-       buildDepends = [ array base pretty ];
+       libraryHaskellDepends = [ array base pretty ];
        description = "O(ND) diff algorithm in haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3566,7 +3661,9 @@ self: {
        pname = "DifferenceLogic";
        version = "0.1.0.4";
        sha256 = "0ylpn6bksf6alxzk45cg88ff8xgffh88x3csvjlhb6zn8ik0w99a";
-       buildDepends = [ base containers fgl FirstOrderTheory HUnit ];
+       libraryHaskellDepends = [
+         base containers fgl FirstOrderTheory HUnit
+       ];
        jailbreak = true;
        homepage = "https://github.com/dillonhuff/DifferenceLogic";
        description = "A theory solver for conjunctions of literals in difference logic";
@@ -3582,7 +3679,7 @@ self: {
        pname = "DifferentialEvolution";
        version = "0.0.2";
        sha256 = "0z16g40n369d2wqljnrkmpd18149ny8nh2pd13hkkjnq5n6k209w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq fclabels mtl mwc-random parallel primitive vector
        ];
        jailbreak = true;
@@ -3600,7 +3697,7 @@ self: {
        pname = "Digit";
        version = "0.0.3";
        sha256 = "0cdsmy9km9wpywqprdymn9bd982ba859px2giswz41xh6pbjri8w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -3618,11 +3715,11 @@ self: {
        pname = "DigitalOcean";
        version = "0.1.1.0";
        sha256 = "09sh0j1dk366nkq3pwgsxi8zcka9p3f38bsw6nfzr7q4chjjblz4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers exceptions lens mtl text
          transformers unordered-containers vector wreq
        ];
-       testDepends = [ base hspec lens mtl text ];
+       testHaskellDepends = [ base hspec lens mtl text ];
        jailbreak = true;
        description = "A client library for the DigitalOcean API";
        license = stdenv.lib.licenses.agpl3;
@@ -3634,7 +3731,7 @@ self: {
        pname = "DimensionalHash";
        version = "0.1.5.2";
        sha256 = "0bbg9w5n3b296g884y8qvgzsndqhzwh0mkn3dlp9nx4a7i321c97";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3646,8 +3743,8 @@ self: {
        pname = "DirectSound";
        version = "0.0.0";
        sha256 = "1x78y1na375nwgk4izsjprj3yrg0xbrhqv6nrzfbvbfdyqlf5kyz";
-       buildDepends = [ base Win32 ];
-       extraLibraries = [ dsound ];
+       libraryHaskellDepends = [ base Win32 ];
+       librarySystemDepends = [ dsound ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Partial binding to the Microsoft DirectSound API";
        license = stdenv.lib.licenses.bsd3;
@@ -3665,7 +3762,7 @@ self: {
        sha256 = "0pnlk09jsallyparwdfcy7jmqjjiprp2pqlg9agp6xbw5xmnkzwb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal chunks containers directory filepath hinstaller
          old-locale parsec pretty process template-haskell time xhtml
        ];
@@ -3683,8 +3780,10 @@ self: {
        pname = "DiscussionSupportSystem";
        version = "0.11.0.3";
        sha256 = "0iqcv3b06r9sqj1adxfq08vq5mlq4b7z88c2cw4qa7l9xw2p2js3";
-       buildDepends = [ base blaze-html blaze-markup html parsers ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup html parsers
+       ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "https://github.com/minamiyama1994/DiscussionSupportSystem";
        description = "Discussion support system";
@@ -3699,7 +3798,8 @@ self: {
        sha256 = "1xhz0yb8xrjdznvx5prpl7r8k73n78n6gmshqbraq5jdh3vcnisx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://github.com/zcourts/Dish";
        description = "Hash modules (currently Murmur3)";
@@ -3712,8 +3812,8 @@ self: {
        pname = "Dist";
        version = "0.3.0.0";
        sha256 = "00h0cxlxk72k829w8cf2gi2y4v4qj9bdzdmvnphnvc9wz5pyiz26";
-       buildDepends = [ base containers MonadRandom ];
-       testDepends = [ base containers MonadRandom ];
+       libraryHaskellDepends = [ base containers MonadRandom ];
+       testHaskellDepends = [ base containers MonadRandom ];
        homepage = "https://github.com/wyager/Dist";
        description = "A Haskell library for probability distributions";
        license = stdenv.lib.licenses.mit;
@@ -3727,8 +3827,8 @@ self: {
        pname = "DistanceTransform";
        version = "0.1.2";
        sha256 = "0c77sbx6qls8wfhv0wbappbkgfab046ls8mqs32qj02k549s6fk5";
-       buildDepends = [ base primitive vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base primitive vector ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit vector
        ];
        description = "Distance transform function";
@@ -3741,7 +3841,7 @@ self: {
        pname = "DistanceUnits";
        version = "0.1.0.1";
        sha256 = "0ls6rq4nqn3z9h9lagl8sff9q94zfm6gssa2jj1zfyfxl5869bas";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/gambogi/DistanceUnits";
        description = "A comprehensive distance library";
        license = stdenv.lib.licenses.bsd3;
@@ -3759,7 +3859,12 @@ self: {
        sha256 = "00c74anpm3varyf0man1i213dksxvh2p32xsp4rqijkbnxpkjbx3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ADPfusion ansi-wl-pprint array base BiobaseBlast BiobaseFasta
+         BiobaseXNA biocore bytestring cmdargs conduit dlist parallel
+         PrimitiveArray repa split vector
+       ];
+       executableHaskellDepends = [
          ADPfusion ansi-wl-pprint array base BiobaseBlast BiobaseFasta
          BiobaseXNA biocore bytestring cmdargs conduit dlist parallel
          PrimitiveArray repa split vector
@@ -3780,7 +3885,7 @@ self: {
        sha256 = "1w9r50cyiz31fn4dmlh3qmmpv9qapxgg70c10a86m6sxdl75q827";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers ghc ghc-paths haddock HUnit process
        ];
        jailbreak = true;
@@ -3796,7 +3901,7 @@ self: {
        pname = "Docs";
        version = "1.0.0";
        sha256 = "1hjdznp29kwj9cca0jxr3dds9cnfbss6sgn52wym2380az3jcvnz";
-       buildDepends = [ base html ];
+       libraryHaskellDepends = [ base html ];
        homepage = "http://ddiaz.asofilak.es/packages/Docs.html";
        description = "Documentation types library";
        license = stdenv.lib.licenses.bsd3;
@@ -3812,10 +3917,10 @@ self: {
        sha256 = "1cs7zqz0yzdyj3vn38cfh1lj90xnxm24q8lml457f2yia4z7l6h7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base containers haskell-src-exts mtl pointless-haskell pretty
-         syb
+       libraryHaskellDepends = [
+         base haskell-src-exts mtl pointless-haskell syb
        ];
+       executableHaskellDepends = [ array base containers pretty ];
        jailbreak = true;
        homepage = "http://haskell.di.uminho.pt/wiki/DrHylo";
        description = "A tool for deriving hylomorphisms";
@@ -3831,7 +3936,10 @@ self: {
        sha256 = "1w0wfmrjifidl2qz998ig07afd4p6yp890lwl8as57bay490nakl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath old-time process random ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base filepath old-time process random
+       ];
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
@@ -3846,7 +3954,7 @@ self: {
        sha256 = "0jk7qmlgjw69w38hm91bnyp8gyi1mjmrq4vyv7jv3y69rk0fi6wl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base old-time process random ];
+       executableHaskellDepends = [ base old-time process random ];
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
@@ -3861,7 +3969,7 @@ self: {
        sha256 = "1higdpqg599lfc92m7dd4zy98l9vjg5xr4n4qjv0wifszj8lrsgb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs containers parsec ];
+       libraryHaskellDepends = [ base cmdargs containers parsec ];
        homepage = "http://www.cs.nott.ac.uk/~bmv/Dung/";
        description = "An implementation of the Dung argumentation frameworks";
        license = stdenv.lib.licenses.bsd3;
@@ -3878,12 +3986,12 @@ self: {
        pname = "Dust";
        version = "2.3.1";
        sha256 = "0j2pm2ram7idh46mi6jv0whk4rx0bicvsvayrn3arnq65zk2mavj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers crypto-api directory
          Dust-crypto entropy ghc-prim network random random-extras random-fu
          random-source split threefish
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal Dust-crypto ghc-prim HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          test-framework-th threefish
@@ -3904,17 +4012,17 @@ self: {
        pname = "Dust-crypto";
        version = "0.1";
        sha256 = "112prydwsjd32aiv3kg8wsxwaj95p6x7jhxcf118fxgrrg202z9w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers crypto-api cryptohash
          directory entropy ghc-prim network random random-extras random-fu
          random-source skein split threefish
        ];
-       testDepends = [
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
          base bytestring cereal Dust ghc-prim HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          threefish
        ];
-       extraLibraries = [ openssl ];
        description = "Cryptographic operations";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3931,11 +4039,15 @@ self: {
        sha256 = "1g1l7h5400f9qckhj4yw2zwwjjkqz5w1fgnc9gxa7rdl37wgxwn4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring cereal containers csv directory Dust
-         Dust-crypto entropy ghc-prim network random random-extras random-fu
+       libraryHaskellDepends = [
+         base binary bytestring cereal containers directory Dust Dust-crypto
+         entropy ghc-prim network random random-extras random-fu
          random-source split
        ];
+       executableHaskellDepends = [
+         base binary bytestring cereal containers csv directory Dust entropy
+         ghc-prim network random random-extras random-fu random-source split
+       ];
        description = "Network filtering exploration tools";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3953,7 +4065,7 @@ self: {
        sha256 = "1swykscl17qy17qy38y6zc47sbiyaszh9m4qwn7d9sckfa6azsdr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring cereal containers csv directory Dust
          Dust-crypto Dust-tools entropy ghc-prim network pcap random
          random-extras random-fu random-source split
@@ -3972,7 +4084,10 @@ self: {
        sha256 = "0m58bq2jvnr17kdapfydd063af6w5vdyzxad5izk0cj0gids5hk7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base criterion QuickCheck random vector ];
+       libraryHaskellDepends = [ array base vector ];
+       executableHaskellDepends = [
+         array base criterion QuickCheck random vector
+       ];
        jailbreak = true;
        homepage = "https://github.com/zombiecalypse/DynamicTimeWarp";
        description = "Dynamic time warping of sequences";
@@ -3986,7 +4101,9 @@ self: {
        pname = "DysFRP";
        version = "0.1";
        sha256 = "1jw1s2imd2qhh9i0m7sm1zhy876bgp1pcrh4jcf5dilvqnhvv4j1";
-       buildDepends = [ base contravariant mtl time transformers ];
+       libraryHaskellDepends = [
+         base contravariant mtl time transformers
+       ];
        homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -3998,7 +4115,7 @@ self: {
        pname = "DysFRP-Cairo";
        version = "0.1";
        sha256 = "1pg6gwyrlvp6z08ab1qp783z9gm0xhnh337shf443f1bwbcz9m7f";
-       buildDepends = [ base cairo DysFRP gtk mtl ];
+       libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
        homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming on Cairo";
        license = stdenv.lib.licenses.bsd3;
@@ -4013,7 +4130,7 @@ self: {
        pname = "DysFRP-Craftwerk";
        version = "0.1";
        sha256 = "0rhm7ya1h43dwa83fcvnc8nd9da7ji6qlwzsa9ngv7pqvs7aamy1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers craftwerk craftwerk-gtk DysFRP DysFRP-Cairo
          gtk
        ];
@@ -4029,7 +4146,7 @@ self: {
        pname = "EEConfig";
        version = "1.0";
        sha256 = "1bkkzj1d0j4nisdl9jfmadjx32w35ipdw3k12krhzzlf5aiwnrf1";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "ExtremlyEasyConfig - Extremly Simple parser for config files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4045,8 +4162,9 @@ self: {
        sha256 = "0czdpgyxw3n0603hmd8kl8dnz9800df1lnkkf8a95cjd8nx3k8fv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ListLike unordered-containers ];
-       testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       libraryHaskellDepends = [ base ListLike ];
+       executableHaskellDepends = [ base unordered-containers ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4061,12 +4179,13 @@ self: {
        sha256 = "0dv7lbw3nb3wyrrq8q4wd26i445ylwiixhhzdl574sw58mw60rk3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers directory old-time unix ];
-       buildTools = [ happy ];
+       executableHaskellDepends = [
+         array base containers directory old-time unix
+       ];
+       executableToolDepends = [ happy ];
        homepage = "https://github.com/FranklinChen/Ebnf2ps";
        description = "Peter's Syntax Diagram Drawing Tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EdisonAPI" = callPackage
@@ -4075,7 +4194,7 @@ self: {
        pname = "EdisonAPI";
        version = "1.2.2.1";
        sha256 = "1r8xfsqz58s6x7026yrjafcbjkwsjg6fpcj6gbcpidw5hymymqfp";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficent, purely-functional data structures (API)";
        license = "unknown";
@@ -4089,7 +4208,9 @@ self: {
        pname = "EdisonCore";
        version = "1.2.2.1";
        sha256 = "0yj68glq50qkn2ckhhq7q5y5kbwb5lh08z1kgksc61wds22a87pz";
-       buildDepends = [ array base containers EdisonAPI mtl QuickCheck ];
+       libraryHaskellDepends = [
+         array base containers EdisonAPI mtl QuickCheck
+       ];
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficent, purely-functional data structures (Core Implementations)";
        license = "unknown";
@@ -4106,7 +4227,7 @@ self: {
        sha256 = "11a922535h6jvg79cv03jz6sn93h7jhqfrf9wi9x8arak9l06j70";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers csv directory editline filepath haskell98
          html pretty xhtml
        ];
@@ -4123,10 +4244,10 @@ self: {
      mkDerivation {
        pname = "EitherT";
        version = "0.2.0";
-       revision = "1";
        sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw";
+       revision = "1";
        editedCabalFile = "a1c6f78c9a4379af0738a6d4dee5d1781099c5c56acb0b39c45ad23b256e8c6e";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control transformers transformers-base
        ];
        jailbreak = true;
@@ -4150,13 +4271,19 @@ self: {
        sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cheapskate cmdargs containers directory filepath highlighting-kate
          indents language-ecmascript language-glsl mtl parsec pretty text
          transformers union-find unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty base binary blaze-html blaze-markup bytestring
+         cheapskate cmdargs containers directory filepath highlighting-kate
+         indents language-ecmascript language-glsl mtl parsec pretty text
+         transformers union-find unordered-containers
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cheapskate cmdargs containers directory filemanip filepath
          highlighting-kate HUnit indents language-ecmascript language-glsl
@@ -4179,7 +4306,9 @@ self: {
        sha256 = "131h71fgn0zbsmbqmvbfl57is0dbm37xsi5g87gpjgq0k2cq0nkr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers fgl gtk mtl parsec ];
+       executableHaskellDepends = [
+         array base containers fgl gtk mtl parsec
+       ];
        homepage = "http://www.muitovar.com";
        description = "derives heuristic rules from nominal data";
        license = "GPL";
@@ -4194,7 +4323,8 @@ self: {
        sha256 = "141iddlpvjp6hqjx5c5dm3ldf7yk64iqbhaiv51np27y6pazfgb5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal containers mtl ];
+       libraryHaskellDepends = [ base Cabal containers mtl ];
+       executableHaskellDepends = [ base Cabal containers mtl ];
        homepage = "http://otakar-smrz.users.sf.net/";
        description = "Encoding character data";
        license = "GPL";
@@ -4207,7 +4337,7 @@ self: {
        pname = "EnumContainers";
        version = "0.1";
        sha256 = "14ckpgaviny3c0d1jn3blkkpri0cm8ac264y7kak965knjccq0k8";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        jailbreak = true;
        description = "Simple Enum-class-based int containers";
        license = stdenv.lib.licenses.bsd3;
@@ -4219,7 +4349,7 @@ self: {
        pname = "EnumMap";
        version = "0.0.2";
        sha256 = "1v3jp1l95kybvdlpvp6bd0ryihxrvlnpkqz7fl1n4vazhkqk6zjz";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "More general IntMap replacement";
        license = stdenv.lib.licenses.bsd3;
@@ -4236,7 +4366,7 @@ self: {
        sha256 = "0hcfjzlirw11jl752g2jncb71i8sk2w3nqjm4ykc64f5awj1hi23";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers filepath HaXml mtl parsec template-haskell
          transformers
        ];
@@ -4252,7 +4382,9 @@ self: {
        pname = "EqualitySolver";
        version = "0.1.0.2";
        sha256 = "0ynzzl9mmn5hxkcndx60lnxn455nm065v7nk7rhpq1yigwz0cl1g";
-       buildDepends = [ base containers HUnit mtl union-find-array ];
+       libraryHaskellDepends = [
+         base containers HUnit mtl union-find-array
+       ];
        jailbreak = true;
        description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality";
        license = stdenv.lib.licenses.bsd3;
@@ -4269,7 +4401,7 @@ self: {
        sha256 = "1d22k3836c92xd6qg5pvjhgrhbajd438z3pfjvi0bl2wdrkzddjr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bindings-EsounD monad-control network
          regions safer-file-handles storablevector transformers unix
        ];
@@ -4286,7 +4418,7 @@ self: {
        pname = "EstProgress";
        version = "0.2.0.0";
        sha256 = "0xq2r7mbgs00hf1c8c2ffgsk7jjzd932br59rgkg06qym14dp3b3";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://alkalisoftware.net";
        description = "Methods for estimating the progress of functions";
        license = stdenv.lib.licenses.bsd3;
@@ -4305,13 +4437,13 @@ self: {
        sha256 = "0v7qq4d6zd3nr0856q3crivqqfq5q0rdppzf48jgzc9fzas6jl9n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring case-insensitive containers hashable
          haskeline mtl network old-locale parsec pipes pipes-bytestring
          pipes-concurrency pipes-network pureMD5 random stm stm-chans text
          time transformers unix unordered-containers vector
        ];
-       extraLibraries = [ pcre ];
+       executableSystemDepends = [ pcre ];
        homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
@@ -4326,7 +4458,7 @@ self: {
        pname = "Etage";
        version = "0.1.12";
        sha256 = "1ik8j7s1z64dpdg251m8dr7k7llkhxydlf6l6dhyv9ra55dg4n20";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc mtl operational random SafeSemaphore time unix
        ];
        homepage = "http://mitar.tnode.com";
@@ -4345,7 +4477,8 @@ self: {
        sha256 = "0xzsvah4nhxv5hw8p0sv1pjy4p30xa3f2afs8jncx20n918mk9l2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base containers Etage fgl mtl ];
+       executableHaskellDepends = [
          array base containers deepseq Etage fgl mtl parallel random time
        ];
        jailbreak = true;
@@ -4363,7 +4496,7 @@ self: {
        sha256 = "0kh1zjqr9cmx7xyfk2y3iwr3x3zvh3pb4ghfjz3xr2wwg2rmymxp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 SDL SDL-mixer ];
+       executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        homepage = "http://www.kryozahiro.org/eternal10/";
        description = "A 2-D shooting game";
        license = stdenv.lib.licenses.bsd3;
@@ -4380,8 +4513,13 @@ self: {
        sha256 = "0cm98x626cqwri9qsfhwi6s50kg433a1p78y9na70z868p6n27nj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring haskell98 network pcap ];
-       extraLibraries = [ libpcap ];
+       libraryHaskellDepends = [
+         base binary bytestring haskell98 network pcap
+       ];
+       executableHaskellDepends = [
+         base binary bytestring haskell98 network pcap
+       ];
+       executableSystemDepends = [ libpcap ];
        homepage = "http://etherbunny.anytini.com/";
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
@@ -4394,7 +4532,7 @@ self: {
        pname = "EuroIT";
        version = "2010.2.5";
        sha256 = "1a6bvi0y1pnzpx0x3arrardgkbs0m8ssfwcyxf6fim87wcb0jcgv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Library for using euro currency, italian language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4408,15 +4546,15 @@ self: {
      mkDerivation {
        pname = "Euterpea";
        version = "1.0.0";
-       revision = "1";
        sha256 = "0cfcsrm47sb1z4zdmipipg9p31hzicwzpqdpa2m985j3hwm42vds";
+       revision = "1";
        editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base bytestring CCA containers deepseq ghc-prim
          HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm
          syb template-haskell UISF
        ];
-       testDepends = [ ansi-terminal base Cabal QuickCheck ];
+       testHaskellDepends = [ ansi-terminal base Cabal QuickCheck ];
        jailbreak = true;
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for computer music research and education";
@@ -4432,7 +4570,7 @@ self: {
        pname = "EventSocket";
        version = "0.1";
        sha256 = "03wf8msjcpj8bpnjr7f1wcbag018kap544jwz9a7vnllamps92xd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers haskell98 mtl network
        ];
        description = "Interfaces with FreeSwitch Event Socket";
@@ -4450,7 +4588,7 @@ self: {
        pname = "Extra";
        version = "1.46.3";
        sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bzlib containers directory filepath HUnit mtl
          network-uri old-locale old-time pretty process pureMD5 QuickCheck
          random regex-compat time unix Unixutils zlib
@@ -4471,7 +4609,12 @@ self: {
        sha256 = "0hkmh3vjibbzkh004b4zig2rvvnh6l2cdqsmxbpyjbwqryzraxrn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary deepseq ghc-prim HarmTrace-Base haskore
+         instant-generics ListLike midi mtl QuickCheck random
+         template-haskell time uu-parsinglib
+       ];
+       executableHaskellDepends = [
          array base binary deepseq ghc-prim HarmTrace-Base haskore
          instant-generics ListLike midi mtl QuickCheck random
          template-haskell time uu-parsinglib
@@ -4490,7 +4633,7 @@ self: {
        sha256 = "1cb3qq8yqn19xpsjbczxs8rablkczaigs6hp2vypsjyw5s8sqza8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskell98 ];
+       executableHaskellDepends = [ array base containers haskell98 ];
        homepage = "http://spraakbanken.gu.se/eng/research/swefn/fm-sblex";
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
@@ -4503,8 +4646,8 @@ self: {
        pname = "FModExRaw";
        version = "0.2.0.0";
        sha256 = "0l2zhlxh88wy9y9gk1aa03yy65iw8zigr4pgp63mn2mqcrskfszl";
-       buildDepends = [ base ];
-       extraLibraries = [ fmodex64 ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ fmodex64 ];
        homepage = "https://github.com/skypers/hsFModEx";
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
@@ -4517,7 +4660,7 @@ self: {
        pname = "FPretty";
        version = "1.0";
        sha256 = "1lc31mid1a9pqb9py9f6nvzvlixhngpficczvhpdxlws3fn9drga";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html";
        description = "Efficient simple pretty printing combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -4530,8 +4673,8 @@ self: {
        pname = "FTGL";
        version = "2.1";
        sha256 = "0b76798bxxivjrjx92qiv8ghsg3j8rhvfms8sl19ji6fip2h3fw2";
-       buildDepends = [ base ];
-       extraLibraries = [ ftgl ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ftgl;};
@@ -4544,10 +4687,10 @@ self: {
        pname = "FTGL-bytestring";
        version = "2.0";
        sha256 = "11y8g2gi4g6x639c9wfj2224f9vgaf88hdd1f981al53kzf7y2y2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring StateVar-transformer transformers
        ];
-       extraLibraries = [ ftgl ];
+       librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ftgl;};
@@ -4562,7 +4705,7 @@ self: {
        sha256 = "0nnwfn4jxnxfr8q8gq16xn0ixjmw7dnxznsh8lbk41lwfsr9j4n5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring directory ftphs haskeline mtl network
          strict
        ];
@@ -4578,7 +4721,7 @@ self: {
        pname = "Facts";
        version = "0.1.2";
        sha256 = "018g9qj6nmabjbl4rakqjp32vwfyak1wk5cx3s0amm53wnf2mz75";
-       buildDepends = [
+       libraryHaskellDepends = [
          AC-Angle base containers digits QuickCheck template-haskell
        ];
        jailbreak = true;
@@ -4592,7 +4735,7 @@ self: {
        pname = "FailureT";
        version = "15778.1";
        sha256 = "1qhjqswx4qyfan3rpvvl1hgmf369krqprlr6x20hp34r2qw9s135";
-       buildDepends = [ base base-unicode-symbols mmtl ];
+       libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4606,7 +4749,7 @@ self: {
        pname = "FastxPipe";
        version = "0.2.0.0";
        sha256 = "1img1aivadrdljsixzll3qpdzvbjqy18mcwanli6w70ch556jsa9";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring pipes pipes-attoparsec
          pipes-bytestring
        ];
@@ -4621,8 +4764,8 @@ self: {
        pname = "FenwickTree";
        version = "0.1.2.1";
        sha256 = "0g7hhkim16wsjf8l79hqkiv1lain6jm8wpiml1iycra3n9i2s5ww";
-       buildDepends = [ base QuickCheck template-haskell ];
-       testDepends = [ base QuickCheck template-haskell ];
+       libraryHaskellDepends = [ base QuickCheck template-haskell ];
+       testHaskellDepends = [ base QuickCheck template-haskell ];
        homepage = "https://github.com/mgajda/FenwickTree";
        description = "Data structure for fast query and update of cumulative sums";
        license = stdenv.lib.licenses.bsd3;
@@ -4639,7 +4782,7 @@ self: {
        sha256 = "07sryfn26afisrsgnzrp0vjshspa40pvl4214mzb5mdm9h5c63f8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HAppS-Data HAppS-IxSet HAppS-Server HAppS-State HAppS-Util
          haskell98 HaXml mtl old-time random syb-with-class template-haskell
        ];
@@ -4657,7 +4800,7 @@ self: {
        pname = "FerryCore";
        version = "0.4.6.4";
        sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HaXml mtl parsec pretty TableAlgebra
          template-haskell
        ];
@@ -4674,7 +4817,7 @@ self: {
        pname = "FieldTrip";
        version = "0.2.7";
        sha256 = "1161mz8443j1jr8pnkh6gz6w99cd16hk94ypsh8vzmpbfp40i5rb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base GLUT graphicsFormats MemoTrie old-time OpenGL TypeCompose
          vector-space
        ];
@@ -4692,7 +4835,7 @@ self: {
        pname = "FileManip";
        version = "0.3.3.1";
        sha256 = "0dhl7zkyy4p0pgmraci82krph6hqrq1bwmx7wgm9agrnpdyg4dxi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory extensible-exceptions filepath mtl unix
        ];
        description = "Expressive file and directory manipulation for Haskell";
@@ -4708,7 +4851,7 @@ self: {
        pname = "FileManipCompat";
        version = "0.18";
        sha256 = "0c017r7bzgf1mdbk0iyr2amhm41q89mcq69fkszskjhy4z9wl6v0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath mtl unix-compat
        ];
        description = "Expressive file and directory manipulation for Haskell";
@@ -4724,7 +4867,7 @@ self: {
        pname = "FilePather";
        version = "0.2.0";
        sha256 = "1rwj8hqys01cn14d754wyl2vr19mvh4vsg2f3hrqjqiafkij90xd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad comonad-transformers data-lens directory filepath mtl
          transformers
        ];
@@ -4741,7 +4884,7 @@ self: {
        pname = "FileSystem";
        version = "1.0.0";
        sha256 = "0qyzwpvajvqywbnfhj3vzb5xl4wjjywyqr4szywd8qwb7kly29w6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring directory filepath mtl old-time
        ];
        jailbreak = true;
@@ -4759,7 +4902,7 @@ self: {
        pname = "Finance-Quote-Yahoo";
        version = "0.8.0";
        sha256 = "1d786xkrj0h270mfwxxkfxysmk78xkz2jdj8w1iin3hgy3ramifz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-conduit network old-locale time
        ];
        homepage = "http://www.b7j0c.org/stuff/haskell-yquote.xhtml";
@@ -4776,7 +4919,7 @@ self: {
        pname = "Finance-Treasury";
        version = "0.1.2";
        sha256 = "17wxdwj8162c0yawz4anjs6d3fjbhs3b05wk319acblksjx60sal";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HTTP HTTP-Simple hxt hxt-filter network old-locale
          time
        ];
@@ -4792,7 +4935,7 @@ self: {
        pname = "FindBin";
        version = "0.0.5";
        sha256 = "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717";
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
        homepage = "https://github.com/audreyt/findbin";
        description = "Locate directory of original program";
        license = stdenv.lib.licenses.bsd3;
@@ -4804,7 +4947,7 @@ self: {
        pname = "FiniteMap";
        version = "0.1";
        sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
        license = stdenv.lib.licenses.bsdOriginal;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4816,7 +4959,7 @@ self: {
        pname = "FirstOrderTheory";
        version = "0.1.0.6";
        sha256 = "1941ickx8aj3qbkry4gz8ni6snh26gkdrgabpx9z588518q4x27i";
-       buildDepends = [ base containers Proper ];
+       libraryHaskellDepends = [ base containers Proper ];
        jailbreak = true;
        description = "Grammar and typeclass for first order theories";
        license = stdenv.lib.licenses.bsd3;
@@ -4829,7 +4972,7 @@ self: {
        pname = "FixedPoint-simple";
        version = "0.6.1";
        sha256 = "0qfys17q3i56l20wzkpr8inq130j67kya022ynf0sgbc86avlrcn";
-       buildDepends = [ base deepseq template-haskell ];
+       libraryHaskellDepends = [ base deepseq template-haskell ];
        homepage = "https://github.com/TomMD/FixedPoint";
        description = "Fixed point, large word, and large int numerical representations (types and common class instances)";
        license = stdenv.lib.licenses.bsd3;
@@ -4845,7 +4988,7 @@ self: {
        sha256 = "1w25h3n3cnsl9dvr5s94jzf5qxyx0dl0v8dmqv2rkwwm7s2hdbl9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cgi containers directory haskell98 old-time parsec xhtml
        ];
        homepage = "http://www.flippac.org/projects/flippi/";
@@ -4860,7 +5003,7 @@ self: {
        pname = "Focus";
        version = "0.1.2";
        sha256 = "1f1ch6mxgaam1i4ryd1av879y2f8wn3wmg47h23w2l0pvgmxgrj1";
-       buildDepends = [ base MissingH split ];
+       libraryHaskellDepends = [ base MissingH split ];
        description = "Tools for focusing in on locations within numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -4873,7 +5016,8 @@ self: {
        sha256 = "0ygxgshgaddxfibl0paqm9sm4cq47247hr43awq8gib8zyg3amgi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers HUnit parsec ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers HUnit parsec ];
        homepage = "https://github.com/dillonhuff/Folly";
        description = "A first order logic library in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -4888,7 +5032,7 @@ self: {
        pname = "FontyFruity";
        version = "0.5.1.1";
        sha256 = "064c9qq82r2kmsabciigyzp04hjqmpnc52xfshgiy77jq7k0jk2y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath text
          vector
        ];
@@ -4905,7 +5049,7 @@ self: {
        pname = "ForSyDe";
        version = "3.1.1";
        sha256 = "0ggwskyxpdrjny0rz61zdp20r5vzig8ggmqxf0qa8gljvvfp6bhp";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath mtl old-time
          parameterized-data pretty process random regex-posix
          template-haskell type-level
@@ -4922,7 +5066,7 @@ self: {
        pname = "ForkableT";
        version = "0.1.0.2";
        sha256 = "0lzrggy1j15cajb6k5qhz2s8ddngr3hhhsj781ya45fcx82mngvj";
-       buildDepends = [ base monad-control mtl resourcet ];
+       libraryHaskellDepends = [ base monad-control mtl resourcet ];
        homepage = "https://github.com/exFalso/ForkableT/";
        description = "Forkable monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -4940,12 +5084,12 @@ self: {
        sha256 = "10b7hcwzxnl31wdfdbakcaapihhnwx8lwj0znidvgkk7hyirnx2n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ADPfusion ansi-wl-pprint base bytestring cmdargs containers
-         data-default HaTeX lens mtl parsers PrimitiveArray semigroups
-         template-haskell text transformers trifecta unordered-containers
-         vector
+       libraryHaskellDepends = [
+         ADPfusion ansi-wl-pprint base bytestring containers data-default
+         HaTeX lens mtl parsers PrimitiveArray semigroups template-haskell
+         text transformers trifecta unordered-containers vector
        ];
+       executableHaskellDepends = [ ansi-wl-pprint base cmdargs ];
        homepage = "https://github.com/choener/FormalGrammars";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
@@ -4961,7 +5105,9 @@ self: {
        sha256 = "0w4jnxk32c0pvrh2k7y93fckvrkcj3q8w4yi12zsgj9k1ic7yb6a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base cmdtheline containers random strict ];
+       executableHaskellDepends = [
+         array base cmdtheline containers random strict
+       ];
        jailbreak = true;
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
@@ -4974,7 +5120,7 @@ self: {
        pname = "FpMLv53";
        version = "0.1";
        sha256 = "0h7vi940zrl2fqv8c2g0vj0gh9qfm2jf8c2drclx37zax5kb0r6p";
-       buildDepends = [ base HaXml ];
+       libraryHaskellDepends = [ base HaXml ];
        homepage = "http://www.fpml.org/";
        description = "A binding for the Financial Products Markup Language (v5.3)";
        license = "LGPL";
@@ -4990,7 +5136,7 @@ self: {
        sha256 = "0vw1fh0nqk3s5p08j4cnwb95jgzxk140wvszjlmr3ms9m0xcx61y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim pipes primitive readable template-haskell text
          transformers vector vinyl
        ];
@@ -5006,7 +5152,7 @@ self: {
        sha256 = "1p99ab5qgvyh13iy9wgv0a8lqx6s2mygx0s6z51m5mzi9nxf0qw1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl newtype she void ];
+       executableHaskellDepends = [ base mtl newtype she void ];
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/Frank/";
        description = "An experimental programming language with typed algebraic effects";
        license = stdenv.lib.licenses.publicDomain;
@@ -5021,7 +5167,7 @@ self: {
        sha256 = "10sivjxppn138805iwka54cfby59nc39ja30nx2w3762fybz71af";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base freetype2 OpenGL ];
+       libraryHaskellDepends = [ base freetype2 OpenGL ];
        jailbreak = true;
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -5036,7 +5182,8 @@ self: {
        sha256 = "0v9y9a82d2h34ai5hhwnalgfs5m2s909blr4f30dawgryn8gnbfp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base GLUT OpenGL random ];
+       libraryHaskellDepends = [ base GLUT OpenGL random ];
+       executableHaskellDepends = [ base GLUT OpenGL random ];
        jailbreak = true;
        homepage = "http://joyful.com/fungen";
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
@@ -5054,7 +5201,7 @@ self: {
        sha256 = "181m78c0m1ldnkpng0sps9fbkpq5j4p57j0km34g5kwasxhmwfcc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath ListZipper mtl
          mwc-random old-time process random transformers tuple
        ];
@@ -5070,7 +5217,7 @@ self: {
        pname = "GA";
        version = "1.0";
        sha256 = "1nsmpph27yv0anrhhfqbpdqs2rrdbhm0jxzs3kk6ab32zb3ivhp2";
-       buildDepends = [ base directory random transformers ];
+       libraryHaskellDepends = [ base directory random transformers ];
        homepage = "http://boegel.kejo.be";
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
@@ -5084,7 +5231,7 @@ self: {
        sha256 = "129z0391zm7v4ixwwq2irqhpb43s5pd0imgh3i9i5l9ahq9lk1h7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bimap ];
+       executableHaskellDepends = [ base bimap ];
        jailbreak = true;
        homepage = "https://github.com/xnil/GGg";
        description = "GGg cipher";
@@ -5097,7 +5244,7 @@ self: {
        pname = "GHood";
        version = "0.0.4";
        sha256 = "0ab6dngl8gjkj8wvjvrjijgqb59aq88c1ra2z92iqky2d0plrfca";
-       buildDepends = [ array base process ];
+       libraryHaskellDepends = [ array base process ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
        description = "A graphical viewer for Hood";
        license = stdenv.lib.licenses.bsd3;
@@ -5110,12 +5257,11 @@ self: {
        pname = "GLFW";
        version = "0.5.2.4";
        sha256 = "1aac9xz943h3jjbx22kmvzmbzqw7k6cl2qsh1kr4nnx83pxrxz28";
-       buildDepends = [ base OpenGL ];
-       extraLibraries = [ libX11 mesa ];
+       libraryHaskellDepends = [ base OpenGL ];
+       librarySystemDepends = [ libX11 mesa ];
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
 
   "GLFW-OGL" = callPackage
@@ -5124,8 +5270,8 @@ self: {
        pname = "GLFW-OGL";
        version = "0.0";
        sha256 = "118hpgdp8rb0jlvlibxcaia4jjjdrn8xpzyvj109piw63g44n910";
-       buildDepends = [ base mtl OGL ];
-       extraLibraries = [ libX11 libXrandr ];
+       libraryHaskellDepends = [ base mtl OGL ];
+       librarySystemDepends = [ libX11 libXrandr ];
        homepage = "http://haskell.org/haskellwiki/GLFW-OGL";
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
@@ -5141,8 +5287,8 @@ self: {
        pname = "GLFW-b";
        version = "1.4.7.2";
        sha256 = "1hjsv6yqkwqi18c1vha105jl56xjvb5dqwqs4bgjkk99qcqq70rd";
-       buildDepends = [ base bindings-GLFW ];
-       testDepends = [
+       libraryHaskellDepends = [ base bindings-GLFW ];
+       testHaskellDepends = [
          base bindings-GLFW HUnit test-framework test-framework-hunit
        ];
        description = "Bindings to GLFW OpenGL library";
@@ -5159,7 +5305,9 @@ self: {
        sha256 = "01qf0bsv3q60m3as763q49hd3nm5lkady48nc214zjsx31x8by59";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLFW-b mtl OpenGL pretty stm transformers ];
+       executableHaskellDepends = [
+         base GLFW-b mtl OpenGL pretty stm transformers
+       ];
        jailbreak = true;
        description = "GLFW-b demo";
        license = stdenv.lib.licenses.bsd3;
@@ -5171,12 +5319,13 @@ self: {
        pname = "GLFW-task";
        version = "0.2.0";
        sha256 = "110iwxp6xs3wj4bva8m6mgz7iq90zrcz2dnjlq3s2x3in2m4818p";
-       buildDepends = [ base GLFW monad-task OpenGL transformers ];
+       libraryHaskellDepends = [
+         base GLFW monad-task OpenGL transformers
+       ];
        jailbreak = true;
        homepage = "http://github.com/ninegua/GLFW-task";
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLHUI" = callPackage
@@ -5185,8 +5334,8 @@ self: {
        pname = "GLHUI";
        version = "1.1.0";
        sha256 = "043xw36hrwzc6xdr5vlydbsv5m8675vnk8pfxycr7qixzwljn0aa";
-       buildDepends = [ base ];
-       extraLibraries = [ libX11 mesa ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ libX11 mesa ];
        description = "Open OpenGL context windows in X11 with libX11";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
@@ -5197,7 +5346,7 @@ self: {
        pname = "GLMatrix";
        version = "0.1.0.1";
        sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4";
-       buildDepends = [ base OpenGLRaw ];
+       libraryHaskellDepends = [ base OpenGLRaw ];
        jailbreak = true;
        homepage = "https://github.com/fiendfan1/GLMatrix";
        description = "Utilities for working with OpenGL matrices";
@@ -5210,31 +5359,29 @@ self: {
        pname = "GLURaw";
        version = "1.5.0.1";
        sha256 = "1wf8nav298wsjl417vgp94wdvh38g8hxvb20iyivxhi0g1iw4lhv";
-       buildDepends = [ base OpenGLRaw transformers ];
-       extraLibraries = [ freeglut mesa ];
+       libraryHaskellDepends = [ base OpenGLRaw transformers ];
+       librarySystemDepends = [ freeglut mesa ];
        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;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, freeglut, libICE, libSM
-     , libXi, libXmu, mesa, OpenGL, OpenGLRaw, StateVar, transformers
+    ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
+     , OpenGLRaw, StateVar, transformers
      }:
      mkDerivation {
        pname = "GLUT";
        version = "2.7.0.1";
        sha256 = "0kcw8nf0k0ql220yy6sp3cf0vhij378j94l3ffrz3nynxq5xh7pv";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers OpenGL OpenGLRaw StateVar transformers
        ];
-       extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
+       librarySystemDepends = [ freeglut mesa ];
        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.xlibs) libICE;
-          inherit (pkgs.xlibs) libSM;  inherit (pkgs.xlibs) libXi;
-          inherit (pkgs.xlibs) libXmu;  inherit (pkgs) mesa;};
+     }) { inherit (pkgs) freeglut;  inherit (pkgs) mesa;};
 
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, cpphs
@@ -5245,11 +5392,11 @@ self: {
        pname = "GLUtil";
        version = "0.8.6";
        sha256 = "15z6l1r4dn8jp5b7awzw16zxd3lh297iwab712ah0dx8m3hk0df3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath JuicyPixels
          linear OpenGL OpenGLRaw transformers vector
        ];
-       buildTools = [ cpphs ];
+       libraryToolDepends = [ cpphs ];
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5262,7 +5409,7 @@ self: {
        pname = "GPX";
        version = "0.8.0";
        sha256 = "08qvl4l81bgjx40nmlrmb0csxa3xjj4l0dbq9bzcq65p403xs1pk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad comonad-transformers containers data-lens hxt newtype
          xsd
        ];
@@ -5281,7 +5428,7 @@ self: {
        pname = "GPipe";
        version = "1.4.1";
        sha256 = "0w1xgn7pmz9pgpimsmy3fx66dax37qkd5a5q0yk1fh396dxsybx3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean containers GLUT list-tries OpenGL transformers Vec
          Vec-Boolean
        ];
@@ -5298,7 +5445,9 @@ self: {
        pname = "GPipe-Collada";
        version = "0.1.4";
        sha256 = "0aqvyv50gx0qx7icp70pw73gr3p6y05dkn347nqx82jc9dyxjghw";
-       buildDepends = [ array base containers GPipe HaXml mtl Vec ];
+       libraryHaskellDepends = [
+         array base containers GPipe HaXml mtl Vec
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe meshes from Collada files";
@@ -5316,7 +5465,7 @@ self: {
        sha256 = "0ir32fx0mk5hmmqilv6z89453rqcsgbs13a6ln4cydlkw5lbgv1k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base GLUT GPipe GPipe-TextureLoad haskell98 Vec Vec-Transform
        ];
        description = "Examples for the GPipes package";
@@ -5330,7 +5479,7 @@ self: {
        pname = "GPipe-TextureLoad";
        version = "1.0.4";
        sha256 = "1yf74k3yvpj42ynivlkacp5zwxwsx3yyfxb2436ljrv3339kjkb4";
-       buildDepends = [ base bitmap GPipe stb-image ];
+       libraryHaskellDepends = [ base bitmap GPipe stb-image ];
        homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe textures from filesystem";
        license = stdenv.lib.licenses.bsd3;
@@ -5345,10 +5494,12 @@ self: {
        pname = "GTALib";
        version = "0.0.6";
        sha256 = "10l72wn8wdgcvpbcj10hmib6z0175ihsgvmwpp9akx4d6vpf2dz8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq parallel template-haskell
        ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        jailbreak = true;
        homepage = "https://bitbucket.org/emoto/gtalib";
        description = "A library for GTA programming";
@@ -5366,7 +5517,7 @@ self: {
        pname = "Gamgine";
        version = "0.5";
        sha256 = "131pgif3x61agk6an27p33bnqi45zlyiwxivxkxdbzi82wckr0w0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring composition cpphs data-lens directory
          filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show
          StateVar time unordered-containers utility-ht Vec zlib
@@ -5386,7 +5537,7 @@ self: {
        sha256 = "1fmb6fpdfk21yxrvlgdg32qymzirfbygsq6p4jvm925kvpwqbcwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath mtl parsec transformers
        ];
        jailbreak = true;
@@ -5402,7 +5553,7 @@ self: {
        pname = "GaussQuadIntegration";
        version = "0.1";
        sha256 = "0v91q0m90338qpxg4hnvb7n6vm1jap3y1rvn9kyzmnxh03rarpx2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Non-adaptive Gaussian quadrature for numeric integraton";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5415,7 +5566,9 @@ self: {
        sha256 = "0cldjrk26p2llyhsp1rcvzbgz5qg8k898fvmdxkfc9ihc5lsxxf5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base directory random wx wxcore ];
+       executableHaskellDepends = [
+         array base directory random wx wxcore
+       ];
        homepage = "http://www.haskell.org/haskellwiki/GeBoP";
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
@@ -5434,12 +5587,16 @@ self: {
        sha256 = "0gmig362ayxxqgj4m6g1r1i6q5zfg6j8bmvsd7i9kmqn12nl3l0p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cabal-macosx containers deepseq directory
          errors filepath hslogger json mtl old-locale ordered parsec process
          syb text time transformers yaml-light
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base containers directory errors filepath hslogger json mtl process
+         yaml-light
+       ];
+       testHaskellDepends = [
          base containers errors filepath HUnit json mtl parsec QuickCheck
          smallcheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-smallcheck text
@@ -5460,7 +5617,7 @@ self: {
        sha256 = "1vs1m78lp87mccqs3i80zpl121yb063vqxx6a4sqzkfxzhvjvcbz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 QuickCheck random ];
+       executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5476,9 +5633,10 @@ self: {
        sha256 = "14rbknlc1bxrld04i7dc5dklng5sp0b1rbiilndw5cair0d67brb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base biocore biofasta bytestring cmdargs parsec split
+       libraryHaskellDepends = [
+         base biocore biofasta bytestring parsec split
        ];
+       executableHaskellDepends = [ base cmdargs ];
        description = "Libary for processing the NCBI genbank format";
        license = "GPL";
      }) {};
@@ -5491,11 +5649,12 @@ self: {
        sha256 = "0dng5shk5zs4j6lyjz971axrqziv6davpcyv509mz8fvdjn8q4kg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://afonso.xyz";
        description = "A general TicTacToe game implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenericPretty" = callPackage
@@ -5504,7 +5663,7 @@ self: {
        pname = "GenericPretty";
        version = "1.2.1";
        sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php";
-       buildDepends = [ base ghc-prim pretty ];
+       libraryHaskellDepends = [ base ghc-prim pretty ];
        homepage = "https://github.com/RazvanRanca/GenericPretty";
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -5523,12 +5682,13 @@ self: {
        sha256 = "1byshl3wa637nnvwxa80r9p1azgvgbczp5j77hpqaxacxkx1q0sm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ADPfusion ansi-wl-pprint base bytestring cmdargs containers
-         data-default FormalGrammars lens mtl PrimitiveArray semigroups
-         template-haskell text transformers unordered-containers vector
+       libraryHaskellDepends = [
+         ADPfusion ansi-wl-pprint base bytestring containers data-default
+         FormalGrammars lens mtl PrimitiveArray semigroups template-haskell
+         text transformers unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base cmdargs FormalGrammars ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -5543,7 +5703,7 @@ self: {
        pname = "GeoIp";
        version = "0.3";
        sha256 = "1q3km52w7qcrawbgaxvglb3x6rgc8f22c8rw8705lgcxxn9pjxm1";
-       buildDepends = [ base bytestring bytestring-mmap syb ];
+       libraryHaskellDepends = [ base bytestring bytestring-mmap syb ];
        description = "Pure bindings for the MaxMind IP database";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5555,7 +5715,7 @@ self: {
        pname = "Geodetic";
        version = "0.4";
        sha256 = "1nb0q5hs9qqgygw35rbvanbjf9l6vjxrl6l4jp9dqwlnl1kdd88q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/geodetic/";
        description = "Geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
@@ -5567,7 +5727,7 @@ self: {
        pname = "GeomPredicates";
        version = "0.1";
        sha256 = "19scirh2hy9y9kv16pcp44v31cs3868ig28r8blj39gdv4wqxwcy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Geometric predicates";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5578,7 +5738,7 @@ self: {
        pname = "GeomPredicates-SSE";
        version = "0.2";
        sha256 = "18mdaf2j1svklka5ms9ihj07d9l92ivqjk0y8jv0l9ni44hrhxcq";
-       buildDepends = [ base GeomPredicates ];
+       libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5590,7 +5750,7 @@ self: {
        pname = "GiST";
        version = "0.0.1";
        sha256 = "0ykvsjqpi7pd81857n2gqycgpnm0j8dxnpf345h7pgzrkz10qi9f";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "A Haskell implementation of a Generalized Search Tree (GiST)";
        license = "GPL";
@@ -5602,7 +5762,7 @@ self: {
        pname = "GiveYouAHead";
        version = "0.2.2.3";
        sha256 = "10f9yl62gwnjmb0mbfffdzhwscpwpvq9gj52zsrz8w6z6sbkijbf";
-       buildDepends = [ base directory extra old-time process ];
+       libraryHaskellDepends = [ base directory extra old-time process ];
        homepage = "https://github.com/Qinka/GiveYouAHead/";
        description = "to auto-do somethings";
        license = stdenv.lib.licenses.mit;
@@ -5615,10 +5775,10 @@ self: {
      mkDerivation {
        pname = "Glob";
        version = "0.7.5";
-       revision = "1";
        sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0";
+       revision = "1";
        editedCabalFile = "219b9caf1aaf9c2ab69ac75242f6017f0cd804a3370e0d63ac48777888fd909b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory dlist filepath transformers
        ];
        homepage = "http://iki.fi/matti.niemenmaa/glob/";
@@ -5632,7 +5792,7 @@ self: {
        pname = "GlomeTrace";
        version = "0.3";
        sha256 = "0n1290ls68fsky3a80fvfdq6bycvmpn3i3kmflq6yn45qa959f0k";
-       buildDepends = [ array base GlomeVec ];
+       libraryHaskellDepends = [ array base GlomeVec ];
        homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Ray Tracing Library";
        license = "GPL";
@@ -5645,8 +5805,8 @@ self: {
        pname = "GlomeVec";
        version = "0.2";
        sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
-       buildDepends = [ array base ];
-       buildTools = [ llvm ];
+       libraryHaskellDepends = [ array base ];
+       libraryPkgconfigDepends = [ llvm ];
        homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Simple 3D vector library";
        license = "GPL";
@@ -5662,7 +5822,7 @@ self: {
        sha256 = "0plglb289gadk8mqxgqj8n25xa6dql2jl0b8cm9v7q5rwykx0kbq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base deepseq GlomeTrace GlomeVec monad-par random SDL time vector
        ];
        homepage = "http://haskell.org/haskellwiki/Glome";
@@ -5677,7 +5837,7 @@ self: {
        pname = "GoogleChart";
        version = "0.2";
        sha256 = "0wfabsdn4agmg459srnknkwqb7ri5knj9npzgzhilybwrrqq46v9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://neugierig.org/software/darcs/browse/?r=google-chart;a=summary";
        description = "Generate web-based charts using the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
@@ -5691,7 +5851,7 @@ self: {
        pname = "GoogleDirections";
        version = "0.3.0.1";
        sha256 = "1x7k72iy8aa6r60p3hrqb8a4p5avyjh8czymrkarc3wpkc73bjb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          AttoJson base bytestring containers dataenc download-curl
        ];
        homepage = "https://github.com/favilo/GoogleDirections.git";
@@ -5707,7 +5867,7 @@ self: {
        pname = "GoogleSB";
        version = "0.1";
        sha256 = "1gfjpxcjr9xqinha3wzdk101avjzyvji2xs5abkj9pj8lsrbh2w8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary Crypto haskell98 HTTP mtl network split
        ];
        description = "Interface to Google Safe Browsing API";
@@ -5721,7 +5881,9 @@ self: {
        pname = "GoogleSuggest";
        version = "0.0.4";
        sha256 = "1jqfd9zi4yp0kr506v71dlg5zgmvzqbxdsfjr2574ajx5xp2fjrb";
-       buildDepends = [ base dataenc download-curl utf8-string xml ];
+       libraryHaskellDepends = [
+         base dataenc download-curl utf8-string xml
+       ];
        description = "Interface to Google Suggest API";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -5733,7 +5895,9 @@ self: {
        pname = "GoogleTranslate";
        version = "0.0.5";
        sha256 = "0hr0rjz7nx5rcy4h5pcbvh8sh9v4qvl9ffrqhnrcslh7ibvwbca6";
-       buildDepends = [ AttoJson base bytestring dataenc download-curl ];
+       libraryHaskellDepends = [
+         AttoJson base bytestring dataenc download-curl
+       ];
        description = "Interface to Google Translate API";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -5744,7 +5908,7 @@ self: {
        pname = "GotoT-transformers";
        version = "1.0.0.1";
        sha256 = "1w1w1p2cpndiilr002whm58bzqjh9cp9lw3jl7khdxh20c1dfzhy";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/gcross/GotoT-transformers";
        description = "A monad and monadic transformer providing \"goto\" functionality";
@@ -5763,7 +5927,7 @@ self: {
        sha256 = "026sjppwk0g10zyw64rds1fifdi7d6p7jzri35cl6hxc33fqdiy3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ADPfusion ansi-wl-pprint base bytestring containers data-default
          FormalGrammars lens newtype parsers PrimitiveArray semigroups
          template-haskell transformers trifecta
@@ -5783,9 +5947,10 @@ self: {
        sha256 = "0lhn2r54488949gh5m5fgwrj2z30r9pf34860sikb6zq07gjz759";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mersenne-random-pure64 mtl random
        ];
+       executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5798,7 +5963,9 @@ self: {
        pname = "GraphHammer";
        version = "0.3";
        sha256 = "0fga3g2y38ylvmkgi57h4j5brc7gjxh8d183qfa2vhx8i4sr3pzm";
-       buildDepends = [ array base containers Graph500 mtl stm time ];
+       libraryHaskellDepends = [
+         array base containers Graph500 mtl stm time
+       ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5814,7 +5981,9 @@ self: {
        sha256 = "18p1dr08nq8dnvghkshihzra0p9ja0qa9bxbkm561jkrdpk3zndv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers Graph500 GraphHammer mtl ];
+       executableHaskellDepends = [
+         array base containers Graph500 GraphHammer mtl
+       ];
        description = "Test harness for TriangleCount analysis";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5826,7 +5995,7 @@ self: {
        pname = "GraphSCC";
        version = "1.0.4";
        sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "Tarjan's algorithm for computing the strongly connected components of a graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5840,7 +6009,7 @@ self: {
        pname = "Graphalyze";
        version = "0.14.1.0";
        sha256 = "0pyrhpl06lsppr8ch21crinkax7fh0k18wfvgjinc8phkk6j5hz3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bktrees containers directory fgl filepath graphviz
          old-locale pandoc process random text time
        ];
@@ -5857,7 +6026,7 @@ self: {
        pname = "Grempa";
        version = "0.2.2";
        sha256 = "0w0apbk8hw555cbpprvxpnxviyzmbsxzlc6qpf6w0cfsybkkiv1f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl QuickCheck template-haskell th-lift
        ];
        description = "Embedded grammar DSL and LALR parser generator";
@@ -5871,7 +6040,7 @@ self: {
        pname = "GroteTrap";
        version = "0.5.1";
        sha256 = "131i63paaapdbdnqvmacsfqbg1719xlbx8phjchw6zlh9njn727k";
-       buildDepends = [ base mtl parsec QuickCheck syb ];
+       libraryHaskellDepends = [ base mtl parsec QuickCheck syb ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GroteTrap";
        description = "Parser and selection library for expression languages";
@@ -5887,10 +6056,10 @@ self: {
      mkDerivation {
        pname = "Grow";
        version = "1.1.0.3";
-       revision = "3";
        sha256 = "1vc4ln5fzvcv68qlanyw8mc6qchnjn1kj9rpz661n8ia1x8gkb3l";
+       revision = "3";
        editedCabalFile = "e599aab8eefc612bbf1dbae0b60308305a9d3009dda186b228e4e8aeeda1f36a";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring clock containers deepseq definitive-base
          definitive-filesystem definitive-parser definitive-reactive
          directory filepath old-locale primitive process time unix vector
@@ -5912,7 +6081,12 @@ self: {
        sha256 = "13m213d6l81k0iwjbbwg8n2xz960dhfnrs1il48xvlc8z25y6nh5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring Crypto haskell98 network ];
+       libraryHaskellDepends = [
+         base binary bytestring Crypto haskell98 network
+       ];
+       executableHaskellDepends = [
+         base binary bytestring Crypto haskell98 network
+       ];
        description = "Notification utility for Growl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5926,7 +6100,7 @@ self: {
        pname = "Gtk2hsGenerics";
        version = "0.1";
        sha256 = "1gj775yny73qvi3inc38c6yy1av503m5ilbz7ch0xx4a3ywnw5l9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo containers glib gtk haskell98 mtl
        ];
        description = "Convenience functions to extend Gtk2hs";
@@ -5942,7 +6116,7 @@ self: {
        pname = "GtkGLTV";
        version = "0.2.0";
        sha256 = "1xkc3ga65prffjzlymimwmfnmvf0lc42h2rm4b72rlmm8316kmp2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitmap bitmap-opengl gtk gtkglext GtkTV OpenGL stb-image time
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
@@ -5956,7 +6130,9 @@ self: {
        pname = "GtkTV";
        version = "0.2.0";
        sha256 = "0jxx8lgg533kjvq1sxr4jvqvxj9pcpabsy2mvbpsd2lwv2ffr618";
-       buildDepends = [ base gtk time TV TypeCompose vector-space ];
+       libraryHaskellDepends = [
+         base gtk time TV TypeCompose vector-space
+       ];
        homepage = "http://haskell.org/haskellwiki/GtkTV";
        description = "Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
@@ -5972,7 +6148,7 @@ self: {
        sha256 = "1rgyrbnlbvsqgd8m36fccq7qzxj2n682lz2rdq04j35zsgajyk11";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath glade gtk parsec process
          proplang
        ];
@@ -5988,7 +6164,7 @@ self: {
        pname = "GuiTV";
        version = "0.4";
        sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i";
-       buildDepends = [ base DeepArrow phooey TV TypeCompose ];
+       libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/GuiTV";
        description = "GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
@@ -6003,7 +6179,8 @@ self: {
        sha256 = "0mld40jm0qnsr9flbip3s2lxwd43nhzs11v23bm5m2s83y6j33jn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
+       executableHaskellDepends = [ array base ];
        homepage = "http://www.engr.uconn.edu/~jeffm/Classes/CSE240-Spring-2001/Lectures/index.html";
        description = "A simple ARM emulator in haskell";
        license = "unknown";
@@ -6018,7 +6195,7 @@ self: {
        pname = "HAppS-Data";
        version = "0.9.3";
        sha256 = "0df3bcvqpmjrg2c28jny20r52f3x7gf1wy7r8x71j9wrji56yg5j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers HAppS-Util HaXml mtl pretty syb
          syb-with-class template-haskell
        ];
@@ -6036,7 +6213,7 @@ self: {
        pname = "HAppS-IxSet";
        version = "0.9.3";
        sha256 = "0wm3apqsqb2p9cqxikz9j6lzi66ya1sn1yplifqszg1v2lpdgb7b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HAppS-Data HAppS-State HAppS-Util hslogger mtl syb
          syb-with-class template-haskell
        ];
@@ -6054,7 +6231,7 @@ self: {
        pname = "HAppS-Server";
        version = "0.9.3.1";
        sha256 = "0f10qp2aiv036izzdpfpgmja5kqx68kccazkn1cdap636brjjcdh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory HAppS-Data HAppS-IxSet
          HAppS-State HAppS-Util HaXml hslogger html HTTP mtl network
          old-locale old-time parsec process random syb template-haskell unix
@@ -6076,7 +6253,7 @@ self: {
        pname = "HAppS-State";
        version = "0.9.3";
        sha256 = "1r1ing4c8s91d9p41q7yv6v6xaqs9si438j7b5vnzxgwz0syd6ah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath HAppS-Data
          HAppS-Util HaXml hslogger hspread mtl network old-locale old-time
          random stm syb template-haskell unix
@@ -6095,7 +6272,7 @@ self: {
        pname = "HAppS-Util";
        version = "0.9.3";
        sha256 = "0mg6p14xv6f9b1rb77mvadzchf6limcypi6z0di1n49pdqjhs4pr";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring directory hslogger mtl old-time process
          template-haskell
        ];
@@ -6123,7 +6300,10 @@ self: {
        sha256 = "0dzfnvdc1nm4f7q759xnq1lavi90axc7b6jd39sl898jbjg8wrrl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl QuickCheck random ];
+       libraryHaskellDepends = [ base containers mtl QuickCheck random ];
+       executableHaskellDepends = [
+         base containers mtl QuickCheck random
+       ];
        jailbreak = true;
        homepage = "http://github.com/m4dc4p/hcl/tree/master";
        description = "High-level library for building command line interfaces";
@@ -6137,7 +6317,9 @@ self: {
        pname = "HCard";
        version = "0.0";
        sha256 = "0bvj1vc8m69bsnjz8xb4nbbpbd4xbqp4kfab0bmk6a4ixgnqk14b";
-       buildDepends = [ base mtl QuickCheck random random-shuffle ];
+       libraryHaskellDepends = [
+         base mtl QuickCheck random random-shuffle
+       ];
        homepage = "http://patch-tag.com/publicrepos/HCard";
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
@@ -6150,8 +6332,10 @@ self: {
        pname = "HCodecs";
        version = "0.5";
        sha256 = "0mhp1alx0p9lzq3vm0k802f8ndm2386sshprn9zb8xq8bsd11gxi";
-       buildDepends = [ array base bytestring QuickCheck random ];
-       testDepends = [ array base bytestring QuickCheck random ];
+       libraryHaskellDepends = [
+         array base bytestring QuickCheck random
+       ];
+       testHaskellDepends = [ array base bytestring QuickCheck random ];
        homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
        description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
        license = stdenv.lib.licenses.bsd3;
@@ -6167,7 +6351,7 @@ self: {
        sha256 = "1bfjffn44n8w0bvznjiqm4ckfs28nipachip98f125p784ff4gks";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers convertible mtl old-time text time
          utf8-string
        ];
@@ -6182,7 +6366,7 @@ self: {
        pname = "HDBC-mysql";
        version = "0.6.6.1";
        sha256 = "1q50xynasb2h65g14ycz4s38fyz185yz1sp9rl02h4p940pz7w9m";
-       buildDepends = [ base bytestring HDBC time utf8-string ];
+       libraryHaskellDepends = [ base bytestring HDBC time utf8-string ];
        homepage = "http://github.com/bos/hdbc-mysql";
        description = "MySQL driver for HDBC";
        license = "LGPL";
@@ -6199,8 +6383,11 @@ self: {
        sha256 = "1sdf5llz40q9cg0gi0rglnz6agamb7z4n5c6dhwwly902b6fxinv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring HDBC mtl time utf8-string ];
-       extraLibraries = [ unixODBC ];
+       libraryHaskellDepends = [
+         base bytestring HDBC mtl time utf8-string
+       ];
+       librarySystemDepends = [ unixODBC ];
+       executableSystemDepends = [ unixODBC ];
        homepage = "https://github.com/hdbc/hdbc-odbc";
        description = "ODBC driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6216,11 +6403,12 @@ self: {
        sha256 = "1jv43rv3a0x7b7q5vzp07xffaf690gijx3rqnfv19fk63a7075j3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring convertible HDBC mtl old-time parsec time
          utf8-string
        ];
-       extraLibraries = [ postgresql ];
+       librarySystemDepends = [ postgresql ];
+       executableSystemDepends = [ postgresql ];
        homepage = "http://github.com/hdbc/hdbc-postgresql";
        description = "PostgreSQL driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6232,7 +6420,7 @@ self: {
        pname = "HDBC-postgresql-hstore";
        version = "0.0.1.2";
        sha256 = "0657a1qy51bihh9gvpwpqpm4gch68rw32plnjcfdbc37yjq5dj1d";
-       buildDepends = [ attoparsec base containers HDBC text ];
+       libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        jailbreak = true;
        homepage = "https://bitbucket.org/dpwiz/hdbc-postgresql-hstore";
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
@@ -6245,7 +6433,7 @@ self: {
        pname = "HDBC-session";
        version = "0.1.0.0";
        sha256 = "1fxx0q9hnxwsivsg2qinm0n3lvf89r9b72cnhipjlpf36nin5x5w";
-       buildDepends = [ base HDBC ];
+       libraryHaskellDepends = [ base HDBC ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Bracketed connection for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6260,8 +6448,9 @@ self: {
        sha256 = "1spbhvwwyj4q7li33kvw1bsr6m1xbnxipga67s7cdgvyf2mxk0x7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring HDBC mtl utf8-string ];
-       extraLibraries = [ sqlite ];
+       libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ];
+       librarySystemDepends = [ sqlite ];
+       executableSystemDepends = [ sqlite ];
        homepage = "https://github.com/hdbc/hdbc-sqlite3";
        description = "Sqlite v3 driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6275,8 +6464,8 @@ self: {
        pname = "HDRUtils";
        version = "1.0.2";
        sha256 = "0rkykxmqpqiclvxlvfd0v9rrvkkb25shyajdmajxisfqxl684y0g";
-       buildDepends = [ array base colour containers mtl unix ];
-       extraLibraries = [ pfstools ];
+       libraryHaskellDepends = [ array base colour containers mtl unix ];
+       librarySystemDepends = [ pfstools ];
        jailbreak = true;
        homepage = "http://vis.renci.org/jeff/pfs";
        description = "Utilities for reading, manipulating, and writing HDR images";
@@ -6290,8 +6479,8 @@ self: {
        pname = "HERA";
        version = "0.2";
        sha256 = "08lry7w4zb7j81q9d7rjpz0chcbr9laxi4h9dz327pfcgmy083sy";
-       buildDepends = [ base ];
-       extraLibraries = [ mpfr ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) mpfr;};
@@ -6304,8 +6493,8 @@ self: {
        sha256 = "1894dk7flfdblyyrx0d1acznrdbjw41dnal45cqvrxz5vy4hd3p2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring unix ];
-       extraLibraries = [ fuse ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ fuse ];
        preConfigure = ''
          sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
        '';
@@ -6320,7 +6509,7 @@ self: {
        pname = "HGL";
        version = "3.2.0.5";
        sha256 = "0z8dfxg2x530lawx7gyv9d25wcfpwvbfmknq17d5wgkxz47j95wb";
-       buildDepends = [ array base X11 ];
+       libraryHaskellDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6335,7 +6524,7 @@ self: {
        pname = "HGamer3D";
        version = "0.5.0";
        sha256 = "00mkjpmygz3h7rq1y4b8r8gpg4qk52dah1q0h14f50cr2lxvq3b7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HGamer3D-Audio HGamer3D-Common HGamer3D-Data
          HGamer3D-Graphics3D HGamer3D-InputSystem HGamer3D-Network
        ];
@@ -6353,7 +6542,7 @@ self: {
        pname = "HGamer3D-API";
        version = "0.1.6";
        sha256 = "14wji303z3frjr4rc675pcispbpbpm1ilj6g3cb1fxm5wmi30q5l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding
          HGamer3D-SFML-Binding
        ];
@@ -6372,7 +6561,7 @@ self: {
        pname = "HGamer3D-Audio";
        version = "0.5.0";
        sha256 = "0zfzk0vjn2w127dxcsg64d8j6jw1an3i0a2v32sx05l6whrnhabd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HGamer3D-Common HGamer3D-Data HGamer3D-SFML-Binding
        ];
        homepage = "http://www.hgamer3d.org";
@@ -6387,7 +6576,7 @@ self: {
        pname = "HGamer3D-Bullet-Binding";
        version = "0.2.1";
        sha256 = "1ilj8p1gm56dffics90qj6gspnam56s84wvaig9s0cwjbwxqi4hy";
-       buildDepends = [ base HGamer3D-Data ];
+       libraryHaskellDepends = [ base HGamer3D-Data ];
        homepage = "http://www.hgamer3d.org";
        description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings";
        license = "unknown";
@@ -6400,8 +6589,8 @@ self: {
        pname = "HGamer3D-CAudio-Binding";
        version = "0.1.5";
        sha256 = "1q69ffhnnh4iaghb1g8s6bqlsry7jy5sbp5vpg4lprnr4wna5ya1";
-       buildDepends = [ base haskell98 HGamer3D-Data ];
-       extraLibraries = [ HGamer3DCAudio015 ];
+       libraryHaskellDepends = [ base haskell98 HGamer3D-Data ];
+       librarySystemDepends = [ HGamer3DCAudio015 ];
        jailbreak = true;
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - cAudio Bindings";
@@ -6417,8 +6606,10 @@ self: {
        pname = "HGamer3D-CEGUI-Binding";
        version = "0.5.0";
        sha256 = "1lh7gajn69l8yh2lvv552spf31g4br05cvpb2cwrpkijcnq6x8d0";
-       buildDepends = [ base HGamer3D-Data ];
-       extraLibraries = [ CEGUIBase CEGUIOgreRenderer hg3dcegui050 ];
+       libraryHaskellDepends = [ base HGamer3D-Data ];
+       librarySystemDepends = [
+         CEGUIBase CEGUIOgreRenderer hg3dcegui050
+       ];
        homepage = "http://www.hgamer3d.org";
        description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
        license = "unknown";
@@ -6434,7 +6625,7 @@ self: {
        pname = "HGamer3D-Common";
        version = "0.5.0";
        sha256 = "1klb8974hlsbjg06jwg1akl3pvbp6wr17apmdn69x8zarmb84skh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clock containers directory filepath FindBin HGamer3D-Data stm
          vect
        ];
@@ -6451,7 +6642,7 @@ self: {
        pname = "HGamer3D-Data";
        version = "0.5.0";
        sha256 = "0361153939v63qy204fxpajkgij7f8kfcz93y38jikqcz6nh7bgz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clock containers directory filepath FindBin stm vect
        ];
        homepage = "http://www.hgamer3d.org";
@@ -6465,8 +6656,8 @@ self: {
        pname = "HGamer3D-Enet-Binding";
        version = "0.5.0";
        sha256 = "0a5na073ysmcvr9nkbg7jgrkapzbd22wn7p09s2kpxzl9fr8axwd";
-       buildDepends = [ base HGamer3D-Data ];
-       extraLibraries = [ enet hg3denet050 ];
+       libraryHaskellDepends = [ base HGamer3D-Data ];
+       librarySystemDepends = [ enet hg3denet050 ];
        homepage = "http://www.hgamer3d.org";
        description = "Enet Binding for HGamer3D";
        license = "unknown";
@@ -6481,7 +6672,7 @@ self: {
        pname = "HGamer3D-GUI";
        version = "0.4.0";
        sha256 = "006j6g6w990il30kgpwvls77hsmlbg2haiwckrpq3mcywxrhrbsd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HGamer3D-CEGUI-Binding HGamer3D-Data HGamer3D-WinEvent split
        ];
        jailbreak = true;
@@ -6501,7 +6692,7 @@ self: {
        pname = "HGamer3D-Graphics3D";
        version = "0.5.0";
        sha256 = "1a6fizaf0l6271407z8kzlzd8yhh9ky2l9n10xcns0a1asvdkj5y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath HGamer3D-CEGUI-Binding
          HGamer3D-Common HGamer3D-Data HGamer3D-Ogre-Binding
          HGamer3D-SDL2-Binding mtl split transformers
@@ -6520,7 +6711,7 @@ self: {
        pname = "HGamer3D-InputSystem";
        version = "0.5.0";
        sha256 = "1dpc5zncc9fayf3gqqpki7chimq5cjpvnpjswapllsmykginlyfh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HGamer3D-Common HGamer3D-Data HGamer3D-SDL2-Binding
          HGamer3D-SFML-Binding
        ];
@@ -6538,7 +6729,7 @@ self: {
        pname = "HGamer3D-Network";
        version = "0.5.0";
        sha256 = "105m6k112qs96cih9jp0s9l24s671a3hlnsv4jm893mdk28zvznl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HGamer3D-Common HGamer3D-Data HGamer3D-Enet-Binding
        ];
        homepage = "http://www.hgamer3d.org";
@@ -6555,10 +6746,10 @@ self: {
        pname = "HGamer3D-OIS-Binding";
        version = "0.1.5";
        sha256 = "1n00s6vpwyw8zcasqzg6ycgc98w6hh3sylxjh05w1pya9v853syf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding
        ];
-       extraLibraries = [ HGamer3DOIS015 ];
+       librarySystemDepends = [ HGamer3DOIS015 ];
        jailbreak = true;
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - OIS Bindings";
@@ -6575,8 +6766,8 @@ self: {
        pname = "HGamer3D-Ogre-Binding";
        version = "0.5.0";
        sha256 = "1m2mgqky2bswwskgkmp7xmnm4df5i3rdkshlxkhihglgx3z1wy1w";
-       buildDepends = [ base HGamer3D-Data mtl transformers ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base HGamer3D-Data mtl transformers ];
+       librarySystemDepends = [
          hg3dogre050 OgreMain OgrePaging OgreProperty OgreRTShaderSystem
          OgreTerrain
        ];
@@ -6596,8 +6787,10 @@ self: {
        pname = "HGamer3D-SDL2-Binding";
        version = "0.5.0";
        sha256 = "11j9gysd6sc8wvia7hgf3qvzbxmpqkj7hv65iza474yig2dcr5hh";
-       buildDepends = [ base bytestring HGamer3D-Data utf8-string ];
-       extraLibraries = [ hg3dsdl2050 libX11 SDL2 ];
+       libraryHaskellDepends = [
+         base bytestring HGamer3D-Data utf8-string
+       ];
+       librarySystemDepends = [ hg3dsdl2050 libX11 SDL2 ];
        homepage = "http://www.hgamer3d.org";
        description = "SDL2 Binding for HGamer3D";
        license = "unknown";
@@ -6613,8 +6806,8 @@ self: {
        pname = "HGamer3D-SFML-Binding";
        version = "0.5.0";
        sha256 = "1087g60dxg8pzxvx7bh72ws5slf4mfqmya8cnv11vxl6hk04vc4v";
-       buildDepends = [ base HGamer3D-Data ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base HGamer3D-Data ];
+       librarySystemDepends = [
          hg3dsfml050 sfml-audio sfml-network sfml-system sfml-window
        ];
        homepage = "http://www.hgamer3d.org";
@@ -6631,7 +6824,9 @@ self: {
        pname = "HGamer3D-WinEvent";
        version = "0.4.0";
        sha256 = "0d3vjlgpzzb473dmhllxvi05lnh010vgfdbizlj4yxywrp6aas9a";
-       buildDepends = [ base HGamer3D-Data HGamer3D-SDL2-Binding text ];
+       libraryHaskellDepends = [
+         base HGamer3D-Data HGamer3D-SDL2-Binding text
+       ];
        jailbreak = true;
        homepage = "http://www.hgamer3d.org";
        description = "Windowing and Event Functionality for HGamer3D";
@@ -6648,7 +6843,7 @@ self: {
        pname = "HGamer3D-Wire";
        version = "0.3.3";
        sha256 = "0w5iafs9ldafc3kzq13alnk1ng766p9w97nak3aijpxfrc4m6z77";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HGamer3D HGamer3D-Audio HGamer3D-Data HGamer3D-GUI
          HGamer3D-InputSystem HGamer3D-WinEvent mtl netwire transformers
        ];
@@ -6669,12 +6864,12 @@ self: {
        pname = "HGraphStorage";
        version = "0.0.3";
        sha256 = "1qbhzrw8sjxaz95b34w3w71dv79wlkmqjgvcsr79vxxfn4c83dfc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-default directory filepath
          lifted-base monad-control monad-logger resourcet text transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers data-default directory filepath HUnit
          lifted-base monad-control monad-logger QuickCheck resourcet tasty
          tasty-hunit tasty-quickcheck text transformers transformers-base
@@ -6691,7 +6886,7 @@ self: {
        pname = "HHDL";
        version = "0.1.0.0";
        sha256 = "1215nz6l3bbkld2fqqsc494xw4qw4vqavznaqxgja2p60w9mwg0q";
-       buildDepends = [ base containers mtl template-haskell ];
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
        jailbreak = true;
        homepage = "http://thesz.mskhug.ru/svn/hhdl/hackage/hhdl/";
        description = "Hardware Description Language embedded in Haskell";
@@ -6705,7 +6900,7 @@ self: {
        pname = "HJScript";
        version = "0.7.0";
        sha256 = "0xvhzmsl1z6im36svjhcl4zlbnmpknlfn0m426cj5l06a3c5mfa8";
-       buildDepends = [ base HJavaScript hsp mtl text ];
+       libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
        homepage = "http://patch-tag.com/r/nibro/hjscript";
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
        license = stdenv.lib.licenses.bsd3;
@@ -6720,15 +6915,15 @@ self: {
        pname = "HJVM";
        version = "0.1";
        sha256 = "0ixzhgrb2jj7np8gmfwca724w5n26i5xalppm5idnhxw6k4jbklr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath haskell-src-exts mtl parsec process
          transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ jvm ];
+       testHaskellDepends = [
          base Cabal haskell-src-exts HUnit mtl parsec test-framework
          test-framework-hunit transformers
        ];
-       extraLibraries = [ jvm ];
        homepage = "https://github.com/JPMoresmau/HJVM";
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
@@ -6741,7 +6936,7 @@ self: {
        pname = "HJavaScript";
        version = "0.4.7";
        sha256 = "0sb2wqbf6kml5d414xi6jk0gr31673djqxa5wg1mxl40vwn14pvh";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6755,7 +6950,7 @@ self: {
        pname = "HLearn-algebra";
        version = "1.1.0.1";
        sha256 = "1k0a01cqaay4wp6i603yvcjpmap7inyjxiblqkbpifk9mwjxf15a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ConstraintKinds containers deepseq hashable MonadRandom
          parallel random template-haskell vector vector-heterogenous
        ];
@@ -6775,7 +6970,7 @@ self: {
        pname = "HLearn-approximation";
        version = "1.1.0";
        sha256 = "1gqrpnliy4jqjlhdhi7vygvq2lnfgwl2hr5hlkzgqmz2gjyib8vn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ConstraintKinds containers heap HLearn-algebra
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
@@ -6793,7 +6988,7 @@ self: {
        pname = "HLearn-classification";
        version = "1.0.1.3";
        sha256 = "11c1016nhhckmdrzlazz5b7iabl0iz0g2245bwws3alnnn74svhd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring ConstraintKinds containers deepseq dlist
          hashable HLearn-algebra HLearn-distributions list-extras logfloat
          math-functions MonadRandom normaldistribution parsec primitive
@@ -6812,7 +7007,7 @@ self: {
        pname = "HLearn-datastructures";
        version = "1.1.0";
        sha256 = "06kbscd7nbbb6dlsgyigyag851bbvhiz6p05gdawpb7y0fh8f3wb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ConstraintKinds containers deepseq HLearn-algebra list-extras
          MonadRandom QuickCheck vector
        ];
@@ -6831,7 +7026,7 @@ self: {
        pname = "HLearn-distributions";
        version = "1.1.0.2";
        sha256 = "19v9askkccbv405bchq5h72jahsbivj2s31ajwi316kksan2iwzf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base ConstraintKinds containers deepseq erf gamma graphviz
          HLearn-algebra HLearn-datastructures hmatrix list-extras
          math-functions MonadRandom normaldistribution process QuickCheck
@@ -6843,25 +7038,24 @@ self: {
      }) {};
 
   "HList" = callPackage
-    ({ mkDerivation, array, base, cmdargs, diffutils, directory
-     , doctest, filepath, ghc-prim, hspec, lens, mtl, process
-     , profunctors, QuickCheck, syb, tagged, template-haskell
+    ({ mkDerivation, array, base, cmdargs, directory, doctest, filepath
+     , ghc-prim, hspec, lens, mtl, process, profunctors, QuickCheck, syb
+     , tagged, template-haskell
      }:
      mkDerivation {
        pname = "HList";
        version = "0.4.1.0";
        sha256 = "0vbfq2jfdm3dn059flyzxrlhcw7hkni75fpi2gqcl5s6ha95ak10";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base ghc-prim mtl profunctors tagged template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base cmdargs directory doctest filepath hspec lens mtl
          process QuickCheck syb template-haskell
        ];
-       buildTools = [ diffutils ];
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) diffutils;};
+     }) {};
 
   "HListPP" = callPackage
     ({ mkDerivation, applicative-quoters, base, regex-applicative }:
@@ -6871,7 +7065,9 @@ self: {
        sha256 = "0jq2sdfg47dqf8gmmzm0049x4hsfh9prgfvxzplhrxsisknyhfr8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ applicative-quoters base regex-applicative ];
+       executableHaskellDepends = [
+         applicative-quoters base regex-applicative
+       ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~aavogt/HListPP";
        description = "A preprocessor for HList labelable labels";
@@ -6887,7 +7083,8 @@ self: {
        sha256 = "0amxyg9j6fh58g2wh9k0231mxmvi6j96z7ykd3rm3jzs96fhlncp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base old-locale time ];
+       libraryHaskellDepends = [ base old-locale time ];
+       executableHaskellDepends = [ base old-locale time ];
        jailbreak = true;
        homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent and easy-to-use logging library";
@@ -6913,7 +7110,7 @@ self: {
        pname = "HMap";
        version = "1.2.4";
        sha256 = "087a7ykk84lxa0c75wid6bkjmd89krgyrilxgps1fzl142hyvl13";
-       buildDepends = [ base hashable mtl unordered-containers ];
+       libraryHaskellDepends = [ base hashable mtl unordered-containers ];
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -6930,10 +7127,13 @@ self: {
        sha256 = "04325gwmlrx4iy9609vzaw2dhs4kg3ydr4r6af6rllrf500f6w9j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory glib gtk haskell98 mtl process
          regex-posix unix
        ];
+       executableHaskellDepends = [
+         base containers glib gtk haskell98 mtl process regex-posix unix
+       ];
        homepage = "http://sert.homedns.org/hs/hnm/";
        description = "Happy Network Manager";
        license = stdenv.lib.licenses.bsd3;
@@ -6946,8 +7146,8 @@ self: {
        pname = "HODE";
        version = "2008.10.27";
        sha256 = "0fr3bivmlciicba1brhm86l8diadb765ff1s8g6ylygs8l7lingv";
-       buildDepends = [ array base ];
-       extraLibraries = [ ode ];
+       libraryHaskellDepends = [ array base ];
+       librarySystemDepends = [ ode ];
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6961,8 +7161,10 @@ self: {
        sha256 = "1q32rcrzv79z125sbjlzhd4sl1pl8if01vrwd7y18s3acs3aqr4b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ allocated-processor base vector-space ];
-       pkgconfigDepends = [ opencv ];
+       libraryHaskellDepends = [ allocated-processor base vector-space ];
+       libraryPkgconfigDepends = [ opencv ];
+       executableHaskellDepends = [ base ];
+       executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) opencv;};
@@ -6975,7 +7177,7 @@ self: {
        pname = "HPDF";
        version = "1.4.6";
        sha256 = "15v1mf58fqa25higf52jqlf3fw2fbggfm5v8a8v00zz6q0f3lzn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers mtl random vector zlib
        ];
        homepage = "http://www.alpheccar.org";
@@ -6994,7 +7196,11 @@ self: {
        sha256 = "10hlqyhcpgnkiqwjwb3d10wrhzc82jcbz1qvxa0mzzif36rys1wk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath haskell-src-exts mtl
+         parsec utf8-string
+       ];
+       executableHaskellDepends = [
          base Cabal containers directory filepath haskell-src-exts mtl
          parsec utf8-string
        ];
@@ -7011,7 +7217,7 @@ self: {
        pname = "HPi";
        version = "0.4.0";
        sha256 = "0d0r89a92lavbaf6svkqwd7fvc1q4kwbdvr0jvxarx2xgrhl342a";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/WJWH/HPi";
        description = "GPIO and I2C functions for the Raspberry Pi";
@@ -7026,9 +7232,11 @@ self: {
        sha256 = "022642xp13fl34y854n4j7kxn0nyxhrz4gxgn3nfqs67m13bcsqy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base glade glib gtk ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ plplotd-gnome2 ];
+       libraryHaskellDepends = [ base glade glib gtk ];
+       libraryPkgconfigDepends = [ plplotd-gnome2 ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base glade glib gtk ];
+       executablePkgconfigDepends = [ plplotd-gnome2 ];
        jailbreak = true;
        homepage = "http://yakov.cc/HPlot.html";
        description = "A minimal monadic PLplot interface for Haskell";
@@ -7046,7 +7254,7 @@ self: {
        sha256 = "0dzzq4ksny537b151g6c1jgj2ns143klhdjfbq84srs026pvpvzi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base data-accessor data-accessor-template GLFW OpenGL
        ];
        homepage = "http://bonsaicode.wordpress.com/2009/04/23/hpong-012/";
@@ -7062,10 +7270,10 @@ self: {
      mkDerivation {
        pname = "HROOT";
        version = "0.8";
-       revision = "1";
        sha256 = "0q6n5j1hzl8fk6a0ziqjzfi1515shqzqxx0argbvnhw85vjajvqf";
+       revision = "1";
        editedCabalFile = "43058ba39e0517740c45b1087a39e4f84912c1a3c500504850395d4f2fda0917";
-       buildDepends = [
+       libraryHaskellDepends = [
          base fficxx-runtime HROOT-core HROOT-graf HROOT-hist HROOT-io
          HROOT-math
        ];
@@ -7081,7 +7289,7 @@ self: {
        pname = "HROOT-core";
        version = "0.8";
        sha256 = "1f40n224r640dp3g4x9kwnpcjpll3axs3pc71nqcch748bh0f60n";
-       buildDepends = [ base fficxx-runtime ];
+       libraryHaskellDepends = [ base fficxx-runtime ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7094,7 +7302,9 @@ self: {
        pname = "HROOT-graf";
        version = "0.8";
        sha256 = "1jh2c6wrzajrzbkw77fsvjnj7nhrfx192hs9vlkd0aja2xy7z0bw";
-       buildDepends = [ base fficxx-runtime HROOT-core HROOT-hist ];
+       libraryHaskellDepends = [
+         base fficxx-runtime HROOT-core HROOT-hist
+       ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Graf modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7107,7 +7317,7 @@ self: {
        pname = "HROOT-hist";
        version = "0.8";
        sha256 = "0yzlqg2nzw26j1a2i8zaihwd22bl7y9cbxxps99vy7fxph81ikh1";
-       buildDepends = [ base fficxx-runtime HROOT-core ];
+       libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7120,7 +7330,7 @@ self: {
        pname = "HROOT-io";
        version = "0.8";
        sha256 = "0sbh6jz24xv2pvh0m2f26aqj3fzkmyiqp8p4g1vcnh8jlisdn6k2";
-       buildDepends = [ base fficxx-runtime HROOT-core ];
+       libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7133,7 +7343,7 @@ self: {
        pname = "HROOT-math";
        version = "0.8";
        sha256 = "0qmsvrhxzdw2n0lw8x06l2sbx36xm77nv55kpps1h60l4l0nmzwm";
-       buildDepends = [ base fficxx-runtime HROOT-core ];
+       libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7148,7 +7358,7 @@ self: {
        sha256 = "0bg0b8260cd2l8q7ccijwqg1yz49mkifv1r0a5q1hrbsagvac4nf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base directory haskell98 ];
+       executableHaskellDepends = [ array base directory haskell98 ];
        homepage = "http://boegel.kejo.be/ELIS/Haskell/HRay/";
        description = "Haskell raytracer";
        license = stdenv.lib.licenses.bsd3;
@@ -7165,7 +7375,10 @@ self: {
        sha256 = "10zkg2lhvzxi6csyrah8kw3xd1da60im0whpg884hpnf5h220086";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base Cabal containers directory filepath parsec process unix
+       ];
+       executableHaskellDepends = [
          array base Cabal containers directory filepath parsec process unix
        ];
        jailbreak = true;
@@ -7185,10 +7398,10 @@ self: {
        sha256 = "16k853180smf2smw8ch3mzjv14imj9w2ssh61hcc23carhrsbg9p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base csv mersenne-random-pure64 monad-mersenne-random mtl split
-         vector
+       libraryHaskellDepends = [
+         base mersenne-random-pure64 monad-mersenne-random mtl split vector
        ];
+       executableHaskellDepends = [ csv ];
        homepage = "http://github.com/mjsottile/hsgep/";
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -7206,7 +7419,7 @@ self: {
        sha256 = "17ysn131xskx4s1g5kg08zy141q3q16bns4bsg3yjzvf6cjpz2kq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath hslogger MissingH mtl process
          regex-base regex-compat regex-posix unix
        ];
@@ -7224,7 +7437,7 @@ self: {
        pname = "HSHHelpers";
        version = "0.24";
        sha256 = "0mz25xak9fkircdxcpzrf3rym9l5ivhifk7dqm2xki3mv6fw214d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring DebugTraceHelpers directory filepath HSH
          HStringTemplateHelpers MissingH mtl regex-pcre unix
        ];
@@ -7240,7 +7453,7 @@ self: {
        pname = "HSlippyMap";
        version = "2.2";
        sha256 = "17n1kpva97lwhwg2vs7875bfqlwcq6xpl2agqc53qb7j4153p559";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/j4/HSlippyMap";
        description = "OpenStreetMap Slippy Map";
@@ -7255,11 +7468,11 @@ self: {
        pname = "HSmarty";
        version = "0.2.0.3";
        sha256 = "07m7xpwv565cf78qyqkd6babpl2b7jnq88psv55jclzdqlsvv0rq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-expr base HTTP mtl scientific text
          unordered-containers vector
        ];
-       testDepends = [ aeson attoparsec base HTF text ];
+       testHaskellDepends = [ aeson attoparsec base HTF text ];
        homepage = "https://github.com/agrafix/HSmarty";
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
@@ -7274,7 +7487,7 @@ self: {
        pname = "HSoundFile";
        version = "0.2.2";
        sha256 = "0qlz17dzlysj36zz3s8dzwvfdr9rdfp6gnabc262iraidqapshzb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring filepath haskell98 mtl parallel
        ];
        homepage = "http://mml.music.utexas.edu/jwlato/HSoundFile";
@@ -7292,7 +7505,7 @@ self: {
        pname = "HStringTemplate";
        version = "0.8.3";
        sha256 = "064x4d9vhzln1c8ka3saqdz6a8skn3xbhaxrf3rjwqgmjg4v3mk3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base blaze-builder bytestring containers deepseq directory
          filepath mtl old-locale parsec pretty syb template-haskell text
          time void
@@ -7309,7 +7522,7 @@ self: {
        pname = "HStringTemplateHelpers";
        version = "0.0.14";
        sha256 = "1dgr28hxm9zlxl13ms9mn63rbm5ya6bkyys6q0kbns2y2zwmkswh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory FileManipCompat filepath HSH
          HStringTemplate mtl safe strict
        ];
@@ -7325,7 +7538,7 @@ self: {
        pname = "HSvm";
        version = "0.1.0.2.89";
        sha256 = "1mb8kclb7631ihj356g5ddf758cnwz9y6r5ck72daa7vndz01aa9";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Haskell Bindings for libsvm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7345,13 +7558,16 @@ self: {
        sha256 = "0lrc60ydqsizz3rdyijqywncr1bcj3b95mgn99bz5q4yb3l6dc54";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array base base64-bytestring bytestring containers cpphs Diff
          directory haskell-src HUnit lifted-base monad-control mtl old-time
          pretty process QuickCheck random regex-compat text time unix vector
          xmlgen
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base cpphs directory HUnit mtl old-time random text
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath HUnit mtl
          process random regex-compat template-haskell temporary text
          unordered-containers
@@ -7363,7 +7579,7 @@ self: {
 
   "HTTP" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
-     , conduit-extra, deepseq, ghc, http-types, httpd-shed, HUnit, mtl
+     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, old-time, parsec, pureMD5, split
      , test-framework, test-framework-hunit, wai, warp
      }:
@@ -7371,11 +7587,11 @@ self: {
        pname = "HTTP";
        version = "4000.2.20";
        sha256 = "0nyqdxr5ls2dxkf4a1f3x15xzwdm46ppn99nkcbhswlr6s3cq1s4";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring mtl network network-uri old-time parsec
        ];
-       testDepends = [
-         base bytestring case-insensitive conduit conduit-extra deepseq ghc
+       testHaskellDepends = [
+         base bytestring case-insensitive conduit conduit-extra deepseq
          http-types httpd-shed HUnit mtl network network-uri pureMD5 split
          test-framework test-framework-hunit wai warp
        ];
@@ -7391,7 +7607,7 @@ self: {
        pname = "HTTP-Simple";
        version = "0.2";
        sha256 = "1294pn82fbskgfw2mh3ri31wab5l9y3j0g50dcx5sqbhz79pnj9w";
-       buildDepends = [ base HTTP network ];
+       libraryHaskellDepends = [ base HTTP network ];
        homepage = "http://www.b7j0c.org/content/haskell-http.html";
        description = "DEPRECATED Enable simple wrappers to Network.HTTP";
        license = stdenv.lib.licenses.bsd3;
@@ -7408,7 +7624,7 @@ self: {
        sha256 = "0c0igscng6gqhabmvvgappsbzbhkpybcx7vr8yd72pqh988ml4zv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers deepseq hylolib mtl strict
        ];
        homepage = "http://www.glyc.dc.uba.ar/intohylo/htab.php";
@@ -7426,7 +7642,9 @@ self: {
        sha256 = "0h3pr4lyx14zndwbas5ba8sg3s84sq19qhh6pcqpy4v2ajfyyfqc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base mtl random SDL SDL-image SDL-ttf ];
+       executableHaskellDepends = [
+         array base mtl random SDL SDL-image SDL-ttf
+       ];
        homepage = "http://github.com/snkkid/HTicTacToe";
        description = "An SDL tic-tac-toe game";
        license = stdenv.lib.licenses.mit;
@@ -7439,7 +7657,7 @@ self: {
        pname = "HUnit";
        version = "1.2.5.2";
        sha256 = "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "http://hunit.sourceforge.net/";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -7451,7 +7669,7 @@ self: {
        pname = "HUnit-Diff";
        version = "0.1";
        sha256 = "0dlsx6qicnrqkhb52jbgh31f0y6lxh32yl5gr6bg3fnqr36vc6x6";
-       buildDepends = [ ansi-terminal base Diff groom HUnit ];
+       libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
        jailbreak = true;
        homepage = "https://github.com/dag/HUnit-Diff";
        description = "Assertions for HUnit with difference reporting";
@@ -7468,11 +7686,11 @@ self: {
        pname = "HUnit-Plus";
        version = "1.0.1";
        sha256 = "0ph4560i8nb4ggbfc2yfam0mgfl21pnpgj0x0v9dh86lbfj9p4ki";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal cmdargs containers hashable hexpat hostname
          old-locale parsec time timeit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring Cabal cmdargs containers directory hashable hexpat
          hostname old-locale parsec time timeit
        ];
@@ -7488,8 +7706,8 @@ self: {
        pname = "HUnit-approx";
        version = "1.0";
        sha256 = "0svkjvcanjsi5bhn9b91jhig36np5imr3qyj6b1s5msm7wmlk3v1";
-       buildDepends = [ base HUnit ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base HUnit ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/goldfirere/HUnit-approx";
        description = "Approximate equality for floating point numbers with HUnit";
        license = stdenv.lib.licenses.bsd3;
@@ -7507,7 +7725,12 @@ self: {
        sha256 = "094j5bafrwr0d5sz3fidz7k328w6f4nqhja2c9gf89759nc470ss";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base base64-string binary bytestring crypto-api enumerator HLogger
+         network pureMD5 random regex-posix text transformers utf8-string
+         xml-enumerator xml-types
+       ];
+       executableHaskellDepends = [
          base base64-string binary bytestring crypto-api enumerator HLogger
          network pureMD5 random regex-posix text transformers utf8-string
          xml-enumerator xml-types
@@ -7527,7 +7750,7 @@ self: {
        pname = "HXQ";
        version = "0.19.0";
        sha256 = "1k2lway8nfy6vwsxq7kmjh25q5diw8sy4hrqzn3irk6rlg7zh77l";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base haskeline haskell98 HTTP mtl regex-base regex-compat
          template-haskell
        ];
@@ -7545,7 +7768,7 @@ self: {
        sha256 = "029khjgyay3pzydq7bj6rvlglmm66wj728y4fadqvh6yxr7ddc0s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html";
        description = "HaLeX enables modelling, manipulation and animation of regular languages";
        license = stdenv.lib.licenses.publicDomain;
@@ -7558,7 +7781,7 @@ self: {
        pname = "HaMinitel";
        version = "0.1.0.0";
        sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458";
-       buildDepends = [ base bytestring serialport stm ];
+       libraryHaskellDepends = [ base bytestring serialport stm ];
        jailbreak = true;
        homepage = "https://github.com/Zigazou/HaMinitel";
        description = "An Haskell library to drive the french Minitel through a serial port";
@@ -7571,7 +7794,7 @@ self: {
        pname = "HaPy";
        version = "0.1.1.1";
        sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz";
-       buildDepends = [ base template-haskell th-lift ];
+       libraryHaskellDepends = [ base template-haskell th-lift ];
        homepage = "https://github.com/sakana/HaPy";
        description = "Haskell bindings for Python";
        license = stdenv.lib.licenses.mit;
@@ -7591,13 +7814,19 @@ self: {
        sha256 = "19vldhyl1636g05yc1kg9ih3z9rlcvcl596slc1hqwkd564nld36";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory dual-tree filepath ghc ghc-mod ghc-paths
+         ghc-prim ghc-syb-utils haskell-token-utils hslogger monoid-extras
+         mtl old-time pretty rosezipper semigroups Strafunski-StrategyLib
+         syb syz time transformers
+       ];
+       executableHaskellDepends = [
          array base containers directory dual-tree filepath ghc ghc-mod
          ghc-paths ghc-prim ghc-syb-utils haskell-token-utils hslogger
          monoid-extras mtl old-time parsec pretty rosezipper semigroups
          Strafunski-StrategyLib syb syz time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq Diff directory dual-tree filepath ghc
          ghc-mod ghc-paths ghc-prim ghc-syb-utils haskell-token-utils
          hslogger hspec HUnit monoid-extras mtl old-time process QuickCheck
@@ -7619,11 +7848,13 @@ self: {
        pname = "HaTeX";
        version = "3.16.1.1";
        sha256 = "0xi89wclnkrl17jl3ymvsvg802aj201m4lp0rg9adgmrrdgz042p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers matrix parsec QuickCheck text
          transformers wl-pprint-extras
        ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck text ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck text
+       ];
        homepage = "http://wrongurl.net/haskell/HaTeX";
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
@@ -7639,7 +7870,7 @@ self: {
        sha256 = "1cfn823xfp4962x4ww3dawm017nkg00wxa20b8nbq3pmjjnpb2xl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath ghc haddock
          haskell-src-exts mtl parsec
        ];
@@ -7657,7 +7888,7 @@ self: {
        pname = "HaTeX-qq";
        version = "0.0.1.1";
        sha256 = "1kjhdg9vm7n07zxgdkmqkgwpf2204hrjwslnyhg8i7f07cd3pdrl";
-       buildDepends = [
+       libraryHaskellDepends = [
          antiquoter base haskell-src-meta HaTeX template-haskell text
          uniplate
        ];
@@ -7676,7 +7907,8 @@ self: {
        sha256 = "1hh324i7gvazlkm3vfmzah41h2hlxwb2k8g1z8dmfbif6pmp0apk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base logict ];
+       executableHaskellDepends = [
          base HUnit logict QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck
        ];
@@ -7696,10 +7928,10 @@ self: {
        sha256 = "1iq74dnxvannx9x1whqc3ixn93r4v5z7b4yv21n9q5963kpafj34";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers directory filepath polyparse pretty
-         random
+       libraryHaskellDepends = [
+         base bytestring containers filepath polyparse pretty random
        ];
+       executableHaskellDepends = [ base directory polyparse pretty ];
        homepage = "http://projects.haskell.org/HaXml/";
        description = "Utilities for manipulating XML documents";
        license = "LGPL";
@@ -7715,9 +7947,8 @@ self: {
        sha256 = "1bp7ngsh655x0iamb8bhn2sqkpg3p6mhg0n0fgqz5k4pjskjyavy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers network old-locale text time vty vty-ui
-       ];
+       libraryHaskellDepends = [ base containers network old-locale ];
+       executableHaskellDepends = [ text time vty vty-ui ];
        homepage = "http://github.com/dmalikov/HaCh";
        description = "Simple chat";
        license = stdenv.lib.licenses.mit;
@@ -7734,7 +7965,10 @@ self: {
        sha256 = "1j8lw1c5asx40fag9gd6ni19c0z0q46f55yry5cj94v4s5m2gzbw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Crypto directory hint mtl old-time parsec
+       ];
+       executableHaskellDepends = [
          base Crypto directory hdaemonize hint mtl old-time parsec
        ];
        homepage = "http://patch-tag.com/publicrepos/Hackmail";
@@ -7751,11 +7985,11 @@ self: {
        pname = "Haggressive";
        version = "0.1.0.4";
        sha256 = "08f8i8bmnjv255xzpasa7drd83fh82qjm49mscn6dmiw6yp47vz1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal cassava containers directory HUnit PSQueue
          text tokenize tuple vector
        ];
-       testDepends = [ base Cabal containers HUnit tuple vector ];
+       testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
        homepage = "https://github.com/Pold87/Haggressive";
        description = "Aggression analysis for Tweets on Twitter";
        license = stdenv.lib.licenses.gpl2;
@@ -7768,7 +8002,7 @@ self: {
        pname = "HandlerSocketClient";
        version = "0.0.5";
        sha256 = "1jp8cwlp6h1wvvkh71813i3lzxc7ckxzc7nvvcsjvcz0apxcl7vv";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        homepage = "https://github.com/wuxb45/HandlerSocket-Haskell-Client";
        description = "Haskell implementation of a HandlerSocket client (API)";
        license = stdenv.lib.licenses.bsd3;
@@ -7784,11 +8018,12 @@ self: {
        sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HTTP hxt hxt-http mtl network network-uri parsec
          transformers
        ];
-       testDepends = [ base hspec hxt ];
+       executableHaskellDepends = [ base hxt ];
+       testHaskellDepends = [ base hspec hxt ];
        homepage = "https://github.com/egonSchiele/HandsomeSoup";
        description = "Work with HTML more easily in HXT";
        license = stdenv.lib.licenses.bsd3;
@@ -7806,12 +8041,17 @@ self: {
        sha256 = "1l2w53ispw7sg1daxnynfc94njzm6w838a8ij7rpzd3nxa2b596v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary cmdargs deepseq Diff directory filepath ghc-prim
+       libraryHaskellDepends = [
+         array base binary deepseq Diff directory filepath ghc-prim
          HarmTrace-Base HCodecs hmatrix hmatrix-gsl-stats instant-generics
-         ListLike mtl parallel parseargs process sox template-haskell
+         ListLike mtl parallel parseargs process template-haskell
          uu-parsinglib vector
        ];
+       executableHaskellDepends = [
+         array base binary cmdargs deepseq Diff directory filepath ghc-prim
+         HarmTrace-Base hmatrix hmatrix-gsl-stats instant-generics ListLike
+         mtl parallel process sox template-haskell uu-parsinglib vector
+       ];
        jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/HarmTrace";
        description = "Harmony Analysis and Retrieval of Music";
@@ -7827,10 +8067,10 @@ self: {
        pname = "HarmTrace-Base";
        version = "1.4.0.1";
        sha256 = "174a05473577vyyf6rz5bq3b9wrgmsbz23xdg945pfc78lb6n70j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers ghc-prim ListLike uu-parsinglib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary containers ghc-prim ListLike QuickCheck uu-parsinglib
        ];
        jailbreak = true;
@@ -7848,7 +8088,7 @@ self: {
        pname = "HasGP";
        version = "0.1";
        sha256 = "1sw5l74p2md4whq0c1xifcnwbb525i84n1razjxs7cpf8gicgggx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 hmatrix hmatrix-special mtl parsec random
        ];
        jailbreak = true;
@@ -7868,7 +8108,7 @@ self: {
        sha256 = "0jh506p0clwyb5wwrhlgbc5xp7w6smz5vky3lc8vhnwvwk324qcj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base list-tries monad-loops mtl numbers parsec
        ];
        jailbreak = true;
@@ -7888,7 +8128,7 @@ self: {
        sha256 = "0yn525sr7i2nwf4y44va00aswnphn89072zaqjr2i0f1n1jjaxpl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory ghc haskell98 parsec process readline regex-compat
          unix
        ];
@@ -7904,7 +8144,7 @@ self: {
        pname = "HaskellForMaths";
        version = "0.4.8";
        sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j";
-       buildDepends = [ array base containers random ];
+       libraryHaskellDepends = [ array base containers random ];
        homepage = "http://haskellformaths.blogspot.com/";
        description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -7916,7 +8156,7 @@ self: {
        pname = "HaskellLM";
        version = "0.1.2";
        sha256 = "0baqn15zdhlinf4v3c244005nb3wm63gpr0w6fy7g9gmn8a00scq";
-       buildDepends = [ base hmatrix ];
+       libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
      }) {};
@@ -7927,7 +8167,7 @@ self: {
        pname = "HaskellNN";
        version = "0.1.3";
        sha256 = "0i5jqhkxna1kq361hh66830x4z5m782pp898g9ggfvdiwpp8phmr";
-       buildDepends = [ base hmatrix random ];
+       libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7941,7 +8181,7 @@ self: {
        pname = "HaskellNet";
        version = "0.4.5";
        sha256 = "1d34zknk8knjsw1w3bl91z8qc47vqb6mhfh6rq1rm93na616i3p5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base64-string bytestring cryptohash mime-mail mtl
          network old-time pretty text
        ];
@@ -7958,7 +8198,7 @@ self: {
        pname = "HaskellNet-SSL";
        version = "0.3.0.0";
        sha256 = "1n1jlnxp16dmfkw4yh1bsbylsk5c1kyixh3gi81202fjx3q9z2pf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring connection data-default HaskellNet network tls
        ];
        homepage = "https://github.com/dpwright/HaskellNet-SSL";
@@ -7978,7 +8218,7 @@ self: {
        sha256 = "0dy9irl085jw7wz6y50566rwsj05ymp8g2xp2444vg12ryd5dra1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cereal cml containers directory hopenssl hslogger
          HTTP HUnit mtl network parsec pretty QuickCheck random
          random-shuffle test-framework test-framework-hunit
@@ -7997,7 +8237,7 @@ self: {
        sha256 = "0gnf8x4dqz3bwyhrcn17qci2rzmms3r0cyr7cgf593jlkxiq287q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cmdargs text ];
+       executableHaskellDepends = [ base cmdargs text ];
        jailbreak = true;
        homepage = "https://github.com/mrLSD/HaskellTutorials";
        description = "Haskell Tutorials by Evgeny Ukhanov";
@@ -8014,7 +8254,7 @@ self: {
        sha256 = "0v171rzpbh4w5kxzbc9h2x4kha1ykw4vk69scfpmdz5iqih2bqz8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers HGL hmatrix MonadRandom random Yampa
        ];
        jailbreak = true;
@@ -8035,7 +8275,7 @@ self: {
        pname = "Hawk";
        version = "0.0.2";
        sha256 = "0g7dgj3asxwcjg43nzhjp7agvnzv882xhgbrr7jnpdckywkgacgq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie cgi containers convertible
          data-default dataenc directory filepath hack HDBC HDBC-sqlite3
          hslogger hslogger-template HTTP hxt json-b MonadCatchIO-mtl mtl
@@ -8062,7 +8302,7 @@ self: {
        sha256 = "0bpkkdwgwf7xagp4rda1g07mdglzvl4hzq2jif7c3s8j7f6zq48c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring bzlib containers deepseq enummapset filepath
          Holumbus-Searchengine hxt hxt-cache hxt-charproperties hxt-curl
          hxt-http hxt-regex-xmlschema hxt-unicode hxt-xpath json
@@ -8082,8 +8322,8 @@ self: {
        pname = "Hclip";
        version = "3.0.0.3";
        sha256 = "0h6q44yv4m325gdwpvkxz31syy6qwdsixfanzr3fx1v5nbhm22af";
-       buildDepends = [ base mtl process strict ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base mtl process strict ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/jetho/Hclip";
        description = "A small cross-platform library for reading and modifying the system clipboard";
        license = stdenv.lib.licenses.bsd3;
@@ -8099,7 +8339,10 @@ self: {
        sha256 = "0z0sa658fngv68611k76ncf5j59v517xchhw2y84blj97fl6jkn9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base editline mtl parsec pretty process QuickCheck regex-posix
+       ];
+       executableHaskellDepends = [
          base editline mtl parsec pretty process QuickCheck regex-posix
        ];
        description = "Line oriented editor";
@@ -8116,7 +8359,7 @@ self: {
        pname = "Hermes";
        version = "0.0.4";
        sha256 = "0j5vg3rvf4hbvg6jan4im7ijqffy6k9dvijfwxjcn164qjzh6xb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          AES base bytestring cereal containers hslogger monads-tf network
          old-time random random-shuffle RSA SHA2 stm syb time transformers
          unamb yjtools
@@ -8136,7 +8379,7 @@ self: {
        pname = "Hieroglyph";
        version = "3.89";
        sha256 = "0dkvvk3qwn72vn4kc0q2iv6raxslrxf0ypr0sn7i0fjds3cjxs6s";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base buster bytestring cairo colour containers glib GLUT gtk
          gtkglext IfElse mtl OpenGL parallel pretty random
        ];
@@ -8155,7 +8398,7 @@ self: {
        pname = "HiggsSet";
        version = "0.1.1";
        sha256 = "1k0qlpm4akzx820b0j3g3f562ailxa56sa41268xyq3046xdpyl1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq mtl text th-expand-syns TrieMap
          vector
        ];
@@ -8171,7 +8414,9 @@ self: {
        pname = "Hipmunk";
        version = "5.2.0.17";
        sha256 = "1yxs1v9pzb35g3zlvycsx762dk8swrbry7ajr50zlq667j20n4a8";
-       buildDepends = [ array base containers StateVar transformers ];
+       libraryHaskellDepends = [
+         array base containers StateVar transformers
+       ];
        homepage = "https://github.com/meteficha/Hipmunk";
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
@@ -8187,7 +8432,7 @@ self: {
        sha256 = "075am1d0hjbhnibk2x56fbh4ybw5pavfmqk2dz4yjw7yh264vcs7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers GLFW Hipmunk OpenGL StateVar transformers
        ];
        jailbreak = true;
@@ -8202,9 +8447,8 @@ self: {
        pname = "Histogram";
        version = "0.1.0.2";
        sha256 = "00f0a3lbpc7s70lzmnf9a7hjzc3yv8nfxcvz5nparr34x585zbxl";
-       buildDepends = [ base containers gnuplot ];
+       libraryHaskellDepends = [ base containers gnuplot ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hmpf" = callPackage
@@ -8217,7 +8461,7 @@ self: {
        sha256 = "0lw2d9yv3zxqv20v96czx0msahbyk0rc5d68gj567dxnyb377yx7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile Crypto HTTP mtl network time unix utf8-string
        ];
        description = "An MPD client designed for a Home Theatre PC";
@@ -8236,14 +8480,13 @@ self: {
        sha256 = "0b6jljwn8dq2szhz3k9axfphv3yi0zq7rhligvlwa5p8hr49wblx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath libgraph mtl process
          RBTree regex-posix template-haskell threepenny-gui
        ];
        homepage = "http://maartenfaddegon.nl";
        description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -8252,7 +8495,7 @@ self: {
        pname = "HoleyMonoid";
        version = "0.1.1";
        sha256 = "1z3d80r6w8n7803q52xlp8mzpk87q1pr3mnz6dswp39q3gygr9fr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/HoleyMonoid";
        description = "Monoids with holes";
        license = stdenv.lib.licenses.bsd3;
@@ -8269,7 +8512,7 @@ self: {
        sha256 = "1mhljxyfv02pfy2lyh10nlv5x05qvv37ij9i6c8c17f5b5qcgc78";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq haskell98 hslogger
          hxt network random readline stm time unix
        ];
@@ -8291,7 +8534,7 @@ self: {
        sha256 = "0dqwj7xpw1lidv7ixfm1wzfx6psrzl2q08x3scyiskpm3a2l67q8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory
          extensible-exceptions haskell98 Holumbus-Distribution
          Holumbus-Storage hslogger hxt network readline time unix
@@ -8312,7 +8555,7 @@ self: {
        pname = "Holumbus-Searchengine";
        version = "1.2.3";
        sha256 = "1kx0j4f13fj6k3xlhh5cmlb7lz35vyqd0sp913yy8yc2h56ybbqq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bzlib containers deepseq directory
          enummapset filepath hslogger hxt hxt-cache hxt-curl
          hxt-regex-xmlschema hxt-unicode mtl network parallel parsec process
@@ -8335,7 +8578,7 @@ self: {
        sha256 = "1zs6m3rsxh3886idcn0qm056bzv9yllgf3n2qsfa97cpbzhah54q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory haskell98
          Holumbus-Distribution hslogger hxt network random time unix
        ];
@@ -8351,7 +8594,7 @@ self: {
        pname = "Homology";
        version = "0.1.1";
        sha256 = "12cqfy2vpshly1rgjclzpnhb094s5wr038ahh5agsx03x6mnsr9n";
-       buildDepends = [ base containers vector ];
+       libraryHaskellDepends = [ base containers vector ];
        homepage = "http://www.math.ucla.edu/~damek";
        description = "Compute the homology of a chain complex";
        license = "GPL";
@@ -8366,12 +8609,12 @@ self: {
        pname = "HongoDB";
        version = "0.0.1";
        sha256 = "19dwxv7fjk2k55mxgsc2gjx5jp9vr77yg01292gdj1piwmxx459v";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-binary base blaze-builder bytestring
          directory enumerator hashable monad-control mtl unix
          unix-bytestring unordered-containers
        ];
-       testDepends = [ base process random ];
+       testHaskellDepends = [ base process random ];
        jailbreak = true;
        description = "A Simple Key Value Store";
        license = stdenv.lib.licenses.bsd3;
@@ -8384,8 +8627,8 @@ self: {
        pname = "HostAndPort";
        version = "0.2.0";
        sha256 = "1rjv6c7j6fdy6gnn1zr5jnfmiqiamsmjfw9h3bx119giw3sjb9hm";
-       buildDepends = [ base parsec ];
-       testDepends = [ base doctest hspec ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base doctest hspec ];
        homepage = "https://github.com/bacher09/hostandport";
        description = "Parser for host and port pairs like localhost:22";
        license = stdenv.lib.licenses.mit;
@@ -8399,7 +8642,7 @@ self: {
        sha256 = "0cmmhljlgb23kr6v8as2cma3cpgr6zpkb11qg6hmq1ilbi363282";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/Raynes/Hricket";
        description = "A Cricket scoring application";
@@ -8418,13 +8661,17 @@ self: {
        sha256 = "0yjkghshbdbajib35hy3qr8x608i9qi2pgffpi59118krcw6k8mn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath ghc haskell-src-exts old-locale random syb
+         time
+       ];
+       libraryToolDepends = [ cpphs ];
+       executableHaskellDepends = [
          array base cereal containers directory filepath ghc ghc-paths
          haddock haskell-src-exts mtl old-locale process QuickCheck random
          syb time
        ];
-       testDepends = [ base directory filepath process ];
-       buildTools = [ cpphs ];
+       testHaskellDepends = [ base directory filepath process ];
        jailbreak = true;
        homepage = "http://blog.zhox.com/category/hs2lib/";
        description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs";
@@ -8438,7 +8685,7 @@ self: {
        pname = "HsASA";
        version = "0.2";
        sha256 = "1kdf2yq3v8lr84h2pf1ydi6vrqfr685vbkxjz4ai5wd2mij8i361";
-       buildDepends = [ array base random ];
+       libraryHaskellDepends = [ array base random ];
        homepage = "http://repetae.net/recent/out/HsASA.html";
        description = "A haskell interface to Lester Ingber's adaptive simulating annealing code";
        license = stdenv.lib.licenses.bsd3;
@@ -8450,7 +8697,7 @@ self: {
        pname = "HsHaruPDF";
        version = "0.0.0";
        sha256 = "1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8464,10 +8711,10 @@ self: {
        pname = "HsHyperEstraier";
        version = "0.4";
        sha256 = "0q7nngghplw97q5cmayqkkixa5lbprilvkcv0260yaz7wg5xpqk8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bytestring network text
        ];
-       pkgconfigDepends = [ hyperestraier qdbm ];
+       libraryPkgconfigDepends = [ hyperestraier qdbm ];
        jailbreak = true;
        homepage = "http://cielonegro.org/HsHyperEstraier.html";
        description = "HyperEstraier binding for Haskell";
@@ -8481,8 +8728,8 @@ self: {
        pname = "HsJudy";
        version = "0.2";
        sha256 = "1ypdsjy7gn6b3ynn17fcpirgwq3017jahm3pj5fh4qr6zr1cljkh";
-       buildDepends = [ base bytestring containers ];
-       extraLibraries = [ Judy ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ Judy ];
        homepage = "http://www.pugscode.org/";
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -8497,11 +8744,13 @@ self: {
        pname = "HsOpenSSL";
        version = "0.11.1.1";
        sha256 = "1hf4xgc2488hm0y9isrl7mxlacf1iazb6h1l1wz8dab8x5sf0qaa";
-       buildDepends = [ base bytestring network old-locale time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring network old-locale time
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit
        ];
-       extraLibraries = [ openssl ];
        homepage = "https://github.com/phonohawk/HsOpenSSL";
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -8513,7 +8762,7 @@ self: {
        pname = "HsOpenSSL-x509-system";
        version = "0.1.0.2";
        sha256 = "16r82d6mk5l1pb0vvc16d1cn5pi4wg9k83y7vr9gl9ackz345jgc";
-       buildDepends = [ base bytestring HsOpenSSL unix ];
+       libraryHaskellDepends = [ base bytestring HsOpenSSL unix ];
        homepage = "https://github.com/redneb/HsOpenSSL-x509-system";
        description = "Use the system's native CA certificate store with HsOpenSSL";
        license = stdenv.lib.licenses.bsd3;
@@ -8525,7 +8774,9 @@ self: {
        pname = "HsParrot";
        version = "0.0.2.20120717";
        sha256 = "19f95cyxcyhsk2x13l7csahgnn8rs029s3hdlxp5z0d3a9vb41gd";
-       buildDepends = [ base bytestring HsSyck pretty pugs-DrIFT ];
+       libraryHaskellDepends = [
+         base bytestring HsSyck pretty pugs-DrIFT
+       ];
        description = "Haskell integration with Parrot virtual machine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8537,7 +8788,7 @@ self: {
        pname = "HsPerl5";
        version = "0.0.6";
        sha256 = "0czhibr8lw4mjinwszjp4nh1ifi1xgkynwbjs6l3k97dqfd8bw4v";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8549,7 +8800,7 @@ self: {
        pname = "HsSVN";
        version = "0.4.3.3";
        sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7";
-       buildDepends = [ base bytestring mtl stm ];
+       libraryHaskellDepends = [ base bytestring mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/phonohawk/HsSVN";
        description = "Partial Subversion (SVN) binding for Haskell";
@@ -8563,7 +8814,9 @@ self: {
        pname = "HsSyck";
        version = "0.53";
        sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf";
-       buildDepends = [ base bytestring hashtables syb utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring hashtables syb utf8-string
+       ];
        description = "Fast, lightweight YAML loader and dumper";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -8574,7 +8827,7 @@ self: {
        pname = "HsTools";
        version = "0.0.1.1";
        sha256 = "0banfivx4xc0j3c1qmda31gvvrqqsg12fzizcpman2fvdlk7kn5l";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Haskell helper functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8591,7 +8844,7 @@ self: {
        sha256 = "09v2gcazqlmw7j7sqzzzmsz1jr3mrnfy3p30w9hnp2g430w10r2a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cmdargs data-accessor data-accessor-template
          data-accessor-transformers directory filepath Glob
          GotoT-transformers haskell98 mtl parsec regex-base regex-compat
@@ -8610,10 +8863,10 @@ self: {
      mkDerivation {
        pname = "Hsmtlib";
        version = "2.8.8.8";
-       revision = "1";
        sha256 = "1zb5s5rwcqc90c3zv332k44p7l13ngp9nqci8qalnlbxbypx3hab";
+       revision = "1";
        editedCabalFile = "01f30561cce8648a656f075ba1e1f8c23144e7f10c6377a7949881dc513f8a89";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers parsec pretty process smtLib transformers
        ];
        jailbreak = true;
@@ -8631,7 +8884,7 @@ self: {
        pname = "HueAPI";
        version = "0.2.5";
        sha256 = "1yz0cjacywrv72hj9dqf9c3zqslhcfz68z149hhv49f7g7k5m64i";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers lens lens-aeson mtl transformers wreq
        ];
        homepage = "https://github.com/sjoerdvisscher/HueAPI";
@@ -8647,8 +8900,10 @@ self: {
        pname = "Hungarian-Munkres";
        version = "0.1.5";
        sha256 = "0g2hgcrsfwqp4w3mzg6vwi7lypgqd0b6axaff81wbi27h9n8q4qd";
-       buildDepends = [ base ];
-       testDepends = [ array base Munkres random tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         array base Munkres random tasty tasty-quickcheck
+       ];
        description = "A Linear Sum Assignment Problem (LSAP) solver";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -8659,7 +8914,7 @@ self: {
        pname = "IDynamic";
        version = "0.1";
        sha256 = "1p4h2hxwzp0bxkzh864vkqbwychi0j2c3rqck9vk5kfax5i1jfz8";
-       buildDepends = [ base containers directory ];
+       libraryHaskellDepends = [ base containers directory ];
        jailbreak = true;
        description = "Indexable, serializable form of Data.Dynamic";
        license = stdenv.lib.licenses.bsd3;
@@ -8674,7 +8929,9 @@ self: {
        sha256 = "1r2dbpsmmsgxb43ycsz54zxcyfwanp72r9ry645mjlshg4q360xr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base bytestring containers random ];
+       libraryHaskellDepends = [
+         array base bytestring containers random
+       ];
        homepage = "http://www.alpheccar.org";
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -8691,7 +8948,7 @@ self: {
        sha256 = "04il63xafq20jn3m4hahn93xxfrp6whrjvsz974zczxqm41ygb10";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory haskell98 HaXml polyparse pretty process
          wx wxcore
        ];
@@ -8707,7 +8964,7 @@ self: {
        pname = "IOR";
        version = "0.1";
        sha256 = "0iinsva0pwparpg4lkgx8mw8l49rnl1h3zzblp89nkqk5i7qhq8a";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8721,8 +8978,10 @@ self: {
        pname = "IORefCAS";
        version = "0.2.0.1";
        sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb";
-       buildDepends = [ base bits-atomic ghc-prim ];
-       testDepends = [ base bits-atomic ghc-prim HUnit QuickCheck time ];
+       libraryHaskellDepends = [ base bits-atomic ghc-prim ];
+       testHaskellDepends = [
+         base bits-atomic ghc-prim HUnit QuickCheck time
+       ];
        homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
        description = "Atomic compare and swap for IORefs and STRefs";
        license = stdenv.lib.licenses.bsd3;
@@ -8735,7 +8994,7 @@ self: {
        pname = "IOSpec";
        version = "0.3";
        sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy";
-       buildDepends = [ base mtl QuickCheck Stream ];
+       libraryHaskellDepends = [ base mtl QuickCheck Stream ];
        description = "A pure specification of the IO monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8748,10 +9007,10 @@ self: {
        pname = "IPv6Addr";
        version = "0.6.0.2";
        sha256 = "0qzrida38n92ngrrnmjpdg3vinjjscijz8fsfr7lyffaw55k6pld";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base iproute network network-info random text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit text
        ];
        homepage = "https://github.com/MichelBoucey/IPv6Addr";
@@ -8765,7 +9024,7 @@ self: {
        pname = "IcoGrid";
        version = "0.1.2";
        sha256 = "0ryb2q5xfddcx2qg019jajac7xvaw2ci5wi094gbrqhhflj7wc8n";
-       buildDepends = [ array base GlomeVec ];
+       libraryHaskellDepends = [ array base GlomeVec ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/IcoGrid";
        description = "Library for generating grids of hexagons and pentagons mapped to a sphere";
@@ -8778,7 +9037,7 @@ self: {
        pname = "IfElse";
        version = "0.85";
        sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Anaphoric and miscellaneous useful control-flow";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8789,8 +9048,8 @@ self: {
        pname = "Imlib";
        version = "0.1.2";
        sha256 = "075x1vcrxdwknzbad05l08i5c79svf714yvv6990ffvsfykiilry";
-       buildDepends = [ array base X11 ];
-       extraLibraries = [ imlib2 ];
+       libraryHaskellDepends = [ array base X11 ];
+       librarySystemDepends = [ imlib2 ];
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) imlib2;};
 
@@ -8800,7 +9059,7 @@ self: {
        pname = "ImperativeHaskell";
        version = "2.0.0.1";
        sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/mmirman/ImperativeHaskell";
        description = "A library for writing Imperative style haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -8813,7 +9072,7 @@ self: {
        pname = "IndentParser";
        version = "0.2.1";
        sha256 = "0l9k8md2n0vhjqlvxcaf43i4cv09lnbbbw8vfz7bkbzhbwirs32j";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        homepage = "http://www.cse.iitk.ac.in/~ppk";
        description = "Combinators for parsing indentation based syntatic structures";
        license = "GPL";
@@ -8825,7 +9084,7 @@ self: {
        pname = "IndexedList";
        version = "0.1.0.1";
        sha256 = "1i7gv3iqjj4j026k0ywmksbpjyqxlgb0f6bq2v0p9pkrj5q3jxfm";
-       buildDepends = [ base PeanoWitnesses ];
+       libraryHaskellDepends = [ base PeanoWitnesses ];
        jailbreak = true;
        homepage = "https://github.com/kwf/IndexedList";
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
@@ -8838,7 +9097,7 @@ self: {
        pname = "InfixApplicative";
        version = "1.1";
        sha256 = "03c0jlnlnqm6faiandfg0kzajffk03aazkrqwav3g4vc3cdqwfgp";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8850,7 +9109,9 @@ self: {
        pname = "Interpolation";
        version = "0.3.0";
        sha256 = "046bx18mlgicp26391gvgzbi0wfwl9rddam3jdfz4lpxva4q9xhv";
-       buildDepends = [ base haskell-src-meta syb template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta syb template-haskell
+       ];
        description = "Multiline strings, interpolation and templating";
        license = "unknown";
      }) {};
@@ -8861,7 +9122,7 @@ self: {
        pname = "Interpolation-maxs";
        version = "0.3.0";
        sha256 = "0dh8d681h47jngan89vxnf8yhm31vjv8ysf21w6gclzfcl521vgn";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        description = "Multiline strings, interpolation and templating";
        license = "unknown";
      }) {};
@@ -8872,8 +9133,8 @@ self: {
        pname = "IntervalMap";
        version = "0.4.0.1";
        sha256 = "0cq0dmmawrss4jjkz3br0lhp37d4k7rd3cinbcyf0bf39dfk6mrf";
-       buildDepends = [ base containers deepseq ];
-       testDepends = [ base Cabal containers deepseq QuickCheck ];
+       libraryHaskellDepends = [ base containers deepseq ];
+       testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
        homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
        description = "Maps from Intervals to values, with efficient search";
        license = stdenv.lib.licenses.bsd3;
@@ -8887,8 +9148,10 @@ self: {
        pname = "Irc";
        version = "0.1.0.2";
        sha256 = "0qh1j9zy0yfpzdjxn6mypsw555pq2gm5nzys08zj5ilqn5z2r2pi";
-       buildDepends = [ base data-default mtl network transformers ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base data-default mtl network transformers
+       ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "https://github.com/yunxing/Irc";
        description = "DSL for IRC bots";
@@ -8902,7 +9165,7 @@ self: {
        pname = "IrrHaskell";
        version = "0.2";
        sha256 = "1j0m4ib2r84kb7c0s3qpmv3cziq3a2mql4ga9rnqi5pqkqpz2xcc";
-       buildDepends = [ base random time ];
+       libraryHaskellDepends = [ base random time ];
        description = "Haskell FRP binding to the Irrlicht game engine";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8917,8 +9180,8 @@ self: {
        pname = "IsNull";
        version = "0.4.0.0";
        sha256 = "06f03b9my7hix5fvcv9cc0saf9zfwgkvn3210vymlyc1rj450ykm";
-       buildDepends = [ base bytestring containers text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers text ];
+       testHaskellDepends = [
          base bytestring containers hspec HUnit QuickCheck
          quickcheck-instances system-filepath text unordered-containers
          vector
@@ -8938,7 +9201,7 @@ self: {
        pname = "JSON-Combinator";
        version = "0.2.8";
        sha256 = "0rdiva15wspaz33dh1g7x6llswsx1l4j51wqyvszzcjzifx2ly6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-trie containers failure
          hjson json JSONb parsec text vector
        ];
@@ -8953,7 +9216,9 @@ self: {
        pname = "JSON-Combinator-Examples";
        version = "0.0.1";
        sha256 = "1s5grfgnklnwh55yn5mlg2ibdm7mx2i7hwqs7649gkapda054ywg";
-       buildDepends = [ base bytestring json JSON-Combinator JSONb ];
+       libraryHaskellDepends = [
+         base bytestring json JSON-Combinator JSONb
+       ];
        description = "Example uses of the JSON-Combinator library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8966,12 +9231,16 @@ self: {
      mkDerivation {
        pname = "JSONb";
        version = "1.0.8";
-       revision = "1";
        sha256 = "16gjdlajqvwvq1znyq3vqxfa9vq4xs0ywxpm93v0y1rgmzcfqzj7";
+       revision = "1";
        editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-nums bytestring-trie
+         containers utf8-string
+       ];
+       executableHaskellDepends = [
          attoparsec base bytestring bytestring-nums bytestring-trie
          containers utf8-string
        ];
@@ -8992,7 +9261,7 @@ self: {
        pname = "JYU-Utils";
        version = "0.1.1.2";
        sha256 = "1c3cxdzbdvmvy1qvy4xvg10zijm8vw48pgh9c8a6mykgncwq6pw9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          lazysmallcheck mtl mwc-random parallel process QuickCheck random
          stm template-haskell unix zlib
@@ -9009,7 +9278,7 @@ self: {
        pname = "JackMiniMix";
        version = "0.1";
        sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp";
-       buildDepends = [ base hosc ];
+       libraryHaskellDepends = [ base hosc ];
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
@@ -9025,7 +9294,9 @@ self: {
        sha256 = "14v0skqf1s54jkscgdcxjh1yv5lcrc5ni44bizx0kw35vf07faah";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring language-java-classfile ];
+       executableHaskellDepends = [
+         base binary bytestring language-java-classfile
+       ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9039,7 +9310,7 @@ self: {
        sha256 = "06aiiq1bhl8gvhk2agk2rsmqrqf6ac5ym194bm5aq47hmdwi33h9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9055,10 +9326,13 @@ self: {
        sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl parsec pretty syb WebBits
          WebBits-Html
        ];
+       executableHaskellDepends = [
+         base containers mtl parsec pretty syb WebBits WebBits-Html
+       ];
        jailbreak = true;
        homepage = "http://www.cs.brown.edu/research/plt/";
        description = "Design-by-contract for JavaScript";
@@ -9076,12 +9350,12 @@ self: {
        pname = "JsonGrammar";
        version = "1.0.2";
        sha256 = "0baywdqdj0r73rfxm5zk51bgsl014s19j01wnzarfbhak8cpwcdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers hashable
          language-typescript mtl semigroups stack-prism template-haskell
          text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base HUnit language-typescript stack-prism test-framework
          test-framework-hunit text
        ];
@@ -9099,7 +9373,7 @@ self: {
        pname = "JuicyPixels";
        version = "3.2.5.3";
        sha256 = "1knq5jbwggf59h8a6aa758387q71fpzcvssg8dsr84bqwqqg2dpw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
        ];
@@ -9114,7 +9388,7 @@ self: {
        pname = "JuicyPixels-canvas";
        version = "0.1.0.0";
        sha256 = "0y791kwg9gc3nlz5sbpszd7wiqr5b5bwmgvafyjzk9xnlxlc7xcm";
-       buildDepends = [ base containers JuicyPixels ];
+       libraryHaskellDepends = [ base containers JuicyPixels ];
        jailbreak = true;
        homepage = "http://eax.me/";
        description = "Functions for drawing lines, squares and so on pixel by pixel";
@@ -9127,7 +9401,9 @@ self: {
        pname = "JuicyPixels-repa";
        version = "0.7";
        sha256 = "0fn9i3w8s2ifyg0zsdryyw1nm0c5ybaq0c6jxcggs79x0ngi0mm5";
-       buildDepends = [ base bytestring JuicyPixels repa vector ];
+       libraryHaskellDepends = [
+         base bytestring JuicyPixels repa vector
+       ];
        description = "Convenience functions to obtain array representations of images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9139,7 +9415,7 @@ self: {
        pname = "JuicyPixels-util";
        version = "0.2";
        sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc";
-       buildDepends = [ base JuicyPixels vector ];
+       libraryHaskellDepends = [ base JuicyPixels vector ];
        homepage = "https://github.com/fumieval/JuicyPixels-util";
        description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
        license = stdenv.lib.licenses.bsd3;
@@ -9153,7 +9429,7 @@ self: {
        pname = "JunkDB";
        version = "0.1.1.0";
        sha256 = "0g68khpfiwknqwwa7hv7db0563hsnd3hczfd0p4nx777xqrkh2dx";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bytestring conduit data-default directory
          filepath mtl network resourcet
        ];
@@ -9169,7 +9445,7 @@ self: {
        pname = "JunkDB-driver-gdbm";
        version = "0.1.1.0";
        sha256 = "1q8sa4w60pv7mgf17zg8yjpjvbzrg2xlpn30myp66vq2kdv293jj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit directory filepath JunkDB mtl resourcet
        ];
        jailbreak = true;
@@ -9185,7 +9461,7 @@ self: {
        pname = "JunkDB-driver-hashtables";
        version = "0.1.1.0";
        sha256 = "0385f0vpp4dy9r9cqh2rr7gpx07fazzqjk9bwrbs4nka4wfnqbv0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit hashable hashtables JunkDB mtl resourcet
        ];
        jailbreak = true;
@@ -9198,7 +9474,7 @@ self: {
        pname = "JustParse";
        version = "2.1";
        sha256 = "16il25s1fb4b6ih6njsqxx7p7x0fc0kcwa5vqn7n7knqph6vvjaa";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/grantslatton/JustParse";
        description = "A simple and comprehensive Haskell parsing library";
        license = stdenv.lib.licenses.publicDomain;
@@ -9210,8 +9486,8 @@ self: {
        pname = "KMP";
        version = "0.1.0.2";
        sha256 = "14dpqfji00jq2rc09l8d1ivphpiwkryjk5sn6lrwxv8mcly3pvhn";
-       buildDepends = [ array base ];
-       testDepends = [ base Cabal ];
+       libraryHaskellDepends = [ array base ];
+       testHaskellDepends = [ base Cabal ];
        homepage = "https://github.com/CindyLinz/Haskell-KMP";
        description = "Knuth–Morris–Pratt string searching algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -9223,7 +9499,7 @@ self: {
        pname = "KSP";
        version = "0.1";
        sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/frosch03/kerbal";
        description = "A library with the kerbal space program universe and demo code";
@@ -9236,7 +9512,7 @@ self: {
        pname = "Kalman";
        version = "0.1.0.1";
        sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5";
-       buildDepends = [ base hmatrix ];
+       libraryHaskellDepends = [ base hmatrix ];
        jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/Kalman";
        description = "A slightly extended Kalman filter";
@@ -9251,7 +9527,8 @@ self: {
        sha256 = "1vj1kbhyqh0xzwyr9v6fdyakx508vbf6n494z81yndisp115qi61";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ QuickCheck ];
        homepage = "https://github.com/ijt/kdtree";
        description = "KdTree, for efficient search in K-dimensional point clouds";
        license = stdenv.lib.licenses.bsd3;
@@ -9265,7 +9542,7 @@ self: {
        pname = "Ketchup";
        version = "0.4.3";
        sha256 = "1f5dnxfch3xrhxbgn74adzj7lalx1fpz3cicnhvvxj2aay62a7d1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring directory mime-types network text
        ];
        jailbreak = true;
@@ -9286,11 +9563,15 @@ self: {
        sha256 = "0z5ps5apr436dbm5wkfnpqksnqi3jsqmp2zkmy37crzzinlilzvn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers curry-base curry-frontend directory filepath
-         ghc-paths network old-time process random readline syb unix
+       libraryHaskellDepends = [
+         base containers curry-frontend directory filepath network old-time
+         process random syb unix
+       ];
+       libraryToolDepends = [ kics ];
+       executableHaskellDepends = [
+         base containers curry-base curry-frontend directory filepath
+         ghc-paths old-time process readline
        ];
-       buildTools = [ kics ];
        homepage = "http://www.curry-language.org";
        description = "A compiler from Curry to Haskell";
        license = "unknown";
@@ -9307,9 +9588,11 @@ self: {
        sha256 = "1hvdqil8lfybcp2j04ig03270q5fy29cbmg8jmv38dpcgjsx6mk1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers curry-base directory filepath haskell-src haskell98
-         KiCS KiCS-prophecy mtl readline syb
+       libraryHaskellDepends = [
+         base containers filepath haskell98 KiCS mtl readline syb
+       ];
+       executableHaskellDepends = [
+         base curry-base directory haskell-src KiCS KiCS-prophecy
        ];
        jailbreak = true;
        homepage = "http://curry-language.org";
@@ -9326,7 +9609,8 @@ self: {
        sha256 = "0l278x2gavm0ndbm4k0197cwyvamz37vzy7nz35lb7n5sc5b2gsr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath KiCS ];
+       libraryHaskellDepends = [ base filepath KiCS ];
+       executableHaskellDepends = [ base KiCS ];
        jailbreak = true;
        homepage = "http://curry-language.org";
        description = "a transformation used by the kics debugger";
@@ -9340,7 +9624,7 @@ self: {
        pname = "Kleislify";
        version = "0.0.4";
        sha256 = "0f7f6sxb774h9dx6xy6wbcrc5b2i27k9m5ay3hq9hqsjg86qmxyl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Variants of Control.Arrow functions, specialised to kleislis.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9351,7 +9635,7 @@ self: {
        pname = "Konf";
        version = "0.1.0.0";
        sha256 = "113jxbaw8b17j91aakxli3r3zdvnx3gvf2m57sx5d7mfk2qx28r6";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        jailbreak = true;
        homepage = "http://www.gkayaalp.com/p/konf.html";
        description = "A configuration language and a parser";
@@ -9367,8 +9651,8 @@ self: {
        pname = "KyotoCabinet";
        version = "0.1";
        sha256 = "1l7cpppjfz5nd8k67ss959g8sg5kbsfl4zy80a3yrlwbivyrg58n";
-       buildDepends = [ base bytestring extensible-exceptions ];
-       extraLibraries = [ kyotocabinet ];
+       libraryHaskellDepends = [ base bytestring extensible-exceptions ];
+       librarySystemDepends = [ kyotocabinet ];
        homepage = "https://code.google.com/p/kyotocabinet-hs/";
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -9385,7 +9669,7 @@ self: {
        sha256 = "1dj4320fpwmlqv5jzzi7x218mrsacdmmk3czb1szzq44pmfmpy32";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers gtk mtl old-time parsec random
        ];
        jailbreak = true;
@@ -9403,8 +9687,10 @@ self: {
        sha256 = "10lzag91slnkd1nnh0vs9nxwrsd1k5a05c2bw4fdfzqmyrfqfl20";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       extraLibraries = [ lber openldap ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ lber openldap ];
+       executableHaskellDepends = [ base ];
+       executableSystemDepends = [ lber openldap ];
        homepage = "https://github.com/ezyang/ldap-haskell";
        description = "Haskell binding for C LDAP API";
        license = stdenv.lib.licenses.bsd3;
@@ -9416,7 +9702,7 @@ self: {
        pname = "LRU";
        version = "0.1.1";
        sha256 = "0yppxz78y5myh9f53yqz6naqj15vk2h7fl3h8h8dps72zw9c5aqn";
-       buildDepends = [ base containers QuickCheck ];
+       libraryHaskellDepends = [ base containers QuickCheck ];
        homepage = "http://www.imperialviolet.org/lru";
        description = "Implements an LRU data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -9428,7 +9714,7 @@ self: {
        pname = "LTree";
        version = "0.1";
        sha256 = "0liqz3n2ycidwmg8iz7mbm0d087fcfgphvbip8bsn0hpwlf10dvw";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Tree with only leaves carrying the data";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -9443,7 +9729,7 @@ self: {
        sha256 = "0b4na8jsiwjnvyg1pl356ryffk2sj0l5f2dsivn71ii1qqblagcz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring haskeline mtl parsec pretty
        ];
        description = "A basic lambda calculator with beta reduction and a REPL";
@@ -9465,14 +9751,21 @@ self: {
        sha256 = "0vzra6020jmir6pqs26fnw2pgap7l10160v5admk7wnrrnfr91r5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array assert-failure async base binary bytestring containers
          data-default deepseq directory enummapset-th filepath ghc-prim gtk
          hashable hsini keys miniutter mtl old-time pretty-show random stm
+         text transformers unordered-containers vector
+         vector-binary-instances zlib
+       ];
+       executableHaskellDepends = [
+         array assert-failure async base binary bytestring containers
+         data-default deepseq directory enummapset-th filepath ghc-prim
+         hashable hsini keys miniutter mtl old-time pretty-show random stm
          template-haskell text transformers unordered-containers vector
          vector-binary-instances zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array assert-failure async base binary bytestring containers
          data-default deepseq directory enummapset-th filepath ghc-prim
          hashable hsini keys miniutter mtl old-time pretty-show random stm
@@ -9494,7 +9787,7 @@ self: {
        sha256 = "1hdl25dzv19gjr8dzpq1r267v3jj2c2yiskbg0kzdcrh4cj7jcwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers GLFW GLFW-task monad-task mtl OpenGL transformers
          vector
        ];
@@ -9512,7 +9805,7 @@ self: {
        pname = "LambdaNet";
        version = "0.2.0.0";
        sha256 = "06sg360vbayz1314djlg6z885yrknd7gz15s355kna21xjqydmz4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hmatrix random random-shuffle split
        ];
        jailbreak = true;
@@ -9530,12 +9823,12 @@ self: {
        pname = "LambdaPrettyQuote";
        version = "0.0.0.8";
        sha256 = "0rxh9gxsd0qh76nzib9pqgzh10gdc629ypnhbg8fjgdiaza7hyal";
-       buildDepends = [
+       libraryHaskellDepends = [
          base DebugTraceHelpers HUnit lambda-ast mtl parsec QuickCheck syb
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 transformers tuple uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers DebugTraceHelpers derive HUnit lambda-ast mtl parsec
          QuickCheck syb template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-instances transformers tuple uniplate
@@ -9556,7 +9849,7 @@ self: {
        sha256 = "1nqzlnw3fchgqn9bvlvbjma1m0wwssrip2mwb2kiv4rbhqdbfijv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl parsec Shellac Shellac-compatline
        ];
        homepage = "http://rwd.rdockins.name/lambda/home/";
@@ -9571,7 +9864,7 @@ self: {
        pname = "LargeCardinalHierarchy";
        version = "0.0.1";
        sha256 = "0agq2593h5yb9r3jqnycis9fdizwij3and61ljc4prnhhyxv48g2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A transfinite cardinal arithmetic library including all known large cardinals";
        license = "unknown";
@@ -9585,7 +9878,7 @@ self: {
        pname = "Lastik";
        version = "0.7.0";
        sha256 = "1bq8az2lrdqszn1aicvxj0spmwpxphvcvgkl6p0mnz8878hyxsdm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filemanip filepath process
          pureMD5 SHA zip-archive
        ];
@@ -9603,8 +9896,8 @@ self: {
        pname = "Lattices";
        version = "0.0.1";
        sha256 = "1x1rxl1pc64ifjrlmqqgs0p71bqymc17ls7wlj6skk1sy7kys2f5";
-       buildDepends = [ array base HaskellForMaths ];
-       testDepends = [
+       libraryHaskellDepends = [ array base HaskellForMaths ];
+       testHaskellDepends = [
          array base HaskellForMaths HUnit test-framework
          test-framework-hunit
        ];
@@ -9621,7 +9914,7 @@ self: {
        sha256 = "1y80bzcjyk5gkzkgyn8h7sf0bg11qn4qr0qgvi640spppxqfqkjq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath unix ];
+       executableHaskellDepends = [ base directory filepath unix ];
        jailbreak = true;
        homepage = "https://github.com/AtticHacker/lazyvault";
        description = "A simple sandboxing tool for Haskell packages";
@@ -9636,7 +9929,7 @@ self: {
        sha256 = "1kpz8qpm2xj5nm0sav5439flyj3zdx6ha9lgg3c7ky4sjqvwwzxv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory random SDL SDL-ttf ];
+       executableHaskellDepends = [ base directory random SDL SDL-ttf ];
        jailbreak = true;
        homepage = "http://quasimal.com/projects/level_0.html";
        description = "A Snake II clone written using SDL";
@@ -9650,7 +9943,7 @@ self: {
        pname = "LibClang";
        version = "0.1.0";
        sha256 = "12bbmgd9xh6l9c9z3r82j2csksbplha1zzzzzb8338kj81wp1pjb";
-       buildDepends = [ base greencard time ];
+       libraryHaskellDepends = [ base greencard time ];
        homepage = "https://github.com/chetant/LibClang/issues";
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
@@ -9665,10 +9958,10 @@ self: {
        pname = "LibZip";
        version = "0.11.1";
        sha256 = "04nzh9gqji20qhiiyy8i23cb4gy9qbdza5pkwicgghiqbyfrpk6f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-libzip bytestring filepath mtl time utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bindings-libzip bytestring directory filepath HUnit mtl time
          utf8-string
        ];
@@ -9683,7 +9976,7 @@ self: {
        pname = "Limit";
        version = "1.0";
        sha256 = "1yd8c443ql17daicn3r9jiwxxjlpqnpnvkbxcszjha4i4ar94zq1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9695,7 +9988,9 @@ self: {
        pname = "LinearSplit";
        version = "0.2.1";
        sha256 = "05rdlxsl5zpnczahaw2fdycqyryd3y7bccizjbn5sap23spwd7di";
-       buildDepends = [ array base cmdargs haskell98 QuickCheck ];
+       libraryHaskellDepends = [
+         array base cmdargs haskell98 QuickCheck
+       ];
        homepage = "http://github.com/rukav/LinearSplit";
        description = "Partition the sequence of items to the subsequences in the order given";
        license = stdenv.lib.licenses.bsd3;
@@ -9712,7 +10007,7 @@ self: {
        sha256 = "00wlyqclmzn03y86ba64pkc85kndnakgj8spv4vm7z0k8dsphnfq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskell98 HTTP mtl network tagsoup
        ];
        homepage = "http://janzzstimmpfle.de/~jens/software/LinkChecker/";
@@ -9727,7 +10022,7 @@ self: {
        pname = "List";
        version = "0.5.2";
        sha256 = "1b7ar17d2sq6ibgbiqbsrhk2zlxcxiwfv2xsfbya5hs8nflzkp97";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "List monad transformer and class";
        license = stdenv.lib.licenses.bsd3;
@@ -9741,10 +10036,10 @@ self: {
        pname = "ListLike";
        version = "4.2.0";
        sha256 = "1ih0kjr3n576l6abasa8pnjajml27rj8h7nx3kqv2fdm7l6lk6zg";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers dlist fmlist text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers dlist fmlist HUnit QuickCheck
          random text vector
        ];
@@ -9759,7 +10054,9 @@ self: {
        pname = "ListTree";
        version = "0.2.1";
        sha256 = "1ril13w2n1sgl44qwm1ydg94cvkm2qk55hsfv5bxbb6r99xc645m";
-       buildDepends = [ base directory filepath List transformers ];
+       libraryHaskellDepends = [
+         base directory filepath List transformers
+       ];
        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;
@@ -9772,7 +10069,7 @@ self: {
        pname = "ListZipper";
        version = "1.2.0.2";
        sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple zipper for lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9783,7 +10080,7 @@ self: {
        pname = "Logic";
        version = "0.1.0.0";
        sha256 = "0jplyy09i2rr5l8qzkyd41wwi7yj3sxlrz8f36ygdwxnwqfk2w01";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://gogotanaka.me/";
        description = "Logic";
@@ -9807,14 +10104,17 @@ self: {
        sha256 = "1yqnrzcmx8ch9xcpg07if9cs4z1sdpyjfpgzkqkhv9i263pfgxpk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          AbortT-mtl AbortT-transformers base bytestring cereal cmdtheline
          composition containers data-ivar derive directory hslogger
          hslogger-template lens MonadCatchIO-transformers monoid-statistics
          mtl multiset old-locale operational prefix-units pretty PSQueue
          sequential-index split stm time transformers void yjtools
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base cereal cmdtheline containers transformers
+       ];
+       testHaskellDepends = [
          base bytestring cereal composition containers data-ivar directory
          hslogger hslogger-template HUnit lens MonadCatchIO-transformers
          operational QuickCheck quickcheck-instances random smallcheck stm
@@ -9838,12 +10138,16 @@ self: {
        sha256 = "0sqlx06i9f3wxzpk7mivbnn2k4z5n141vbkn1bj886bk5srbrx92";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers data-ivar derive
          hslogger hslogger-template LogicGrowsOnTrees
          MonadCatchIO-transformers stm transformers
        ];
-       extraLibraries = [ openmpi ];
+       librarySystemDepends = [ openmpi ];
+       executableHaskellDepends = [
+         base cereal cmdtheline hslogger LogicGrowsOnTrees
+       ];
+       executableSystemDepends = [ openmpi ];
        jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -9862,12 +10166,15 @@ self: {
        sha256 = "0r66pb35fpmgvkf41kxz289c9ylwv7jdf9bxbsrv7p4ylg83x2dn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal cmdtheline composition containers hslogger
          hslogger-template lens LogicGrowsOnTrees MonadCatchIO-transformers
          mtl network pretty transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base cereal cmdtheline LogicGrowsOnTrees
+       ];
+       testHaskellDepends = [
          base hslogger hslogger-template HUnit LogicGrowsOnTrees network
          random stm test-framework test-framework-hunit transformers
        ];
@@ -9889,12 +10196,15 @@ self: {
        sha256 = "0d1kz5d83frn1591vgk33d0rw2s4z98lp993rnvhl3k5zqpr2svn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers filepath FindBin
          hslogger hslogger-template LogicGrowsOnTrees
          MonadCatchIO-transformers process transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base cereal cmdtheline LogicGrowsOnTrees
+       ];
+       testHaskellDepends = [
          base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees
          random test-framework test-framework-hunit transformers
        ];
@@ -9915,7 +10225,7 @@ self: {
        sha256 = "0dwsx23fibgj36181rfwfj1kl6sgdkf8bk4dd9cwia0rbjrl4qyk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory filepath haskell98 HaXml
          mtl network old-time parsec pureMD5 random syb template-haskell
          utf8-string
@@ -9938,7 +10248,7 @@ self: {
        sha256 = "09vhz5gc9nmlwlxn6vk5whq6lpqbidqifx4i4lvp4n21gib64v9b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols base64-bytestring bytestring containers
          directory filepath haskell-src HsOpenSSL hxt mtl network stm time
          time-http unix zlib
@@ -9960,9 +10270,10 @@ self: {
        sha256 = "0h76xsh4p4zbxnbk7hszwm1gj44p6349d4bkbixn7fyiyp4f0pvh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base Biobase cmdargs PrimitiveArray split tuple vector
+       libraryHaskellDepends = [
+         base Biobase PrimitiveArray tuple vector
        ];
+       executableHaskellDepends = [ cmdargs split ];
        homepage = "http://www.tbi.univie.ac.at/software/mcfolddp/";
        description = "Folding algorithm based on nucleotide cyclic motifs";
        license = stdenv.lib.licenses.gpl3;
@@ -9972,7 +10283,7 @@ self: {
   "MFlow" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , case-insensitive, clientsession, conduit, conduit-extra
-     , containers, cpphs, directory, extensible-exceptions, http-types
+     , containers, directory, extensible-exceptions, http-types
      , monadloc, mtl, old-time, parsec, pwstore-fast, random
      , RefSerialize, resourcet, stm, TCache, text, time, transformers
      , utf8-string, vector, wai, wai-extra, warp, warp-tls, Workflow
@@ -9981,7 +10292,7 @@ self: {
        pname = "MFlow";
        version = "0.4.5.9";
        sha256 = "0mqsyx7wkfgvpppqgpjpvzwx79vj7lh4c8afzzj1hgh8z0ilb4ik";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring case-insensitive
          clientsession conduit conduit-extra containers directory
          extensible-exceptions http-types monadloc mtl old-time parsec
@@ -9989,7 +10300,6 @@ self: {
          transformers utf8-string vector wai wai-extra warp warp-tls
          Workflow
        ];
-       buildTools = [ cpphs ];
        description = "stateful, RESTful web framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10001,7 +10311,7 @@ self: {
        pname = "MHask";
        version = "0.3.0.0";
        sha256 = "0nlj914ahipyfqv1l7qr66pa0a8g4g6ks6mipc38z5f1jy0kjrva";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/DanBurton/MHask#readme";
        description = "The category of monads";
@@ -10015,7 +10325,7 @@ self: {
        pname = "MSQueue";
        version = "0.0.1";
        sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y";
-       buildDepends = [ base ghc-prim monad-loops ref-mtl stm ];
+       libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Michael-Scott queue";
@@ -10031,7 +10341,7 @@ self: {
        pname = "MagicHaskeller";
        version = "0.9.1";
        sha256 = "1rr1gp808qwi0i84l6hmm03b8khnawz8qq606p5a351pd0mbxkak";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory ghc ghc-paths
          haskell-src html mtl network old-time pretty random syb
          template-haskell
@@ -10047,10 +10357,10 @@ self: {
      mkDerivation {
        pname = "MaybeT";
        version = "0.1.2";
-       revision = "1";
        sha256 = "0cmnfs22ldai0z172rdsvryzsh33a70yax21v03nhr92a4b62plr";
+       revision = "1";
        editedCabalFile = "399ec60488680853ace716790b8ebaeee1a74da8a24ced5b5caaea4341b88580";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "MaybeT monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -10062,7 +10372,7 @@ self: {
        pname = "MaybeT-monads-tf";
        version = "0.2.0.1";
        sha256 = "034v9n6ldjn1hsv4rphvysbykm8x0jqa2prbw7k28fkp6m30j74x";
-       buildDepends = [ base monads-tf transformers ];
+       libraryHaskellDepends = [ base monads-tf transformers ];
        jailbreak = true;
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -10075,7 +10385,7 @@ self: {
        pname = "MaybeT-transformers";
        version = "0.2";
        sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily";
-       buildDepends = [ base monads-fd transformers ];
+       libraryHaskellDepends = [ base monads-fd transformers ];
        jailbreak = true;
        description = "MaybeT monad transformer using transformers instead of mtl";
        license = stdenv.lib.licenses.bsd3;
@@ -10092,7 +10402,7 @@ self: {
        sha256 = "041kqz5j8xaa2ciyrfnwz6p9gcx4il5s6f34kzv9kp0s07hmn1q2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath HUnit mtl old-locale
          pretty random regex-posix time
        ];
@@ -10107,7 +10417,7 @@ self: {
        pname = "MeanShift";
        version = "0.1";
        sha256 = "0rnbg7w3qc3xsbzpw5is7w7qdjl2kqbr1acc744aggwlibazl59w";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        description = "Mean shift algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -10119,7 +10429,7 @@ self: {
        pname = "Measure";
        version = "0.0.2";
        sha256 = "1vy8ykjy9cpv661byqv21775zbyciqx2hf77c1nl58nn34x0s2ds";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A library for units of measurement";
        license = stdenv.lib.licenses.bsd3;
@@ -10132,7 +10442,7 @@ self: {
        pname = "MemoTrie";
        version = "0.6.2";
        sha256 = "1g4b82s30bqkfids3iywf873nyn8h7l8rp8l3xl58smj5lbi3p4x";
-       buildDepends = [ base void ];
+       libraryHaskellDepends = [ base void ];
        homepage = "http://haskell.org/haskellwiki/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
@@ -10146,7 +10456,7 @@ self: {
        pname = "MetaHDBC";
        version = "0.1.4";
        sha256 = "0l47v2cpbngxrq1r6p95rfcs16jqwr8l1sy4bcg9liazz50i8lyr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base convertible hashtables HDBC HDBC-odbc mtl template-haskell
        ];
        jailbreak = true;
@@ -10160,7 +10470,7 @@ self: {
        pname = "MetaObject";
        version = "0.0.6.20110925";
        sha256 = "0cgn13rpbqkywpiki6fcl76iwmc74d0f9ixki6dg7lrg49lhb67r";
-       buildDepends = [ base containers stringtable-atom ];
+       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;
@@ -10172,7 +10482,7 @@ self: {
        pname = "Metrics";
        version = "0.1.2";
        sha256 = "1ks5h3vlla2d86wvf2a4z1qifsinya2skq8ygdk45ynnwk735y4x";
-       buildDepends = [ base hstats ];
+       libraryHaskellDepends = [ base hstats ];
        homepage = "http://github.com/benhamner/Metrics/";
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
@@ -10189,7 +10499,7 @@ self: {
        sha256 = "1vxsaw2kfrx6g5y57lchcs1xwj0jnanw9svg59mjnasw53z674ck";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring directory filepath haskell98 mtl old-locale
          process time
        ];
@@ -10209,10 +10519,10 @@ self: {
        sha256 = "14h7ksd95wiixfmvrkxw3l13qdxhrhgkhmz00mcw04bdyzfmgr0n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers haskell-src-exts mtl pretty
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://www.tcs.ifi.lmu.de/~abel/miniagda/";
        description = "A toy dependently typed programming language with type-based termination";
@@ -10230,11 +10540,11 @@ self: {
        pname = "MissingH";
        version = "1.3.0.1";
        sha256 = "1cwdhgqqv2riqwhsgyrpmqyzvg19lx6zp1g7xdp4rikh7rkn03ds";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath hslogger HUnit mtl network
          old-locale old-time parsec process random regex-compat time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers directory errorcall-eq-instance filepath
          hslogger HUnit mtl network old-locale old-time parsec process
          QuickCheck random regex-compat testpack time unix
@@ -10250,7 +10560,7 @@ self: {
        pname = "MissingK";
        version = "0.0.0.2";
        sha256 = "0cynzg5piy14g5j576kf79dh4zqa5pcpwnpfl0fdkyy1rqm50q03";
-       buildDepends = [ base glib template-haskell ];
+       libraryHaskellDepends = [ base glib template-haskell ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Useful types and definitions missing from other libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -10264,8 +10574,8 @@ self: {
        pname = "MissingM";
        version = "0.0.4";
        sha256 = "19kijf02jq8w3n2fvisb8xrws524sa690lbp9di6499xakkzyqxs";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
@@ -10279,7 +10589,7 @@ self: {
        pname = "MissingPy";
        version = "0.10.6";
        sha256 = "0390ap25qj6a37jllsih39q5apgvwdjdw5m7jgfrllkp5bng6yj6";
-       buildDepends = [ anydbm base MissingH ];
+       libraryHaskellDepends = [ anydbm base MissingH ];
        homepage = "http://github.com/softmechanics/missingpy";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.mit;
@@ -10292,7 +10602,7 @@ self: {
        pname = "Modulo";
        version = "0.2.0.1";
        sha256 = "1n90lfrvfr1ni7ninlxbs4wk0m7mibdpi9sy26ifih51nmk8nziq";
-       buildDepends = [ base numeric-prelude ];
+       libraryHaskellDepends = [ base numeric-prelude ];
        description = "Modular arithmetic via Numeric-Prelude";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -10305,7 +10615,8 @@ self: {
        sha256 = "1nk767nywssg5p50wd6czcbhi61v5gcncyy3d59a90slzic8n5b3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base GLUT random ];
+       libraryHaskellDepends = [ base GLUT random ];
+       executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10318,7 +10629,7 @@ self: {
        pname = "MoeDict";
        version = "0.0.3";
        sha256 = "0sf7qhw3z984mnprgq2jxqsx9z5v2q36hdb84fdn34rgjzrv3z9a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
        ];
        homepage = "https://github.com/audreyt/MoeDict.hs";
@@ -10334,7 +10645,7 @@ self: {
        pname = "MonadCatchIO-mtl";
        version = "0.3.1.0";
        sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions MonadCatchIO-transformers
        ];
        jailbreak = true;
@@ -10349,7 +10660,7 @@ self: {
        pname = "MonadCatchIO-mtl-foreign";
        version = "0.1";
        sha256 = "0jfq5v1jigxl9mnnvpqph9ayq840s9nyb5srym04mbicri4gbjan";
-       buildDepends = [ base MonadCatchIO-mtl mtl primitive ];
+       libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ];
        jailbreak = true;
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
@@ -10364,7 +10675,7 @@ self: {
        pname = "MonadCatchIO-transformers";
        version = "0.3.1.3";
        sha256 = "1g840h7whsvgyrh4v58mdmsb7hinq785irbz6x9y08r1q8r9r90h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions monads-tf transformers
        ];
        description = "Monad-transformer compatible version of the Control.Exception module";
@@ -10379,7 +10690,7 @@ self: {
        pname = "MonadCatchIO-transformers-foreign";
        version = "0.1";
        sha256 = "070ifw78z2si3l1hqqvx236spdf61p3bf1qspd54fzq2dm89i1yw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base MonadCatchIO-transformers primitive transformers
        ];
        jailbreak = true;
@@ -10397,7 +10708,7 @@ self: {
        pname = "MonadCompose";
        version = "0.8.3.1";
        sha256 = "0njvbz2cwc3339h87wxhl5kzb2v1ny5skqvhrsdzp95f1k8chnxa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default ghc-prim mmorph monad-loops monad-products mtl
          parallel random transformers transformers-compat
        ];
@@ -10415,7 +10726,8 @@ self: {
        sha256 = "1p8xhxxjhwr93as98pvp1z25ypgj7arka8bw75r0q46948h7nxf7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell98 parsec process template-haskell ];
+       libraryHaskellDepends = [ base parsec template-haskell ];
+       executableHaskellDepends = [ base haskell98 process ];
        homepage = "http://monadgarden.cs.missouri.edu/MonadLab";
        description = "Automatically generate layered monads";
        license = stdenv.lib.licenses.bsd3;
@@ -10428,7 +10740,7 @@ self: {
        pname = "MonadPrompt";
        version = "1.0.0.5";
        sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "MonadPrompt, implementation & examples";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10441,7 +10753,7 @@ self: {
        pname = "MonadRandom";
        version = "0.4";
        sha256 = "14vgp2sml9jsras9l0488gy2siamcqf78y3vlr1my4lhhdx3ybyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl random transformers transformers-compat
        ];
        description = "Random-number generation monad";
@@ -10454,7 +10766,7 @@ self: {
        pname = "MonadRandomLazy";
        version = "0.1";
        sha256 = "1nsnv47mwka4bsmv7hvsx96s6w6qrzvfsn47fvcfy4fi88b56p2j";
-       buildDepends = [ base MonadRandom mtl random ];
+       libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10466,7 +10778,7 @@ self: {
        pname = "MonadStack";
        version = "0.1.0.3";
        sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/bhurt/MonadStack";
        description = "Generalizing lift to monad stacks";
        license = stdenv.lib.licenses.bsd2;
@@ -10480,7 +10792,7 @@ self: {
        sha256 = "0jq59nnnydllqpvg3h2d1ylz3g58hwi0m08lmw2bv0ajzgn5mc8x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base directory GLUT OpenGL ];
+       executableHaskellDepends = [ array base directory GLUT OpenGL ];
        homepage = "http://www.geocities.jp/takascience/haskell/monadius_en.html";
        description = "2-D arcade scroller";
        license = "GPL";
@@ -10496,7 +10808,7 @@ self: {
        sha256 = "0myghw0w122n1czpaaqmpiyv0nragjkwnja8kb4agrwhcjfk3icb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory free free-game mtl
        ];
        homepage = "https://github.com/fumieval/Monaris/";
@@ -10511,7 +10823,7 @@ self: {
        pname = "Monatron";
        version = "0.3.1";
        sha256 = "0250xqc5fgl8mg9yb0ykbfmxnyxacqbvi692irgfw89gf9vkh886";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10523,7 +10835,7 @@ self: {
        pname = "Monatron-IO";
        version = "1.0";
        sha256 = "0svdyfzv4xlwjnc61wwik8a60a5667lhsys49sgry65a1v2csnv0";
-       buildDepends = [ base Monatron transformers ];
+       libraryHaskellDepends = [ base Monatron transformers ];
        jailbreak = true;
        homepage = "https://github.com/kreuzschlitzschraubenzieher/Monatron-IO";
        description = "MonadIO instances for the Monatron transformers";
@@ -10537,7 +10849,7 @@ self: {
        pname = "Monocle";
        version = "0.0.4";
        sha256 = "1p8s2agsni56h7vlydbhy7qhi0qkwafpcrsfafrlg44gvpwff15y";
-       buildDepends = [ base containers haskell98 mtl ];
+       libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10549,7 +10861,7 @@ self: {
        pname = "MorseCode";
        version = "0.0.5";
        sha256 = "1dglyak17db7q9nd6s255w2zh8lh192vidyjvgvh53vbybymb20z";
-       buildDepends = [ base containers split ];
+       libraryHaskellDepends = [ base containers split ];
        description = "Morse code";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -10562,11 +10874,11 @@ self: {
        pname = "MuCheck";
        version = "0.3.0.4";
        sha256 = "183p3fmzz5d67g8wmzgv8c8yyhs0cp7x3xig4cm9s98nhrsm1j0r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory hashable haskell-src-exts hint mtl random syb
          temporary time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory hashable haskell-src-exts hint hspec mtl random syb
          temporary time
        ];
@@ -10583,7 +10895,8 @@ self: {
        sha256 = "05x5sfwlzzis29sps93ypsn53y2vs4cjmxifjqn7wd5lmhaxjbhj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HUnit MuCheck ];
+       libraryHaskellDepends = [ base HUnit MuCheck ];
+       executableHaskellDepends = [ base HUnit MuCheck ];
        homepage = "https://bitbucket.com/osu-testing/mucheck-hunit";
        description = "Automated Mutation Testing for HUnit tests";
        license = stdenv.lib.licenses.gpl2;
@@ -10597,7 +10910,8 @@ self: {
        sha256 = "0c8sd6ns8hnhc7577j0y7iqyhf7ld51zmrr3jgpckgpcghycw5mw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hspec hspec-core MuCheck ];
+       libraryHaskellDepends = [ base hspec hspec-core MuCheck ];
+       executableHaskellDepends = [ base hspec hspec-core MuCheck ];
        homepage = "https://bitbucket.com/osu-testing/mucheck-hspec";
        description = "Automated Mutation Testing for Hspec tests";
        license = stdenv.lib.licenses.gpl2;
@@ -10611,7 +10925,8 @@ self: {
        sha256 = "1q242vw70jccfj19jn6wx1fm74mshd60lay9ql4379mgcl2lf6qk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base MuCheck QuickCheck ];
+       libraryHaskellDepends = [ base MuCheck QuickCheck ];
+       executableHaskellDepends = [ base MuCheck QuickCheck ];
        homepage = "https://bitbucket.com/osu-testing/mucheck-quickcheck";
        description = "Automated Mutation Testing for QuickCheck tests";
        license = stdenv.lib.licenses.gpl2;
@@ -10625,7 +10940,8 @@ self: {
        sha256 = "19brgllnbsbbg57jgwgd745iial53ykn7c329x9lq6gd82siavii";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base MuCheck smallcheck ];
+       libraryHaskellDepends = [ base MuCheck smallcheck ];
+       executableHaskellDepends = [ base MuCheck smallcheck ];
        homepage = "https://bitbucket.com/osu-testing/mucheck-smallcheck";
        description = "Automated Mutation Testing for SmallCheck tests";
        license = stdenv.lib.licenses.gpl2;
@@ -10637,7 +10953,7 @@ self: {
        pname = "Munkres";
        version = "0.1";
        sha256 = "169mgcyls0dsifnbp615r4i3g64ga2vbczsiv4aq17d1nma8sw19";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Munkres' assignment algorithm (hungarian method)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10648,7 +10964,7 @@ self: {
        pname = "Munkres-simple";
        version = "0.1.0.1";
        sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb";
-       buildDepends = [ array base bimap containers Munkres ];
+       libraryHaskellDepends = [ array base bimap containers Munkres ];
        jailbreak = true;
        description = "Simple and typesafe layer over the Munkres package";
        license = stdenv.lib.licenses.bsd3;
@@ -10664,7 +10980,7 @@ self: {
        pname = "MusicBrainz";
        version = "0.2.4";
        sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra HTTP http-conduit
          http-types monad-control resourcet text time time-locale-compat
          transformers vector xml-conduit xml-types
@@ -10680,7 +10996,7 @@ self: {
        pname = "MusicBrainz-libdiscid";
        version = "0.5.0.0";
        sha256 = "15fwpbh8yxv41k73j9q4v5d5c5rh3q2xfp7pc7b5mc3rxipw4pa5";
-       buildDepends = [ base containers vector ];
+       libraryHaskellDepends = [ base containers vector ];
        homepage = "https://github.com/atwupack/MusicBrainz-libdiscid";
        description = "Binding to libdiscid by MusicBrainz";
        license = "LGPL";
@@ -10694,7 +11010,8 @@ self: {
        sha256 = "1bwq0fwhkw4i2kjx9xbdfn0y86j9s78kyrw9vlxq7zmv4pddazly";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://afonso.xyz";
        description = "Generate all primes";
@@ -10709,7 +11026,7 @@ self: {
        sha256 = "1niwh0ndkzgd38phx5527i14nb9swvybdjwjwbndkpb21x5j82nc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HCL HTTP network regex-compat ];
+       executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10723,7 +11040,7 @@ self: {
        pname = "NTRU";
        version = "1.0.0.0";
        sha256 = "0n96hxzv5b1zs0xkq5ksh0hp075ca46l8xd7cs2hdnmkmi6rwvha";
-       buildDepends = [
+       libraryHaskellDepends = [
          arithmoi base bytestring containers crypto-api polynomial random
          SHA split
        ];
@@ -10743,14 +11060,15 @@ self: {
        sha256 = "1ka1k9dww84rxx8c45dab6f92cb8mx3fy3sskw07p3f4ahv9whi3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring filepath mtl serialport time unix
+       libraryHaskellDepends = [
+         base bytestring mtl serialport time unix
        ];
-       testDepends = [
+       librarySystemDepends = [ bluetooth ];
+       executableHaskellDepends = [ base bytestring filepath mtl ];
+       testHaskellDepends = [
          base bytestring filepath HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
-       extraLibraries = [ bluetooth ];
        homepage = "http://mitar.tnode.com";
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.gpl3;
@@ -10767,7 +11085,7 @@ self: {
        sha256 = "117ngz15j5chnyrhj1da3r4z11vqx5g70wan7zblwr3s6n006485";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base hashable mtl resourcet stm text
          unordered-containers
        ];
@@ -10785,7 +11103,8 @@ self: {
        sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ListLike uu-parsinglib ];
+       libraryHaskellDepends = [ base containers ListLike uu-parsinglib ];
+       executableHaskellDepends = [ base uu-parsinglib ];
        jailbreak = true;
        description = "Very small interpreter for a Prolog-like language";
        license = stdenv.lib.licenses.bsd3;
@@ -10801,7 +11120,7 @@ self: {
        pname = "NaturalLanguageAlphabets";
        version = "0.0.1.0";
        sha256 = "0s2dv9vsfy1j3v7n0j35y69sjmsjcps88idd7b3f6fnxbmwms3z2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bimaps bytestring deepseq file-embed hashable
          hashtables intern stringable system-filepath text
          unordered-containers vector vector-th-unbox
@@ -10820,7 +11139,8 @@ self: {
        sha256 = "1xjhmjxp7w0nxvphnfh2phfpg4aqhjyg2f8q99qqavf8cq2k3za9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring QuickCheck strict ];
+       libraryHaskellDepends = [ base bytestring strict ];
+       executableHaskellDepends = [ base bytestring QuickCheck strict ];
        homepage = "http://github.com/joachifm/natsort";
        description = "Natural sorting for strings";
        license = stdenv.lib.licenses.bsd3;
@@ -10836,7 +11156,11 @@ self: {
        sha256 = "083hkcgmrk42pyjm1xz1amdjpmccw0c72axmkk163ar6ir7aznc8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal containers directory hashable messagepack
+         network stm vector
+       ];
+       executableHaskellDepends = [
          base bytestring cereal containers directory hashable messagepack
          network stm vector
        ];
@@ -10850,7 +11174,7 @@ self: {
        pname = "NestedFunctor";
        version = "0.2.0.2";
        sha256 = "1kmv20haxkqn1cwy9g59nmjpn5x1rng2rrd8y3gwxfdwn8blc735";
-       buildDepends = [ base comonad distributive ];
+       libraryHaskellDepends = [ base comonad distributive ];
        jailbreak = true;
        homepage = "https://github.com/kwf/NestedFunctor";
        description = "Nested composition of functors with a type index tracking nesting";
@@ -10863,7 +11187,7 @@ self: {
        pname = "NestedSampling";
        version = "0.1.4";
        sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv";
-       buildDepends = [ base random vector ];
+       libraryHaskellDepends = [ base random vector ];
        homepage = "https://github.com/ijt/haskell_nested_sampling";
        description = "A port of John Skilling's nested sampling C code to Haskell";
        license = stdenv.lib.licenses.gpl2;
@@ -10877,9 +11201,9 @@ self: {
        pname = "NetSNMP";
        version = "0.3.2.0";
        sha256 = "1z3d4qmwzg3hkx78z4fbdsdh6vxnw95fkvfxgzng4bq10y6d2bb8";
-       buildDepends = [ base bytestring utf8-string ];
-       testDepends = [ base bytestring HUnit process utf8-string ];
-       extraLibraries = [ net_snmp ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
+       librarySystemDepends = [ net_snmp ];
+       testHaskellDepends = [ base bytestring HUnit process utf8-string ];
        homepage = "https://github.com/ptek/netsnmp";
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
@@ -10897,14 +11221,13 @@ self: {
        sha256 = "1h6p1p16wvsi6pjpz2xdvbljd394bzpqqfiah7aq9d7f7zh7hzid";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers convertible exceptions
          monad-loops monad-peel mstate mtl network NineP regex-posix
          stateref transformers
        ];
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NewBinary" = callPackage
@@ -10913,7 +11236,7 @@ self: {
        pname = "NewBinary";
        version = "0.2.1";
        sha256 = "0cp71hkx8cccx7jxf5qw1bxdylcc56v68mvjp0dn9hkh1idxplzq";
-       buildDepends = [ array base integer ];
+       libraryHaskellDepends = [ array base integer ];
        jailbreak = true;
        description = "A binary I/O library";
        license = "unknown";
@@ -10926,7 +11249,7 @@ self: {
        pname = "NineP";
        version = "0.0.2.1";
        sha256 = "1k6qdp4zmqjl2f6cqy1zzzl6ncb2m9r0qgh4c24i2h5kkxmm3cab";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://9ph.googlecode.com";
        description = "9P2000 in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -10942,7 +11265,7 @@ self: {
        sha256 = "0wz80cv7m7m4q6y6rd07y422b97hyhnb9yl6bj68pi1nxmjzcjhm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers filepath gloss network
          networked-game random
        ];
@@ -10964,7 +11287,7 @@ self: {
        sha256 = "1pr1v8xxnhd7yxbhjqhlkwlsfzbk425bmxn99d80w8p4biag104x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers criterion dph-base dph-prim-seq statistics
          storablevector template-haskell uvector vector
        ];
@@ -10981,8 +11304,8 @@ self: {
        pname = "NoTrace";
        version = "0.2.0.1";
        sha256 = "053w0j90sf16by9pqllgjxy6r57vzlq33fgwz4ywjn6bypw6009d";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/CindyLinz/Haskell-NoTrace";
        description = "Remove all the functions come from Debug.Trace after debugging";
@@ -10995,7 +11318,7 @@ self: {
        pname = "Noise";
        version = "1.0.6";
        sha256 = "0sjyq8nilqhmlhbagi1ms2zh7fyhzci9w5hj3dyxpd2ccq1bbvyq";
-       buildDepends = [ array base data-default vector ];
+       libraryHaskellDepends = [ array base data-default vector ];
        description = "A Haskell coherent noise generator based on libnoise";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11011,7 +11334,7 @@ self: {
        sha256 = "1zbrirplcgff9z75lmamh0i5749m22kvnwcr3s51wajnvh982qi3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory exceptions filepath hint-server mtl network
          Nomyx-Core Nomyx-Language Nomyx-Web safe stm time
        ];
@@ -11035,7 +11358,7 @@ self: {
        pname = "Nomyx-Core";
        version = "0.7.6";
        sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson base blaze-html blaze-markup bytestring data-lens
          data-lens-fd data-lens-template DebugTraceHelpers deepseq directory
          either-unwrap exceptions filepath happstack-authenticate hint
@@ -11059,7 +11382,7 @@ self: {
        pname = "Nomyx-Language";
        version = "0.7.6";
        sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean containers data-lens data-lens-fd data-lens-template
          DebugTraceHelpers ghc mtl old-locale random safe time
          time-recurrence
@@ -11079,7 +11402,7 @@ self: {
        pname = "Nomyx-Rules";
        version = "0.1.0";
        sha256 = "16kzpdvn57sdmpqkwswgixm6pnyi01vj44yvzczn9sy4azwd10q5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc hint-server hslogger mtl old-locale safe stm
          time time-recurrence
        ];
@@ -11100,7 +11423,7 @@ self: {
        pname = "Nomyx-Web";
        version = "0.7.6";
        sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring data-lens data-lens-fd fb
          filepath happstack-authenticate happstack-server hscolour mtl
          Nomyx-Core Nomyx-Language old-locale reform reform-blaze
@@ -11120,7 +11443,7 @@ self: {
        pname = "NonEmpty";
        version = "0.1";
        sha256 = "0nycv791c6b5bcaz5y9wm3wxn1p930p163qs1rpdiix04fnaxgxl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11133,7 +11456,7 @@ self: {
        pname = "NonEmptyList";
        version = "0.0.9";
        sha256 = "09515y7ax4vndsj1828b6xxnnkml4vg9x29rn3lrw3rc65fi11x2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base category-extras QuickCheck Semigroup test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -11149,7 +11472,7 @@ self: {
        pname = "NumInstances";
        version = "1.4";
        sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/conal/NumInstances";
        description = "Instances of numeric classes for functions and tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -11161,7 +11484,7 @@ self: {
        pname = "NumLazyByteString";
        version = "0.0.0.1";
        sha256 = "17ca34hxaz9xk3ykkzp14n7wb31aiza12859k3rmvwhnq4j89jqs";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        description = "Num, Enum, Eq, Integral, Ord, Real, and Show instances for Lazy ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11172,7 +11495,7 @@ self: {
        pname = "NumberSieves";
        version = "0.1.2";
        sha256 = "1w8y46ivli37rlhkdrnw13qv6f0m13a88w0qkfw949b09vdp2nw2";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://patch-tag.com/r/lpsmith/NumberSieves";
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
@@ -11185,7 +11508,7 @@ self: {
        pname = "Numbers";
        version = "0.2.1";
        sha256 = "1z1v396lar6b0lyis3k5gn5kn17ndggm8j7qxnhirlpgm831fgg7";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        homepage = "http://page.mi.fu-berlin.de/aneumann/numbers/index.html";
        description = "An assortment of number theoretic functions";
        license = "LGPL";
@@ -11201,7 +11524,7 @@ self: {
        sha256 = "1j9qmin7fqwfy69f7wi1is1nawhh46phda6na20am7r8cjzdnjsh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ADPfusion base ghc-prim mtl primitive PrimitiveArray vector
        ];
        jailbreak = true;
@@ -11217,7 +11540,7 @@ self: {
        pname = "Nutri";
        version = "0.1";
        sha256 = "1m7qx5zydz5jpk6a55k7rzchlwmkd91gsiqmn26qqn50ab3di35j";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/frosch03/Nutri";
        description = "A little library to calculate nutrition values of food items";
@@ -11230,7 +11553,7 @@ self: {
        pname = "OGL";
        version = "0.0.3";
        sha256 = "1w8lpi2r315b4ry234gi4rq09j92zvhr9ibxwsig6544cbb5g8qm";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://haskell.org/haskellwiki/OGL";
        description = "A context aware binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
@@ -11245,7 +11568,7 @@ self: {
        pname = "OSM";
        version = "0.6.4";
        sha256 = "1m606r0lc0hsniqn7krm2hpvhj7y6sq4qbjjj4g8n4hap6v4syr9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad-transformers containers data-lens hxt newtype
        ];
        homepage = "https://github.com/tonymorris/geo-osm";
@@ -11260,8 +11583,8 @@ self: {
        pname = "OTP";
        version = "0.0.0.1";
        sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb";
-       buildDepends = [ base Crypto time ];
-       testDepends = [ base Crypto time ];
+       libraryHaskellDepends = [ base Crypto time ];
+       testHaskellDepends = [ base Crypto time ];
        homepage = "https://github.com/matshch/OTP";
        description = "HMAC-Based and Time-Based One-Time Passwords";
        license = stdenv.lib.licenses.mit;
@@ -11273,7 +11596,7 @@ self: {
        pname = "Object";
        version = "1.0";
        sha256 = "05lrqq4008vnfs2x8kxlyrgdvxmzk04rqvn0w65b691bp3vwnbf9";
-       buildDepends = [ base containers ghc template-haskell ];
+       libraryHaskellDepends = [ base containers ghc template-haskell ];
        homepage = "https://github.com/yokto/object";
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
@@ -11288,7 +11611,7 @@ self: {
        pname = "ObjectIO";
        version = "1.0.1.1";
        sha256 = "1f8ac7dk1ls6xla3w0wy2qr164kv67k5ilj7niakfr9x74mpp6jy";
-       extraLibraries = [
+       librarySystemDepends = [
          comctl32 comdlg32 gdi32 kernel32 ole32 shell32 user32 winmm
          winspool
        ];
@@ -11304,7 +11627,7 @@ self: {
        pname = "ObjectName";
        version = "1.1.0.0";
        sha256 = "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/svenpanne/ObjectName";
        description = "Explicitly handled object names";
        license = stdenv.lib.licenses.bsd3;
@@ -11319,7 +11642,7 @@ self: {
        pname = "Obsidian";
        version = "0.1.0.0";
        sha256 = "14dbaj54i4li4hbc2bhl19ma9vgs97mfz8xfwvlndldb2kac4x01";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers cuda language-c-quote mainland-pretty mtl
          mwc-random process rdtsc text value-supply vector
        ];
@@ -11335,8 +11658,8 @@ self: {
        pname = "Octree";
        version = "0.5.4.2";
        sha256 = "0q07jylv5ggvnp32h3b63pk1rcvvxh7bzi3dyx4ga2s0zwfaq1q2";
-       buildDepends = [ AC-Vector base QuickCheck ];
-       testDepends = [ AC-Vector base markdown-unlit QuickCheck ];
+       libraryHaskellDepends = [ AC-Vector base QuickCheck ];
+       testHaskellDepends = [ AC-Vector base markdown-unlit QuickCheck ];
        homepage = "https://github.com/mgajda/octree";
        description = "Simple unbalanced Octree for storing data about 3D points";
        license = stdenv.lib.licenses.bsd3;
@@ -11348,8 +11671,8 @@ self: {
        pname = "OddWord";
        version = "1.0.0.2";
        sha256 = "1c4xbfkikyn1jh3qz0ycxzmx0zqfg5gliafb764942dvd851hljv";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "http://www.gekkou.co.uk/";
        description = "Provides a wrapper for deriving word types with fewer bits";
@@ -11357,13 +11680,13 @@ self: {
      }) {};
 
   "Omega" = callPackage
-    ({ mkDerivation, base, containers, hsc2hs, HUnit }:
+    ({ mkDerivation, base, containers, HUnit }:
      mkDerivation {
        pname = "Omega";
        version = "1.0.3";
        sha256 = "05dax2r7rrdbsvxszxn13xcf24zq87xq8scxzvl2ccr2y29n0f5j";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hsc2hs HUnit ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11375,7 +11698,7 @@ self: {
        pname = "OneTuple";
        version = "0.2.1";
        sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Singleton Tuple";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11388,7 +11711,7 @@ self: {
        pname = "OpenAFP";
        version = "1.4.2";
        sha256 = "0x8yrxyfwgzgp7158nrk4y3wzpfm9bnww0nfbbi9hajiqfd8ymc0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory hashable
          hashtables mtl process regex-compat
        ];
@@ -11409,7 +11732,7 @@ self: {
        sha256 = "160qlcjh0pgslql9f4zv2asw8kb9kl7wd6dk5958dv0n9p96pay0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers directory filepath hashable
          line2pdf OpenAFP regex-base regex-posix text text-locale-encoding
          xhtml
@@ -11427,8 +11750,10 @@ self: {
        pname = "OpenAL";
        version = "1.7.0.0";
        sha256 = "111r78zx39nyfnpq2pmy440bi4ymr6i2difwfaislvmjq43plhjw";
-       buildDepends = [ base ObjectName OpenGL StateVar transformers ];
-       extraLibraries = [ openal ];
+       libraryHaskellDepends = [
+         base ObjectName OpenGL StateVar transformers
+       ];
+       librarySystemDepends = [ openal ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
@@ -11440,10 +11765,10 @@ self: {
        pname = "OpenCL";
        version = "1.0.3.4";
        sha256 = "04cqddhn4b5m0rj2f6i3gr62yhlfgffmkplb4599sd3qbgx0g27x";
-       buildDepends = [ base bytestring mtl ];
-       testDepends = [ base QuickCheck ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ OpenCL ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ OpenCL ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/IFCA/opencl";
        description = "Haskell high-level wrapper for OpenCL";
@@ -11457,7 +11782,7 @@ self: {
        pname = "OpenCLRaw";
        version = "1.0.1001";
        sha256 = "1a9nlrmxp3jwc3hbj79xm35aypfby04qy01fk4vyrp19diiinl07";
-       buildDepends = [ base bytestring mtl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
        jailbreak = true;
        homepage = "http://vis.renci.org/jeff/opencl";
        description = "The OpenCL Standard for heterogenous data-parallel computing";
@@ -11471,7 +11796,7 @@ self: {
        pname = "OpenCLWrappers";
        version = "0.1.0.3";
        sha256 = "0xlm26jksp4jf1dhkpg4708r1ak5mjdc5x5fjp4fhizmzlk3348s";
-       buildDepends = [ base bytestring mtl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
        jailbreak = true;
        homepage = "https://github.com/jkarlson/OpenCLWrappers";
        description = "The OpenCL Standard for heterogenous data-parallel computing";
@@ -11479,22 +11804,21 @@ self: {
      }) {};
 
   "OpenGL" = callPackage
-    ({ mkDerivation, base, bytestring, GLURaw, libX11, mesa, ObjectName
-     , OpenGLRaw, StateVar, text, transformers
+    ({ mkDerivation, base, bytestring, GLURaw, ObjectName, OpenGLRaw
+     , StateVar, text, transformers
      }:
      mkDerivation {
        pname = "OpenGL";
        version = "2.12.0.1";
        sha256 = "1mcfb167jl75qc2hgylh83vf2jqizvyvkvhhb72adi2crc3zqz4b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring GLURaw ObjectName OpenGLRaw StateVar text
          transformers
        ];
-       extraLibraries = [ libX11 mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
+     }) {};
 
   "OpenGLCheck" = callPackage
     ({ mkDerivation, base, checkers, haskell98, OpenGL, QuickCheck }:
@@ -11502,7 +11826,9 @@ self: {
        pname = "OpenGLCheck";
        version = "1.0";
        sha256 = "0zjgwd9h6jncvp7x4nn049878jagcajsc63ch5i1ynndnrr1cfar";
-       buildDepends = [ base checkers haskell98 OpenGL QuickCheck ];
+       libraryHaskellDepends = [
+         base checkers haskell98 OpenGL QuickCheck
+       ];
        description = "Quickcheck instances for various data structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11514,8 +11840,8 @@ self: {
        pname = "OpenGLRaw";
        version = "2.5.1.0";
        sha256 = "1kfq24mxg922ml3kkmym2qfpc56jbmrfbiix4rc2cxlwv05i191k";
-       buildDepends = [ base transformers ];
-       extraLibraries = [ mesa ];
+       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;
@@ -11527,7 +11853,7 @@ self: {
        pname = "OpenGLRaw21";
        version = "2.0.0.2";
        sha256 = "1kfgwwjnwl5dzwf8bpxcs4q241zap29pjhh4ih5k2cdrnbbn1bz1";
-       buildDepends = [ OpenGLRaw ];
+       libraryHaskellDepends = [ OpenGLRaw ];
        description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core";
        license = "unknown";
      }) {};
@@ -11540,8 +11866,10 @@ self: {
        pname = "OpenSCAD";
        version = "0.3.0.2";
        sha256 = "04b7n6905qvvz8az8zhsjjg8jcf71y5yby7svy2mqzavq2azjm8x";
-       buildDepends = [ base colour containers filepath semigroups ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base colour containers filepath semigroups
+       ];
+       testHaskellDepends = [
          base Cabal colour containers deepseq filepath HUnit semigroups
          tasty tasty-hunit testpack
        ];
@@ -11557,7 +11885,7 @@ self: {
        pname = "OpenVG";
        version = "0.7.0";
        sha256 = "0ad96lbwcwl7vvk5vx1mmb0wj28c541jwd9nsm7l5na9qdxfhzvj";
-       buildDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
+       libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "OpenVG (ShivaVG-0.2.1) binding";
        license = stdenv.lib.licenses.bsd3;
@@ -11570,7 +11898,7 @@ self: {
        pname = "OpenVGRaw";
        version = "0.4.0";
        sha256 = "1fdg5b8f2x36x6gmdkazkmhqgknagd0kzr70hydygsmqbf2im5x2";
-       buildDepends = [ base OpenGLRaw ];
+       libraryHaskellDepends = [ base OpenGLRaw ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
        description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
@@ -11584,7 +11912,7 @@ self: {
        pname = "Operads";
        version = "1.0";
        sha256 = "1b880lrzdxww3j19zspnj49ifsn89n0ac1h5xf7nn83847k8q2qk";
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
        jailbreak = true;
        homepage = "http://math.stanford.edu/~mik/operads";
        description = "Groebner basis computation for Operads";
@@ -11598,7 +11926,7 @@ self: {
        pname = "OptDir";
        version = "0.0.3";
        sha256 = "1bb5s57d3wyr9rd275jl0sk85yisl1dpbz042yg7pksv5l0xal0q";
-       buildDepends = [ base hashable syb ];
+       libraryHaskellDepends = [ base hashable syb ];
        description = "The OptDir type for representing optimization directions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11611,7 +11939,7 @@ self: {
        pname = "OrPatterns";
        version = "0.1";
        sha256 = "0fkg2bnk7gh8lzf8i0bffj6qbbpq15sf8yw88rqpzghsz7xrr111";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta mtl split syb
          template-haskell
        ];
@@ -11628,16 +11956,17 @@ self: {
        pname = "OrchestrateDB";
        version = "1.0.0.3";
        sha256 = "0d12jbdgpfkzax5c8djab6n611hcwi1bkphwmn5qmny43fb3wsaz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HTTP http-conduit http-types lifted-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring HTTP http-conduit http-types lifted-base
          random
        ];
        homepage = "https://github.com/dwd31415/Haskell-OrchestrateDB";
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OrderedBits" = callPackage
@@ -11649,10 +11978,10 @@ self: {
        pname = "OrderedBits";
        version = "0.0.0.2";
        sha256 = "10scfjvng05vsx4clvzkfq128vf1qwwvc0zikkzx4b96pjxf80i2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bits primitive QuickCheck vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -11667,7 +11996,7 @@ self: {
        pname = "Ordinals";
        version = "0.0.0.2";
        sha256 = "04xk74rl2d6vp1kn197hsbkkwdvwvqpjqg3kgkpkl2i0r90y8lsi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://patch-tag.com/r/kyagrd/Ordinals/";
        description = "Ordinal arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -11679,7 +12008,7 @@ self: {
        pname = "PArrows";
        version = "0.1.1";
        sha256 = "08mkq72zv9ywp002vwjk7gl6pq6915zdd06sp4ap935aqdjrhn0p";
-       buildDepends = [ base containers ghc-prim mtl ];
+       libraryHaskellDepends = [ base containers ghc-prim mtl ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/PArrows/";
        description = "Arrow parser combinators similar to Parsec";
        license = stdenv.lib.licenses.bsd3;
@@ -11690,10 +12019,10 @@ self: {
      mkDerivation {
        pname = "PBKDF2";
        version = "0.3.1.5";
-       revision = "1";
        sha256 = "0ljacj31pmcwk4lk24p37761sb60ncwjnjbqhnfrgdjqnyj2bd62";
+       revision = "1";
        editedCabalFile = "6e8829aa00d16484705a23417f548b237aa1bd152c864a7cfa6948996584db3e";
-       buildDepends = [ base binary bytestring Crypto random ];
+       libraryHaskellDepends = [ base binary bytestring Crypto random ];
        description = "Make password-based security schemes more secure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11704,7 +12033,9 @@ self: {
        pname = "PCLT";
        version = "0.1";
        sha256 = "0k5abpdz066dsszkj39fd03slb279ddj4i8clnq4gafpa90xbg9q";
-       buildDepends = [ base bytestring containers mtl utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl utf8-string
+       ];
        homepage = "http://github.com/Andrey-Sisoyev/PCLT";
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
@@ -11719,7 +12050,7 @@ self: {
        pname = "PCLT-DB";
        version = "0.1.1";
        sha256 = "0nb5mijpkbllrs9034d3a24drd95lvrhlx60ahcd73kmagh9rfqf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers convertible HDBC HDBC-postgresql mtl
          PCLT
        ];
@@ -11737,7 +12068,7 @@ self: {
        sha256 = "1i5hixmywy63pnh15zl7npfiwc7dvlnz6izjxg08cnvn8jyi026q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://www.github.com/rotskoff";
        description = "A library for analysis of 3-D protein coordinates";
        license = stdenv.lib.licenses.gpl3;
@@ -11749,7 +12080,7 @@ self: {
        pname = "PSQueue";
        version = "1.1";
        sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Priority Search Queue";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11763,7 +12094,9 @@ self: {
        sha256 = "0pfd5y8plxicdchkbij0nqj6zwxw3fcy5cz1ji5bky9g3bmz9mhm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl network network-uri xml ];
+       executableHaskellDepends = [
+         base containers mtl network network-uri xml
+       ];
        homepage = "http://msakai.jp/hiki/?hsPTQ";
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
@@ -11781,7 +12114,12 @@ self: {
        sha256 = "0pnnhwmlhjvpb3g94p2asbhy9arvlvcbch11m0hmy7w9m3zj9wjk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array attoparsec base base64-string bytestring containers directory
+         iconv network old-time regex-base regex-compat regex-tdfa sqlite
+         stringtable-atom utf8-string uuid
+       ];
+       executableHaskellDepends = [
          array attoparsec base base64-string bytestring containers directory
          iconv network old-time regex-base regex-compat regex-tdfa sqlite
          stringtable-atom utf8-string uuid
@@ -11800,8 +12138,8 @@ self: {
        pname = "Paillier";
        version = "0.1.0.3";
        sha256 = "0jcb72shia5p0lpnr3qz57jlzjvnwh4642zwys5d3rg0rwnxigz2";
-       buildDepends = [ base crypto-numbers crypto-random ];
-       testDepends = [
+       libraryHaskellDepends = [ base crypto-numbers crypto-random ];
+       testHaskellDepends = [
          base crypto-numbers crypto-random HUnit QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
@@ -11820,10 +12158,11 @@ self: {
        sha256 = "1g39mxrfii8vm40cbb7vdfrx2rx9gm4s1xhp3zjkiyi7f979cbk0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          Agda base containers directory filepath mtl pandoc pandoc-types
          QuickCheck text time xhtml
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Pandoc support for literate Agda";
        license = stdenv.lib.licenses.bsd3;
@@ -11841,11 +12180,11 @@ self: {
        pname = "Paraiso";
        version = "0.3.1.3";
        sha256 = "177sinj5il7azsajf9fl65lml7pq792lnvwb07vln5my250ibwi9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers control-monad-failure directory fgl filepath
          mtl numeric-prelude random text typelevel-tensor vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers control-monad-failure directory fgl filepath
          HUnit ListLike listlike-instances mtl numeric-prelude QuickCheck
          random test-framework test-framework-hunit
@@ -11866,7 +12205,7 @@ self: {
        pname = "Parry";
        version = "0.1.0.0";
        sha256 = "0jy0pya7ahy0nzw1yizi1ll7q5kv4jxgn3n56qgcwv25rh374n4s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory ghc-prim network
          old-locale process random RSA SafeSemaphore time unix
        ];
@@ -11882,7 +12221,7 @@ self: {
        pname = "ParsecTools";
        version = "0.0.2.0";
        sha256 = "11vshnbxfl8p38aix4h2b0vms8j58agwxbmhd9pkxai764sl6j7g";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Parsec combinators for more complex objects";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -11893,7 +12232,7 @@ self: {
        pname = "ParserFunction";
        version = "0.1.0";
        sha256 = "0l0j1mdycqsb5d32l7h0giwrj5yj54523gdn0bvim2vz67qrbxrq";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        description = "Parse and evaluate mathematical expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11904,7 +12243,7 @@ self: {
        pname = "PartialTypeSignatures";
        version = "0.1.0.1";
        sha256 = "04c01bcfrb79av2j9bivlwanmycasn7gjnc9gb5jm6gkwyvgv0h3";
-       buildDepends = [ base containers syb template-haskell ];
+       libraryHaskellDepends = [ base containers syb template-haskell ];
        homepage = "http://code.haskell.org/~aavogt/PartialTypeSignatures";
        description = "emulate partial type signatures with template haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -11916,7 +12255,7 @@ self: {
        pname = "PasswordGenerator";
        version = "0.1.0.0";
        sha256 = "12lxylmpi2f1ahy6w1n7jmwn9kay4hajgr95xbnqqdzv4dw6whzw";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/VictorDenisov/PasswordGenerator";
        description = "Simple library for generating passwords";
@@ -11931,7 +12270,8 @@ self: {
        sha256 = "10gf9xkys704k89i9lajqcwqsihfxs314vjy35shhwgga5rjnslz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs HTTP network network-uri ];
+       libraryHaskellDepends = [ base cmdargs HTTP network network-uri ];
+       executableHaskellDepends = [ base cmdargs ];
        homepage = "http://github.com/Fuuzetsu/pastepipe";
        description = "CLI for pasting to lpaste.net";
        license = stdenv.lib.licenses.gpl3;
@@ -11943,8 +12283,8 @@ self: {
        pname = "Pathfinder";
        version = "0.5.10";
        sha256 = "1k38p73jnkfcmmz94iqpzg2g6apsxflidvy8p9lwqyzfmg70brqf";
-       buildDepends = [ base bytestring text ];
-       extraLibraries = [ libxml2 ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11956,7 +12296,7 @@ self: {
        pname = "Peano";
        version = "0.0.4";
        sha256 = "0ss4p40gkqcw9bdh5iy0yar56gpsanrxld74q5dxvakrf8m6cqmz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "simple Peano numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11967,7 +12307,7 @@ self: {
        pname = "PeanoWitnesses";
        version = "0.1.0.0";
        sha256 = "1g83jws23grl84gnq89rnppw6q7vsbhi9hk6lp5dq2n4818kamgg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "GADT type witnesses for Peano-style natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -11981,10 +12321,10 @@ self: {
        pname = "PerfectHash";
        version = "0.1.4";
        sha256 = "1hj05lv8yj81nhpb01ljaqj9k7j6amw6lfx1azzjnwysmjj6ipkn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers digest time
        ];
-       extraLibraries = [ cmph ];
+       librarySystemDepends = [ cmph ];
        jailbreak = true;
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
@@ -11997,7 +12337,7 @@ self: {
        pname = "PermuteEffects";
        version = "0.2";
        sha256 = "0lmmsvqbnw0k321254xfqlzmddvymy0mj50ax7caqj2fnarfgy4l";
-       buildDepends = [ base ReplicateEffects ];
+       libraryHaskellDepends = [ base ReplicateEffects ];
        jailbreak = true;
        homepage = "https://github.com/MedeaMelana/PermuteEffects";
        description = "Permutations of effectful computations";
@@ -12018,7 +12358,7 @@ self: {
        sha256 = "12f6hqgxyf3svr53g0irn15q69wp9py1bxfw3a5inpkqzmrs04x9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state aeson base blaze-html blaze-markup containers curl
          filepath friendly-time happstack-server happstack-server-tls
          lifted-base MissingH monad-control mtl network network-uri
@@ -12029,6 +12369,7 @@ self: {
        homepage = "localhost:9119";
        description = "Personal Happstack Server Utils";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Pipe" = callPackage
@@ -12037,7 +12378,7 @@ self: {
        pname = "Pipe";
        version = "2.1.2";
        sha256 = "1453rjp5whl9vywiq8i86vjfa8ys1ppwabhvlibqwsbx804q9yhr";
-       buildDepends = [ base filepath process unix ];
+       libraryHaskellDepends = [ base filepath process unix ];
        homepage = "http://iki.fi/matti.niemenmaa/pipe/";
        description = "Process piping library";
        license = stdenv.lib.licenses.bsd3;
@@ -12050,7 +12391,7 @@ self: {
        pname = "Piso";
        version = "0.1";
        sha256 = "123hwav5bsadd2lmzgys4dwja1xrbn1c5w19063ak21y5415ci83";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/MedeaMelana/Piso";
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
@@ -12066,7 +12407,7 @@ self: {
        sha256 = "17avnaz6da80v5kgz0b3v0zq3y9p2d3mxxv5a09ggcmilbz4xwlg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory mtl random regex-compat
        ];
        homepage = "freizl.github.com";
@@ -12082,7 +12423,7 @@ self: {
        pname = "PlayingCards";
        version = "0.3.0.0";
        sha256 = "1wq4y6dfn93c8pyxbz5dwbd1c2lq78fbw6s2pdk6nvi0zgf5hp6k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HUnit MonadRandom QuickCheck random-shuffle
        ];
        jailbreak = true;
@@ -12101,10 +12442,11 @@ self: {
        sha256 = "0x8mq7368yjb1q4xmkj6iqrxkf81d0vslfdrhp8cr12k83ydg3g3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo Chart Chart-cairo containers data-default-class
          generic-accessors glib gtk lens text time
        ];
+       executableHaskellDepends = [ base containers ];
        description = "Real-time line plotter for protobuf-like data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12119,7 +12461,7 @@ self: {
        sha256 = "1kly1jfki4n9fhgkh2m9j9xj8182s92i7rsq81vcm6i3hd4fac94";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base directory filepath haskell98 old-locale old-time parsec
          process random
        ];
@@ -12135,7 +12477,7 @@ self: {
        pname = "Plural";
        version = "0.0.2";
        sha256 = "047aw1pka7xsqnshbmirkxd80m92w96xfb0kpi1a22bx0kpgg58w";
-       buildDepends = [ base containers regex-tdfa ];
+       libraryHaskellDepends = [ base containers regex-tdfa ];
        description = "Pluralize English words";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -12148,7 +12490,7 @@ self: {
        sha256 = "036b114f6fas2w3kmbcb1ria2ymdgi1sc5iqkskfgbc1iizhm2wh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base clock GLUT random ];
+       executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
      }) {};
@@ -12161,7 +12503,7 @@ self: {
        sha256 = "1n095a7ggkgvxdagn7wi1rnb3h766lah5avyrdxnv4g0kl143vvy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring network splice ];
+       executableHaskellDepends = [ base bytestring network splice ];
        homepage = "http://fusion.corsis.eu";
        description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
        license = stdenv.lib.licenses.gpl3;
@@ -12173,8 +12515,8 @@ self: {
        pname = "PortMidi";
        version = "0.1.4";
        sha256 = "00w4208dan87adyd8gm7izbs38mva7glbi7s9rbcdjdkiz486q8m";
-       buildDepends = [ base ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ alsaLib ];
        homepage = "http://haskell.org/haskellwiki/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
@@ -12186,7 +12528,7 @@ self: {
        pname = "PostgreSQL";
        version = "0.2";
        sha256 = "0p5q3yc8ymgzzlc600h4mb9w86ncrgjdbpqfi49b2jqvkcx5bwrr";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Thin wrapper over the C postgresql library";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12202,11 +12544,11 @@ self: {
        pname = "PrimitiveArray";
        version = "0.6.1.0";
        sha256 = "1annz4pkz66jxcwzgq3b897vigf8b23aprv0vx1xyly9bbccdpcn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bits cereal deepseq OrderedBits primitive
          QuickCheck vector vector-binary-instances vector-th-unbox
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -12221,7 +12563,7 @@ self: {
        pname = "Printf-TH";
        version = "0.1.1";
        sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx";
-       buildDepends = [ base haskell98 pretty template-haskell ];
+       libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -12232,7 +12574,7 @@ self: {
        pname = "PriorityChansConverger";
        version = "0.1";
        sha256 = "0258ysarn6k5kxxwy4lz9ww2rdhg5mg7h6idfbfrszcgwkcp22a1";
-       buildDepends = [ base containers stm ];
+       libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12244,7 +12586,7 @@ self: {
        pname = "ProbabilityMonads";
        version = "0.1.0";
        sha256 = "0vmjg91yq4p0121ypjx4l1hh77j8xj6ha7awdvrjk5fjmz9xryh3";
-       buildDepends = [ base MaybeT MonadRandom mtl ];
+       libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12258,7 +12600,8 @@ self: {
        sha256 = "1gr3xiwj5ggqlrvi2xi612sba0v7lwc3bz0w18knhh0gz60vslqy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base old-time random ];
+       libraryHaskellDepends = [ base old-time random ];
+       executableHaskellDepends = [ base old-time random ];
        homepage = "http://www.bucephalus.org/PropLogic";
        description = "Propositional Logic";
        license = stdenv.lib.licenses.bsd3;
@@ -12272,7 +12615,8 @@ self: {
        sha256 = "0y8jrvhnvb3nr8zi4hw8cm90nnz4lmcp3npvzsbz2wlkif5qf7k6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers HUnit parsec syb ];
+       libraryHaskellDepends = [ base containers syb ];
+       executableHaskellDepends = [ base containers HUnit parsec syb ];
        homepage = "https://github.com/dillonhuff/Proper";
        description = "An implementation of propositional logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -12285,7 +12629,7 @@ self: {
        pname = "ProxN";
        version = "0.0.1";
        sha256 = "0mx3kgkcbhppz2p6g8vb9yx27219ca2w7k36j60vfhszni1c4gid";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/exFalso/ProxN";
        description = "Proximity sets in N dimensions";
        license = stdenv.lib.licenses.bsd3;
@@ -12304,7 +12648,7 @@ self: {
        sha256 = "13advi8qykjslpg6kqilzdabz5076z6d69b66sf1ikyhjpc1j55i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers control-timeout directory
          filepath FindBin haskeline HsParrot HsSyck MetaObject mtl network
          parsec pretty process pugs-compat pugs-DrIFT random stm
@@ -12326,9 +12670,10 @@ self: {
        sha256 = "13zjhxq8q1qd7sbc17d73g6mfsfls6rl3ndawbcfjgj73b7xajyj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Pup-Events-Client Pup-Events-PQueue Pup-Events-Server
        ];
+       executableHaskellDepends = [ base ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12342,7 +12687,7 @@ self: {
        pname = "Pup-Events-Client";
        version = "1.1.4";
        sha256 = "1b6vkjnk1yk7ra221njh1mm92jgzqh2hjbh67p2h4fz2jf202xvm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base network parsec Pup-Events-PQueue stm transformers
        ];
        description = "A networked event handling framework for hooking into other programs";
@@ -12359,7 +12704,7 @@ self: {
        sha256 = "06cf18ccamaknkm2fcmj17ymdb2i3130q5bakbji4m8349bzhxxb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base GLUT OpenGL parsec Pup-Events-Client Pup-Events-PQueue
          Pup-Events-Server stm
        ];
@@ -12374,7 +12719,7 @@ self: {
        pname = "Pup-Events-PQueue";
        version = "1.0";
        sha256 = "0sngiqxzj5kif452s2hn3x1kv257815c5v19dp4wqazbyc373iwx";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -12387,7 +12732,7 @@ self: {
        pname = "Pup-Events-Server";
        version = "1.2";
        sha256 = "18n4bzhwvx336dv4yb5pbicaxbzzhhd36951diwhgw4gf5ji80dn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base network parsec Pup-Events-PQueue stm transformers
        ];
        description = "A networked event handling framework for hooking into other programs";
@@ -12400,7 +12745,7 @@ self: {
        pname = "QIO";
        version = "1.2";
        sha256 = "1wm0n5r5nfgbd35ry4fn25bzfj83gn3xbrd14clpw4wqqq45rhx6";
-       buildDepends = [ base containers mtl old-time random ];
+       libraryHaskellDepends = [ base containers mtl old-time random ];
        homepage = "http://www.cs.nott.ac.uk/~asg/QIO/";
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -12413,7 +12758,7 @@ self: {
        pname = "QuadEdge";
        version = "0.2";
        sha256 = "1f3wxc8ipb8ka02xq2snjs5wgl10mk528zjkpwdw5wf3fldhz037";
-       buildDepends = [ base random vector ];
+       libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12424,7 +12769,7 @@ self: {
        pname = "QuadTree";
        version = "0.10.1";
        sha256 = "0r4qv6xw03g79sn1889vv1rzpkcpjm9lmipvxdl0l1d8r8kvxdxw";
-       buildDepends = [ base composition lens ];
+       libraryHaskellDepends = [ base composition lens ];
        jailbreak = true;
        description = "QuadTree library for Haskell, with lens support";
        license = stdenv.lib.licenses.gpl3;
@@ -12438,7 +12783,7 @@ self: {
        pname = "QuasiText";
        version = "0.1.2.5";
        sha256 = "10y2lirprxyh9m47qxq0plihc22xvmkhq6lfbx3i19vfvkbhnbwx";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base haskell-src-meta template-haskell text
        ];
        homepage = "https://github.com/mikeplus64/QuasiText";
@@ -12454,7 +12799,8 @@ self: {
        sha256 = "0xphlira6gxfs7md1b55vf9biqzw9v1kzmcs17x07xnzcy1y3dvb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base haskell-src-exts ];
        jailbreak = true;
        homepage = "http://code.haskell.org/QuickAnnotate/";
        description = "Annotation Framework";
@@ -12467,10 +12813,10 @@ self: {
      mkDerivation {
        pname = "QuickCheck";
        version = "1.2.0.1";
-       revision = "2";
        sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
+       revision = "2";
        editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        jailbreak = true;
        homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
        description = "Automatic testing of Haskell programs";
@@ -12485,10 +12831,12 @@ self: {
        pname = "QuickCheck";
        version = "2.8.1";
        sha256 = "0fvnfl30fxmj5q920l13641ar896d53z0z6z66m7c1366lvalwvh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers random template-haskell tf-random transformers
        ];
-       testDepends = [ base containers template-haskell test-framework ];
+       testHaskellDepends = [
+         base containers template-haskell test-framework
+       ];
        homepage = "https://github.com/nick8325/quickcheck";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -12500,7 +12848,7 @@ self: {
        pname = "QuickCheck-GenT";
        version = "0.1.4";
        sha256 = "07zsp1praq0g6mcpfli9r1dwhfgj2cl5a2dljm6cdc8nsjl6dz7x";
-       buildDepends = [ base mtl QuickCheck random ];
+       libraryHaskellDepends = [ base mtl QuickCheck random ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/QuickCheck-GenT";
        description = "A GenT monad transformer for QuickCheck library";
@@ -12513,10 +12861,10 @@ self: {
      mkDerivation {
        pname = "QuickCheck-safe";
        version = "0.1.0.1";
-       revision = "3";
        sha256 = "0rxqd1n814b9mf6zg1i0g9d96ym9xqdgky7w7qf5bnnnpkk1ckc7";
+       revision = "3";
        editedCabalFile = "4e791ac9fa2f2e73029ab92d17e3ab93571ec5b1d5acda0ea1f340c5ee1346f6";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -12528,7 +12876,9 @@ self: {
        pname = "Quickson";
        version = "0.2";
        sha256 = "1mr8ilcjlwxcpbblk6l6w022qbf4ngzd0q62fc9k1kjb0w1palbg";
-       buildDepends = [ aeson attoparsec base bytestring either text ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring either text
+       ];
        homepage = "https://github.com/ssadler/quickson";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -12543,8 +12893,8 @@ self: {
        pname = "RANSAC";
        version = "0.1.0.1";
        sha256 = "1frn3y0j4w337mfaakqw58d7p9pqhbi2fzk8blv6zilzvqmhbqqv";
-       buildDepends = [ base random vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base random vector ];
+       testHaskellDepends = [
          base HUnit lens linear test-framework test-framework-hunit vector
        ];
        description = "The RANSAC algorithm for parameter estimation";
@@ -12557,7 +12907,7 @@ self: {
        pname = "RBTree";
        version = "0.0.5";
        sha256 = "0p46b105lixbxqjz8pwxf4asl4s7zdh2ss3nvgmp1rclqfg6cwrq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "git://github.com/wuxb45/Haskell-RBTree.git";
        description = "Pure haskell Red-Black-Tree implemetation";
        license = stdenv.lib.licenses.bsd3;
@@ -12571,7 +12921,7 @@ self: {
        pname = "RESTng";
        version = "0.1";
        sha256 = "1fans0znb3i33n9cxd8w140n1sl8bdyl874cdrgc5wvlg6y3y4aj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HDBC HDBC-postgresql mtl old-time parsec redHandlers xhtml
          yuiGrid
        ];
@@ -12589,8 +12939,8 @@ self: {
        pname = "RFC1751";
        version = "0.3.0.1";
        sha256 = "1347cl0z5zw7f4dn6bjyf19pnfq06dzwpcl68z14zgxw0p58crka";
-       buildDepends = [ base binary bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       testHaskellDepends = [
          base binary bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -12607,7 +12957,7 @@ self: {
        pname = "RJson";
        version = "0.3.7";
        sha256 = "04vlhcyikd4liy65xiy3xn4slkm5w4q3r8ir54s095zs9bq8jx1n";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers iconv mtl parsec syb-with-class
        ];
        description = "A reflective JSON serializer/parser";
@@ -12625,10 +12975,12 @@ self: {
        sha256 = "0bcilw8z764p6idjj19kxk9if5l4pxyn7zszxjv0q3bfky1rd8ay";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ allocated-processor base ];
+       librarySystemDepends = [ canlib ftd2xx ];
+       executableHaskellDepends = [
          allocated-processor base cv-combinators HOpenCV vector-space
        ];
-       extraLibraries = [ canlib ftd2xx ];
+       executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12645,10 +12997,13 @@ self: {
        sha256 = "0r4y4rinrdr2xwfpnys5agm1awr3qr9im4cqczz1fzjz7r425m96";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ADPfusion base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs
          containers deepseq lens primitive PrimitiveArray repa strict vector
        ];
+       executableHaskellDepends = [
+         base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs
+       ];
        homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion";
        description = "RNA secondary structure prediction";
        license = stdenv.lib.licenses.gpl3;
@@ -12666,7 +13021,7 @@ self: {
        sha256 = "1bmybm80fhw7xqjzny2iricicbzqsl33snpsjamfcr16a939wlwp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Biobase BiobaseTurner BiobaseTypes BiobaseVienna cmdargs
          containers HsTools primitive PrimitiveArray RNAFold split vector
        ];
@@ -12690,13 +13045,13 @@ self: {
        sha256 = "1qdfbwiydkh0974m7r4ashxhsbkss8k9d6kpc07vj4hspjf5v5ag";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base BiobaseTurner BiobaseVienna BiobaseXNA bytestring
-         cmdargs containers fgl fgl-extras-decompositions file-embed lens
-         monad-primitive mwc-random-monad parallel parsec ParsecTools
-         primitive PrimitiveArray random RNAFold transformers tuple vector
-         ViennaRNA-bindings
+       libraryHaskellDepends = [
+         array base BiobaseTurner BiobaseVienna BiobaseXNA containers fgl
+         fgl-extras-decompositions lens monad-primitive mwc-random-monad
+         parallel parsec ParsecTools primitive PrimitiveArray random RNAFold
+         transformers tuple vector ViennaRNA-bindings
        ];
+       executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12712,10 +13067,11 @@ self: {
        sha256 = "1d85lps04b2sn23fzyn5hd8lj2lf7byqk7flj8p2b905hl3062dx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base BiobaseXNA bytestring cmdargs containers PrimitiveArray
+       libraryHaskellDepends = [
+         array base BiobaseXNA bytestring containers PrimitiveArray
          QuasiText repa split text vector
        ];
+       executableHaskellDepends = [ cmdargs ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
@@ -12733,11 +13089,11 @@ self: {
        sha256 = "1s7ilg8814gglg4n64nk94b51fdzh2fm1y4k1mw8d81qd66y60vn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base BiobaseTrainingData BiobaseXNA bytestring cmdargs containers
-         deepseq directory parallel PrimitiveArray random split
-         StatisticalMethods vector
+       libraryHaskellDepends = [
+         base BiobaseTrainingData BiobaseXNA bytestring containers deepseq
+         directory parallel PrimitiveArray random StatisticalMethods vector
        ];
+       executableHaskellDepends = [ cmdargs split ];
        jailbreak = true;
        homepage = "http://www.tbi.univie.ac.at/software/rnawolf/";
        description = "RNA folding with non-canonical basepairs and base-triplets";
@@ -12754,10 +13110,10 @@ self: {
        pname = "RSA";
        version = "2.1.0.1";
        sha256 = "0m74683bm34zd5r46ndb1h8jx1xp8wypfqm0gi3zmrv1rmm0j0hv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
@@ -12775,7 +13131,7 @@ self: {
        sha256 = "1aalh68h6799mv4vyg30zpskl5jkn6x2j1jza7p4lrflyifxzar8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers extensible-exceptions GLUT mtl OpenGL random SDL
          SDL-image SDL-mixer time
        ];
@@ -12793,8 +13149,8 @@ self: {
        pname = "Random123";
        version = "0.2.0";
        sha256 = "18q6nf63qapypj10iifpc1qdaq7pndmv2p7jz0f96y113z33nqy4";
-       buildDepends = [ array base data-dword random ];
-       testDepends = [
+       libraryHaskellDepends = [ array base data-dword random ];
+       testHaskellDepends = [
          base HUnit QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -12809,7 +13165,7 @@ self: {
        pname = "RandomDotOrg";
        version = "0.2.1";
        sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c";
-       buildDepends = [ base HTTP-Simple network ];
+       libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12823,7 +13179,7 @@ self: {
        sha256 = "1anj962cpgl06hipjfdygxlvq6adkdg3r0ghkwkzzf3dklmwzng6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base random-fu ];
+       executableHaskellDepends = [ base random-fu ];
        homepage = "http://github.com/Soares/Randometer.hs";
        description = "Randomness intuition trainer";
        license = stdenv.lib.licenses.mit;
@@ -12835,7 +13191,7 @@ self: {
        pname = "Range";
        version = "0.1.0.0";
        sha256 = "0759508s75zba89jjr56sqpm7idgwsxynmf9zl9hwrz9q11fxrqh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Data structure for managing ranges";
        license = stdenv.lib.licenses.bsd3;
@@ -12847,7 +13203,7 @@ self: {
        pname = "Ranged-sets";
        version = "0.3.0";
        sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l";
-       buildDepends = [ base HUnit QuickCheck ];
+       libraryHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "http://code.haskell.org/ranged-sets";
        description = "Ranged sets for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -12861,7 +13217,9 @@ self: {
        sha256 = "1df010121jdjbagc3gg906kydmwwpa7np1c0mx7w2v64mr7i2q1r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HTTP json network utf8-string XMPP ];
+       executableHaskellDepends = [
+         base HTTP json network utf8-string XMPP
+       ];
        homepage = "http://kagami.touhou.ru/projects/show/ranka";
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
@@ -12879,7 +13237,7 @@ self: {
        sha256 = "0y90clz236lqhacv6ba4w3qx4fyd5yls9nh4chk8s945hr92jg57";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring cereal containers convertible directory
          filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa
        ];
@@ -12896,7 +13254,7 @@ self: {
        pname = "Rasterific";
        version = "0.6.1";
        sha256 = "1y9jciiaam0dn2falhxc0nb97vy35dfvv71xzc1bhiw4gn66n4rm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers dlist FontyFruity free JuicyPixels mtl
          primitive vector vector-algorithms
        ];
@@ -12912,8 +13270,9 @@ self: {
        sha256 = "1v6yr5zzrrj31prfzxxh1n27sfnkqpkw34v3a47rcnm444ba58a7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base system-filepath text ];
-       testDepends = [ base hspec system-filepath text ];
+       libraryHaskellDepends = [ base system-filepath text ];
+       executableHaskellDepends = [ base system-filepath text ];
+       testHaskellDepends = [ base hspec system-filepath text ];
        jailbreak = true;
        homepage = "http://github.com/rampion/ReadArgs";
        description = "Simple command line argument parsing";
@@ -12930,12 +13289,12 @@ self: {
        pname = "Redmine";
        version = "0.0.6";
        sha256 = "10lq9lhz3yyzkzwbi8rx060hmwh0c8cplydrfzdmd1653x8267z8";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring connection containers HTTP http-client-tls
          http-conduit http-types MissingH network old-locale old-time
          resourcet text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring connection containers http-client-tls
          http-conduit HUnit MissingH network old-locale resourcet text time
          transformers
@@ -12951,7 +13310,7 @@ self: {
        pname = "Ref";
        version = "0.1.1.0";
        sha256 = "15qikbjbydbabc26skhavshzrsaz17a71q8hfxqvi5ix2bhhz4hm";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
@@ -12967,7 +13326,7 @@ self: {
        pname = "RefSerialize";
        version = "0.3.1.4";
        sha256 = "1hl1jxdarqp59fs1sjvxpyhcazrnlm4iywysgkf3iqm56jfp2f6w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers hashtables stringsearch
        ];
        description = "Write to and read from ByteStrings maintaining internal memory references";
@@ -12984,9 +13343,11 @@ self: {
        sha256 = "076pa25455jd4b0dbs9gfksaa1ww66yvnknki4yivc0pm60pnh7r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cassava cmdargs cond containers directory glpk-hs
-         matrix MissingH vector
+       libraryHaskellDepends = [
+         base bytestring cassava containers glpk-hs matrix MissingH vector
+       ];
+       executableHaskellDepends = [
+         base cmdargs cond containers directory
        ];
        jailbreak = true;
        homepage = "https://github.com/pablocouto/Referees";
@@ -13001,7 +13362,7 @@ self: {
        pname = "RepLib";
        version = "0.5.3.3";
        sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr";
-       buildDepends = [ base containers mtl template-haskell ];
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
        jailbreak = true;
        homepage = "http://code.google.com/p/replib/";
        description = "Generic programming library with representation types";
@@ -13015,7 +13376,7 @@ self: {
        pname = "ReplicateEffects";
        version = "0.3";
        sha256 = "194nbnbrf5g3d2pch6z9zapzhi0i2z30vpgjj0h5x8bfwzpf1527";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/ReplicateEffects";
        description = "Composable replication schemes of applicative functors";
        license = stdenv.lib.licenses.bsd3;
@@ -13031,7 +13392,8 @@ self: {
        sha256 = "1grcs7mily2gpxdzq1pcz1f71z2d8pz6paqrb8yv38nkckvm4j75";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base HTTP json mtl network random ];
+       executableHaskellDepends = [
          base directory HTTP json mtl network process random
        ];
        description = "Haskell bindings to ReviewBoard";
@@ -13045,7 +13407,7 @@ self: {
        pname = "RichConditional";
        version = "0.1.0.0";
        sha256 = "065plckw5r16aalkf51y7hs2xjandad3hgfly795wakqfhdnrajw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/avieth/RichConditional";
        description = "Tiny library to replace classic if/else";
@@ -13063,13 +13425,13 @@ self: {
        pname = "Rlang-QQ";
        version = "0.3.1.0";
        sha256 = "0rl3cmr7vfc8vk7132y40ib0l53v9yndw71bmp25zj24nkmha7hj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Cabal containers data-binary-ieee754
          directory filepath haskell-src-meta HList lens mtl process repa SHA
          split syb template-haskell temporary text transformers trifecta
          utf8-string vector zlib
        ];
-       testDepends = [ base directory doctest hspec lens vector ];
+       testHaskellDepends = [ base directory doctest hspec lens vector ];
        homepage = "http://code.haskell.org/~aavogt/Rlang-QQ";
        description = "quasiquoter for inline-R code";
        license = stdenv.lib.licenses.bsd3;
@@ -13087,11 +13449,11 @@ self: {
        sha256 = "0mw4hd99v8pp75ng75cv3vym5ld93f07mpkcbi2b6v12k68bxx4v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath hdaemonize-buildfix hinotify hsyslog
          monad-parallel unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -13106,7 +13468,7 @@ self: {
        pname = "RxHaskell";
        version = "0.2";
        sha256 = "0pwxsvkpdr4vzr6cpgjmkr55ip6ns3gcv8pma7dwzg21myx9c3vl";
-       buildDepends = [ base containers stm transformers ];
+       libraryHaskellDepends = [ base containers stm transformers ];
        homepage = "https://github.com/jspahrsummers/RxHaskell";
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -13122,7 +13484,7 @@ self: {
        pname = "SBench";
        version = "0.2.0";
        sha256 = "0ym9qdwwn180365hgvwi6djzbqvfiyqrd2fhywpvxihwxnlnhiam";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cassava criterion deepseq directory filepath
          gnuplot hp2any-core parsec process utf8-string vector
        ];
@@ -13137,7 +13499,7 @@ self: {
        pname = "SConfig";
        version = "0.2.0.0";
        sha256 = "032s6szll58zavdnf6fsj2rhpdlizv3l46lh819bqjy1kbffv0yz";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/fgaz/SConfig";
        description = "A simple config library";
        license = stdenv.lib.licenses.mit;
@@ -13148,14 +13510,13 @@ self: {
      mkDerivation {
        pname = "SDL";
        version = "0.6.5.1";
-       revision = "1";
        sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46";
+       revision = "1";
        editedCabalFile = "233e3fde4727ca7b597e0bf86619c6b862c32445191a37b7a536a3188634473e";
-       buildDepends = [ base ];
-       extraLibraries = [ SDL ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
@@ -13164,37 +13525,35 @@ self: {
        pname = "SDL-gfx";
        version = "0.6.0.1";
        sha256 = "1ay72r29ybxf4icaqadly02xi03ifz82a8jz3xkvlk26c9bxl4c3";
-       buildDepends = [ base SDL ];
+       libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_gfx";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL-image" = callPackage
-    ({ mkDerivation, base, SDL, SDL_image }:
+    ({ mkDerivation, base, SDL }:
      mkDerivation {
        pname = "SDL-image";
        version = "0.6.1.1";
        sha256 = "1m02q2426qp8m8pzz2jkk4srk2vb3j3ickiaga5jx9rkkhz732zq";
-       buildDepends = [ base SDL ];
-       extraLibraries = [ SDL_image ];
+       libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_image";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL_image;};
+     }) {};
 
   "SDL-mixer" = callPackage
-    ({ mkDerivation, base, SDL, SDL_mixer }:
+    ({ mkDerivation, base, SDL }:
      mkDerivation {
        pname = "SDL-mixer";
        version = "0.6.1.1";
        sha256 = "0md3238hx79mxb9a7l43kg3b3d28x4mqvj0hjsbsh15ajnvy9x2z";
-       buildDepends = [ base SDL ];
-       extraLibraries = [ SDL_mixer ];
+       libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL_mixer;};
+     }) {};
 
   "SDL-mpeg" = callPackage
     ({ mkDerivation, base, SDL, smpeg }:
@@ -13202,25 +13561,24 @@ self: {
        pname = "SDL-mpeg";
        version = "0.0.1";
        sha256 = "0hx4977iynchnyd4b9ycbiw5qq07wk1a7dkisqx0a3x0ca4qirwj";
-       buildDepends = [ base SDL ];
-       extraLibraries = [ smpeg ];
+       libraryHaskellDepends = [ base SDL ];
+       librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
-    ({ mkDerivation, base, SDL, SDL_ttf }:
+    ({ mkDerivation, base, SDL }:
      mkDerivation {
        pname = "SDL-ttf";
        version = "0.6.2.1";
        sha256 = "1ld551jgrcs3c7n53zyzlkrxkf01rp81wwvf9ynkm0c5kgll779s";
-       buildDepends = [ base SDL ];
-       extraLibraries = [ SDL_ttf ];
+       libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_ttf";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL_ttf;};
+     }) {};
 
   "SDL2-ttf" = callPackage
     ({ mkDerivation, base, SDL2, SDL2_ttf }:
@@ -13228,13 +13586,13 @@ self: {
        pname = "SDL2-ttf";
        version = "0.1.0";
        sha256 = "03ng8kih285pvwj06jdwk4hkyyyb8j666pnvagnw5hsjhq60r8h6";
-       buildDepends = [ base ];
-       extraLibraries = [ SDL2 SDL2_ttf ];
+       libraryHaskellDepends = [ base SDL2 ];
+       librarySystemDepends = [ SDL2 SDL2_ttf ];
        jailbreak = true;
        description = "Binding to libSDL-ttf";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_ttf;};
+       broken = true;
+     }) { SDL2 = null;  inherit (pkgs) SDL2_ttf;};
 
   "SFML" = callPackage
     ({ mkDerivation, base, csfml-audio, csfml-graphics, csfml-network
@@ -13244,8 +13602,8 @@ self: {
        pname = "SFML";
        version = "0.2.0.0";
        sha256 = "1jz7wgrjc169slq7akf9sdgpfnl1cbiahig8hqck9p40ixn456k6";
-       buildDepends = [ base ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [
          csfml-audio csfml-graphics csfml-network csfml-system csfml-window
        ];
        homepage = "https://github.com/jeannekamikaze/SFML";
@@ -13262,7 +13620,7 @@ self: {
        pname = "SFML-control";
        version = "0.2.0.2";
        sha256 = "001h9y9395mz6fr58s1i8svn4pyy5iqbkzzsp19xdphh4w69za9g";
-       buildDepends = [ base mtl SFML template-haskell ];
+       libraryHaskellDepends = [ base mtl SFML template-haskell ];
        homepage = "https://github.com/SFML-haskell/SFML-control";
        description = "Higher level library on top of SFML";
        license = stdenv.lib.licenses.mit;
@@ -13275,7 +13633,7 @@ self: {
        pname = "SFont";
        version = "0.1.1";
        sha256 = "077yvys00kp8lmkvc4mbynmkk9nn2ib5rh38bqcw0wnwsvl7140i";
-       buildDepends = [ array base SDL Sprig ];
+       libraryHaskellDepends = [ array base SDL Sprig ];
        homepage = "http://liamoc.net/static/SFont";
        description = "SFont SDL Bitmap Fonts";
        license = stdenv.lib.licenses.bsd3;
@@ -13288,7 +13646,7 @@ self: {
        pname = "SG";
        version = "1.0";
        sha256 = "0aj15lp5wbldaa9ndfvni1iq7kcrjv1syln9yz77jg6p8ndk61jv";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13302,7 +13660,7 @@ self: {
        sha256 = "0f7s8y5wq479i2yix2ik5ffsqkrb65pi31n6a03453kvk5jc7wv6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT OpenGL SG ];
+       executableHaskellDepends = [ base GLUT OpenGL SG ];
        jailbreak = true;
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
@@ -13319,8 +13677,9 @@ self: {
        sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base binary bytestring directory ];
-       testDepends = [
+       libraryHaskellDepends = [ array base binary bytestring ];
+       executableHaskellDepends = [ base bytestring directory ];
+       testHaskellDepends = [
          array base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -13334,7 +13693,9 @@ self: {
        pname = "SHA2";
        version = "0.2.5";
        sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40";
-       buildDepends = [ AES base bytestring monads-tf transformers ];
+       libraryHaskellDepends = [
+         AES base bytestring monads-tf transformers
+       ];
        description = "Fast, incremental SHA hashing for bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13347,7 +13708,7 @@ self: {
        pname = "SMTPClient";
        version = "1.1.0";
        sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers extensible-exceptions hsemail network old-locale
          old-time
        ];
@@ -13363,10 +13724,10 @@ self: {
        pname = "SNet";
        version = "0.1.0";
        sha256 = "19ls2icg5vflznf9wn5b429x6blismcdxinh66vd8cr8hwgc8m99";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL containers data-default lens mtl transformers
        ];
-       buildTools = [ c2hsc ];
+       libraryToolDepends = [ c2hsc ];
        jailbreak = true;
        homepage = "http://www.snet-home.org/";
        description = "Declarative coördination language for streaming networks";
@@ -13382,7 +13743,7 @@ self: {
        pname = "SQLDeps";
        version = "0.1";
        sha256 = "1dx4vxrc7hjms3bx80bngwr5jxkb1v9hps09ayi0mqwhnfzq5vgp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable HDBC HDBC-sqlite3 mtl unordered-containers
        ];
        description = "Calculate db-data dependencies of functions";
@@ -13395,7 +13756,7 @@ self: {
        pname = "STL";
        version = "0.3.0.2";
        sha256 = "0papwfxp4y8rn1rqm0sw22lbfw6iaziziprh04z85isrwkfh8v43";
-       buildDepends = [ attoparsec base bytestring cereal text ];
+       libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        homepage = "http://github.com/bergey/STL";
        description = "STL 3D geometry format parsing and pretty-printing";
        license = stdenv.lib.licenses.bsd3;
@@ -13407,7 +13768,7 @@ self: {
        pname = "STMonadTrans";
        version = "0.3.3";
        sha256 = "05d37ax0j8dp1h1w6pxkf1415mzn4gasdhn7gbsr8ay46iv1r4fr";
-       buildDepends = [ array base mtl ];
+       libraryHaskellDepends = [ array base mtl ];
        description = "A monad transformer version of the ST monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13422,7 +13783,7 @@ self: {
        sha256 = "07cr20cdz4dk8c9j84j1wlzhg4qb4hmgyvh2nnlh4vc52bvvizmq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base haskell98 language-c pretty svgutils syb xml
        ];
        jailbreak = true;
@@ -13441,7 +13802,7 @@ self: {
        pname = "SVGFonts";
        version = "1.5.0.0";
        sha256 = "0w1675cwd8gx65vh421abnl4z6jw7jaz3a43g04x0a5kgf1sfl76";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg containers
          data-default-class diagrams-core diagrams-lib directory parsec
          split text tuple vector xml
@@ -13456,7 +13817,7 @@ self: {
        pname = "SVGPath";
        version = "1.1.2";
        sha256 = "1a4rmp1rn6jv8nkab688i146ywiv4w6fp5bpm0slwgda2x0h6lp4";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Parsing the path command of SVG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13469,7 +13830,7 @@ self: {
        pname = "SWMMoutGetMB";
        version = "0.1.0.0";
        sha256 = "069076ckklky3hw26ff82kqnambb7yfcwf76dwzp7cahp8fpvq6l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 split
        ];
        jailbreak = true;
@@ -13488,7 +13849,8 @@ self: {
        sha256 = "1sngk170p5wyi3sgjkl74fr3k570fbfabhbg0dnp8z4iw53d8jfl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ array base containers ];
+       executableHaskellDepends = [
          array base containers filepath loch-th pretty text transformers
          wl-pprint-text xml
        ];
@@ -13503,7 +13865,7 @@ self: {
        pname = "Safe";
        version = "0.1";
        sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php";
        description = "Library for safe (pattern match free) functions";
        license = stdenv.lib.licenses.bsd3;
@@ -13514,11 +13876,11 @@ self: {
      mkDerivation {
        pname = "SafeSemaphore";
        version = "0.10.1";
-       revision = "1";
        sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91";
+       revision = "1";
        editedCabalFile = "1b168ec8de4b3958df15b33ba9ab60d8a651d9dd4ea36891d4c31ae81e7ec1cc";
-       buildDepends = [ base containers stm ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base containers stm ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/ChrisKuklewicz/SafeSemaphore";
        description = "Much safer replacement for QSemN, QSem, and SampleVar";
        license = stdenv.lib.licenses.bsd3;
@@ -13530,8 +13892,8 @@ self: {
        pname = "Salsa";
        version = "0.2.0.2";
        sha256 = "0915mwi1ksa85in03vzm5hqbvk6ih7l0zslg5cmy7j9fc0jhgwgd";
-       buildDepends = [ base bytestring file-embed ];
-       extraLibraries = [ glib mono ];
+       libraryHaskellDepends = [ base bytestring file-embed ];
+       librarySystemDepends = [ glib mono ];
        homepage = "http://haskell.org/haskellwiki/Salsa";
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -13550,12 +13912,13 @@ self: {
        sha256 = "0f6z17ry2n0qkgajiwip09r7dbcn72dkz7gh4igwk3n0igxlpqsr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default directory either exceptions filepath
          formatting ini mtl network old-locale process spawn stm temporary
          text time unordered-containers yaml
        ];
-       testDepends = [ base data-default either hlint hspec mtl ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base data-default either hlint hspec mtl ];
        description = "Saturnin CI / Job System";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13568,7 +13931,7 @@ self: {
        pname = "SciFlow";
        version = "0.2.0";
        sha256 = "1cvh5c5mj5jy02ky2hjkf7bkjy9wx2187dmf9d71wby9ymklg8ng";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class mtl shelly template-haskell text
          unordered-containers yaml
        ];
@@ -13586,7 +13949,7 @@ self: {
        sha256 = "0c410hnby7g5qdx1kj3shwxl0m910vl3rj3ayx6f5qsz5by5rczh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath HFuse hsyslog process
          regex-compat sqlite-simple unix
        ];
@@ -13607,7 +13970,7 @@ self: {
        sha256 = "0iwlai8zspz08l3v7qf505mgfxn5v177kqa1x4xfssq7wzxawq8j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers network network-bytestring parsec
          random stm time unix
        ];
@@ -13625,7 +13988,7 @@ self: {
        sha256 = "1hagm0y9x2j1wcgk5ibxnlh2slnxfggn79cq20ws0zvd4yqw3231";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Data structure for querying the set (or count) of intervals covering given point";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13640,7 +14003,7 @@ self: {
        sha256 = "1l334lvm56xr7rw135l6nj7iz4h1yskl1fcrr5rdimlw7dyw2cr8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring classify containers mongoDB mtl network process
          split tagsoup text
        ];
@@ -13656,7 +14019,7 @@ self: {
        pname = "Semigroup";
        version = "0.0.7";
        sha256 = "1mdw1z50gr02j5hycki5rl95b1yk7xfrdk056ajw9ghw48s0jpx6";
-       buildDepends = [ base bytestring containers mtl ];
+       libraryHaskellDepends = [ base bytestring containers mtl ];
        homepage = "https://bitbucket.org/dibblego/semigroup/";
        description = "A semigroup";
        license = stdenv.lib.licenses.bsd3;
@@ -13668,7 +14031,7 @@ self: {
        pname = "SeqAlign";
        version = "0.1.0.0";
        sha256 = "0vk63ni1a93win8if032nps5y0xi245cmjqq2j4xfsdddg5bdln5";
-       buildDepends = [ base bytestring vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13682,7 +14045,7 @@ self: {
        pname = "SessionLogger";
        version = "0.3.0.0";
        sha256 = "1zgjslf9p64aa7dwww44jq2f6iic1192ic98gmjsjj5ww8anl8c3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath hslogger mtl old-locale random time
        ];
        jailbreak = true;
@@ -13701,11 +14064,14 @@ self: {
        sha256 = "06k5adw28abdfpvfjq0zka05211w6nlbf1ry3d9hck3jcrqvg1f1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory json mtl parsec QuickCheck regex-tdfa
+       ];
+       executableHaskellDepends = [
          base containers directory json mtl parsec QuickCheck regex-tdfa
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory json mtl parsec QuickCheck regex-tdfa
          transformers
        ];
@@ -13720,7 +14086,7 @@ self: {
        pname = "Shellac";
        version = "0.9.5.2";
        sha256 = "1js9la0hziqsmb56q9kzfycda2sw3xm4kv2y5q2h3zlw5gzc5xli";
-       buildDepends = [ base directory mtl unix ];
+       libraryHaskellDepends = [ base directory mtl unix ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
@@ -13733,7 +14099,7 @@ self: {
        pname = "Shellac-compatline";
        version = "0.9.5.2";
        sha256 = "134m0krbd3vlswjxdfvv9xy9x962g7ksg1mqmmgczss9ph2dx08i";
-       buildDepends = [ base Shellac Shellac-editline ];
+       libraryHaskellDepends = [ base Shellac Shellac-editline ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
@@ -13746,7 +14112,7 @@ self: {
        pname = "Shellac-editline";
        version = "0.9.5.2";
        sha256 = "14x4w4msh99c8vzhlv88ixb8yx43k178qz7504na68820389l9ah";
-       buildDepends = [ base editline Shellac ];
+       libraryHaskellDepends = [ base editline Shellac ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Editline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
@@ -13759,7 +14125,7 @@ self: {
        pname = "Shellac-haskeline";
        version = "0.2.0.2";
        sha256 = "0q70d5arw1yg0f8b6p3k0g3i4jbh2d8rp1cchswd3ynhinzhrnqg";
-       buildDepends = [ base haskeline mtl Shellac ];
+       libraryHaskellDepends = [ base haskeline mtl Shellac ];
        jailbreak = true;
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
@@ -13772,7 +14138,7 @@ self: {
        pname = "Shellac-readline";
        version = "0.9.5.2";
        sha256 = "0248zzp40gadcc4xkr5dmjc4phq0xz9j4sirdncnr62y3pi4zi0n";
-       buildDepends = [ base readline Shellac ];
+       libraryHaskellDepends = [ base readline Shellac ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
@@ -13785,7 +14151,7 @@ self: {
        pname = "ShowF";
        version = "0.1.1";
        sha256 = "1nq4i4h43nfh86f6wgwng1ps6mcdl1ba96x9wsjl3qzn3blavyfh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/conal/ShowF/";
        description = "Show for * -> *";
        license = stdenv.lib.licenses.bsd3;
@@ -13797,7 +14163,7 @@ self: {
        pname = "Shrub";
        version = "0.1.0.0";
        sha256 = "105rnyrqzagfgbfdxbdx4wqhvdfxkd8d5jaxkyqd1zyvf0chi858";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "4-way trie fuzzy search";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13810,7 +14176,7 @@ self: {
        sha256 = "185vcxd3qvii9k0134j634x6znvk7v83sj24a4dnw7jjsax0kqiv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT ];
+       executableHaskellDepends = [ base GLUT ];
        homepage = "http://www.geocities.jp/takascience/index_en.html";
        description = "A vector shooter game";
        license = stdenv.lib.licenses.bsd3;
@@ -13822,7 +14188,7 @@ self: {
        pname = "SimpleAES";
        version = "0.4.2";
        sha256 = "0s85xgwrhldyr2w3kcn9f72yjajmpz3d4dizq9p9z97rx4qva4vj";
-       buildDepends = [ base binary bytestring mwc-random ];
+       libraryHaskellDepends = [ base binary bytestring mwc-random ];
        description = "Fast AES encryption/decryption for bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13833,7 +14199,9 @@ self: {
        pname = "SimpleEA";
        version = "0.2.1";
        sha256 = "0qimm9y138jjnzy5i6s5b7899rkxahk7p2kcwfry0gdq2pcb68vr";
-       buildDepends = [ base mersenne-random-pure64 MonadRandom ];
+       libraryHaskellDepends = [
+         base mersenne-random-pure64 MonadRandom
+       ];
        homepage = "http://www.github.com/ehamberg/simpleea/";
        description = "Simple evolutionary algorithm framework";
        license = stdenv.lib.licenses.bsd3;
@@ -13846,7 +14214,9 @@ self: {
        pname = "SimpleGL";
        version = "0.9.3";
        sha256 = "0c674q5jiqvscc53m0z5vkmljla29pcll15gbvxr86pqxwmqm5hr";
-       buildDepends = [ base GLFW JuicyPixels OpenGL SimpleH vector ];
+       libraryHaskellDepends = [
+         base GLFW JuicyPixels OpenGL SimpleH vector
+       ];
        jailbreak = true;
        description = "A Simple Graphics Library from the SimpleH framework";
        license = stdenv.lib.licenses.bsd3;
@@ -13861,7 +14231,7 @@ self: {
        pname = "SimpleH";
        version = "1.2";
        sha256 = "0g05yplsm65xmx7brdcqy5kc8qcmzj96vywicwqpmigcv8pi9zmc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clock containers cpu directory filepath network
          time unix
        ];
@@ -13881,7 +14251,7 @@ self: {
        pname = "SimpleLog";
        version = "0.1.0.3";
        sha256 = "12fjdmaxcpgp13gr1s25ybb5fysvbcg40j9yb29wvpbmf67xrsbw";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal attoparsec base bytestring containers directory
          ForkableT monad-control mtl old-locale resourcet semigroups stm
          template-haskell text th-lift time transformers transformers-base
@@ -13898,7 +14268,7 @@ self: {
        pname = "SizeCompare";
        version = "0.1";
        sha256 = "0f53vggmc1ysi1rn8zd2kafi45w20d6j7iv1jgnrqy7izpah91a7";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Fast size comparison for standard containers";
        license = "GPL";
      }) {};
@@ -13911,7 +14281,7 @@ self: {
        pname = "Smooth";
        version = "0.1.0.1";
        sha256 = "0rwl5dw1vpgszhs7pjk146kp8h8n3ggvpby9y18fr7zsqgsckzcd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers DifferenceLogic FirstOrderTheory HUnit Proper
        ];
        jailbreak = true;
@@ -13926,7 +14296,7 @@ self: {
        pname = "SmtLib";
        version = "0.1.0.0";
        sha256 = "0wmdzl3anbbfqik2kl2wjy57cd9r3ix8h8g28rmzqbvlajrvqcv1";
-       buildDepends = [ base parsec transformers ];
+       libraryHaskellDepends = [ base parsec transformers ];
        jailbreak = true;
        homepage = "https://github.com/MfesGA/HsmtlibParser";
        description = "Library for parsing SMTLIB2";
@@ -13944,13 +14314,13 @@ self: {
        sha256 = "1f4d493hnv7fag9c2p2hnm0kc6b705z7mgdk4z6s4g24536j4ksk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring convertible directory filepath haskell98 HDBC
          HDBC-sqlite3 HFuse hslogger iconv LibZip regex-tdfa stm unix
          utf8-string xml
        ];
-       buildTools = [ cpphs ];
-       extraLibraries = [ zip ];
+       executableSystemDepends = [ zip ];
+       executableToolDepends = [ cpphs ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jetxee/snusmumrik/";
        description = "E-library directory based on FUSE virtual file system";
@@ -13966,7 +14336,7 @@ self: {
        pname = "SoOSiM";
        version = "0.2.1.0";
        sha256 = "0ghblkhf942gcidsvah8z6wigymzfng1010mp17pvacizamakcmp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base concurrent-supply containers monad-coroutine mtl stm
          transformers
        ];
@@ -13987,7 +14357,7 @@ self: {
        sha256 = "0xwgj4k1gn84sb8jc2nyxnvfp8sdmy4x5428fpvmn6n6ca8h6f17";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols binary derive directory mtl process
          random zlib
        ];
@@ -14008,7 +14378,7 @@ self: {
        sha256 = "1rzqibia10pl4yy64g5pqiqidhn109z0hlf38z3s57hx2zqqi9if";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols binary GLUT OpenGL process random
          SoccerFun
        ];
@@ -14025,8 +14395,8 @@ self: {
        pname = "Sonnex";
        version = "0.1.0.3";
        sha256 = "0fqaw4wh7ml35kl75qsvqsq17g5pndf7x6clcmqxpwayjn2syzda";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/Zigazou/Sonnex";
        description = "Sonnex is an alternative to Soundex for french language";
@@ -14043,7 +14413,7 @@ self: {
        sha256 = "03psglm6xyqvcgnbimidafy51kwpipk5q6s8ip5vhjm2d5makkhm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory fgl filepath Graphalyze graphviz
          haskell-src-exts mtl multiset random
        ];
@@ -14061,7 +14431,7 @@ self: {
        pname = "Southpaw";
        version = "0.1.0.2";
        sha256 = "1zijb1b6ryrmq2230i1fr7iqz8iax9f2rwpy75fkggiknrd4xnpq";
-       buildDepends = [
+       libraryHaskellDepends = [
          ALUT base bytestring cairo containers filepath GLFW-b gtk3
          JuicyPixels OpenAL OpenGL vector Win32
        ];
@@ -14078,7 +14448,7 @@ self: {
        sha256 = "1idy95ym336c19rcvvrm8j9lgf77bs10hhmrnw2jc55m1z93m683";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base HGL random Yampa ];
+       executableHaskellDepends = [ array base HGL random Yampa ];
        homepage = "http://www.haskell.org/yampa/";
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
@@ -14092,12 +14462,12 @@ self: {
      mkDerivation {
        pname = "SpacePrivateers";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0gj709knv4lvz34900jigb1hiq35acbbl86iwa5yszibm8f0drkh";
+       revision = "1";
        editedCabalFile = "b59d607892ad860616cef196c83ff54388204102eae597acf88467a2f54764bf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers enummapset-th filepath LambdaHack template-haskell
          text
        ];
@@ -14114,7 +14484,7 @@ self: {
        pname = "SpinCounter";
        version = "0.0.1";
        sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2";
-       buildDepends = [ base monad-loops ref-mtl stm ];
+       libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Lock free Spin Counter";
@@ -14134,14 +14504,14 @@ self: {
        pname = "Spock";
        version = "0.7.12.0";
        sha256 = "05vglqzf75dphxx2wnkxqn7aqcb19nh8g560zfpw56jrfbbmygwg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          directory 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
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hspec-wai http-types reroute stm text wai
        ];
        homepage = "http://www.spock.li";
@@ -14155,7 +14525,7 @@ self: {
        pname = "Spock-auth";
        version = "0.2.0.1";
        sha256 = "1vcrl5dqjn0ri9ybza2yv80xvbv2iwrz5hj5rbhgy6i803ixlpx0";
-       buildDepends = [ base http-types Spock text time ];
+       libraryHaskellDepends = [ base http-types Spock text time ];
        jailbreak = true;
        homepage = "https://github.com/agrafix/Spock-auth";
        description = "Provides authentification helpers for Spock";
@@ -14171,7 +14541,7 @@ self: {
        pname = "Spock-digestive";
        version = "0.1.0.1";
        sha256 = "13766v5y43jmdh7m3q1790ppw2chwg3g29dfh1zacxw7n1gmhlyl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base digestive-functors http-types mtl Spock text
          unordered-containers wai
        ];
@@ -14188,11 +14558,11 @@ self: {
        pname = "Spock-worker";
        version = "0.2.1.3";
        sha256 = "0pxh7ccqb6xpab0807vsfb65lk4bafa44fram1f4d84slggyn1a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers lifted-base mtl Spock stm text time transformers
          vector
        ];
-       testDepends = [ base containers HTF stm vector ];
+       testHaskellDepends = [ base containers HTF stm vector ];
        homepage = "http://github.com/agrafix/Spock-worker";
        description = "Background workers for Spock";
        license = stdenv.lib.licenses.mit;
@@ -14204,7 +14574,7 @@ self: {
        pname = "SpreadsheetML";
        version = "0.1";
        sha256 = "14d3fk0cal0svb2clbhbbk48fygwvb0k01aawfm72576mrz9mb18";
-       buildDepends = [ base xml ];
+       libraryHaskellDepends = [ base xml ];
        description = "Write support for Excel's SpreadsheetML format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14215,7 +14585,7 @@ self: {
        pname = "Sprig";
        version = "0.1.1";
        sha256 = "06jxs1hc69viv38nvafhn8ilj3xn2j9k543abgd8p69gc95w1lbn";
-       buildDepends = [ base SDL ];
+       libraryHaskellDepends = [ base SDL ];
        homepage = "http://liamoc.net/static/Sprig";
        description = "Binding to Sprig";
        license = stdenv.lib.licenses.bsd3;
@@ -14230,7 +14600,8 @@ self: {
        sha256 = "1pycmc30hg7vzf3addl0kdd74hpamzg3c1z4fj6fzr4542afhcq8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/zcourts/Stasis";
        description = "A simple MVCC like library";
@@ -14241,9 +14612,9 @@ self: {
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "StateVar";
-       version = "1.1.0.0";
-       sha256 = "0zixg7wzqvllxrlxhlqfchxfbpridckfam1wb81n6lfl2kq676d1";
-       buildDepends = [ base stm transformers ];
+       version = "1.1.0.1";
+       sha256 = "1ap51cvwq61xckx5hw44l82ihbxvsq3263xr5hqg42c5qp67kbhf";
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "https://github.com/haskell-opengl/StateVar";
        description = "State variables";
        license = stdenv.lib.licenses.bsd3;
@@ -14255,7 +14626,7 @@ self: {
        pname = "StateVar-transformer";
        version = "1.0.0.0";
        sha256 = "1dbpxwjz6yf4ap20wm5ngvd0i0knkjsdahmd90ymddqj82v8w3d0";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        homepage = "http://github.com/seagull-kamome/StateVar-transformer";
        description = "State variables";
        license = stdenv.lib.licenses.bsd3;
@@ -14267,7 +14638,7 @@ self: {
        pname = "StatisticalMethods";
        version = "0.0.0.1";
        sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6";
-       buildDepends = [ base statistics tuple vector ];
+       libraryHaskellDepends = [ base statistics tuple vector ];
        homepage = "http://www.tbi.univie.ac.at/~choener/Haskell/";
        description = "Collection of useful statistical methods";
        license = stdenv.lib.licenses.gpl3;
@@ -14281,7 +14652,9 @@ self: {
        pname = "Stomp";
        version = "0.1.1";
        sha256 = "0fdibnhab5j03df70pfg9psk6ah80a91ds4nmlb0rdlldddbi3wn";
-       buildDepends = [ base binary bytestring network time utf8-string ];
+       libraryHaskellDepends = [
+         base binary bytestring network time utf8-string
+       ];
        homepage = "http://github.com/rukav/Stomp";
        description = "Client library for Stomp brokers";
        license = stdenv.lib.licenses.bsd3;
@@ -14294,7 +14667,7 @@ self: {
        pname = "Strafunski-ATermLib";
        version = "1.6.0.3";
        sha256 = "1cicz4d5kyl9j4y3p79m3fk56vcqk3220a6y536dw525x6180dzw";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "An abstract data type designed for the exchange of tree-like data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -14310,7 +14683,7 @@ self: {
        sha256 = "0h73yj74pl0k3p7vamqhw1jz36pvh8kfpw58gkmskdmkh7j6wb30";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory haskell-src mtl pretty process Strafunski-ATermLib
          Strafunski-StrategyLib template-haskell
        ];
@@ -14326,7 +14699,7 @@ self: {
        pname = "Strafunski-StrategyLib";
        version = "5.0.0.8";
        sha256 = "09k9lcrrdzj6p7ywagc6mw17g4x9i743np36p4dkdp37q48j0mac";
-       buildDepends = [ base directory mtl syb transformers ];
+       libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14339,16 +14712,15 @@ self: {
        pname = "StrappedTemplates";
        version = "0.2.0.2";
        sha256 = "0x0nsrzb2r9pwp353ksxwik48iw17whmsclfj07qrqxchdwrjy6h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers filemanip filepath mtl
          parsec text transformers
        ];
-       testDepends = [ base blaze-builder bytestring hspec text ];
+       testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/StrappedTemplates";
        description = "General purpose templates in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "StrategyLib" = callPackage
@@ -14357,7 +14729,7 @@ self: {
        pname = "StrategyLib";
        version = "4.0.0.0";
        sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://naesten.dyndns.org:8080/repos/StrategyLib";
        license = stdenv.lib.licenses.unfree;
      }) {};
@@ -14368,7 +14740,7 @@ self: {
        pname = "Stream";
        version = "0.4.7.2";
        sha256 = "1l87l0kl4awzdyx6b28npwy6xf03r39d89iharsh06zgnd4y42wr";
-       buildDepends = [ base lazysmallcheck QuickCheck ];
+       libraryHaskellDepends = [ base lazysmallcheck QuickCheck ];
        description = "A library for manipulating infinite lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14379,7 +14751,7 @@ self: {
        pname = "StrictBench";
        version = "0.1.1";
        sha256 = "1l4l77rjhl5g9089kjyarsrvbvm43bk370ld50qp17dqhvisl73m";
-       buildDepends = [ base benchpress parallel ];
+       libraryHaskellDepends = [ base benchpress parallel ];
        homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/";
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
@@ -14397,10 +14769,12 @@ self: {
        sha256 = "0s294s06pj95i6q8n1cxsgkdc7x98mvvr1qd720rxqd3y54n63lb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base binary bytestring cereal cmdargs containers
-         data-default-class ListLike primitive vector vector-algorithms
-         vector-binary-instances
+       libraryHaskellDepends = [
+         aeson base binary bytestring cereal containers data-default-class
+         ListLike primitive vector vector-algorithms vector-binary-instances
+       ];
+       executableHaskellDepends = [
+         aeson base binary bytestring cereal cmdargs containers vector
        ];
        jailbreak = true;
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
@@ -14416,7 +14790,7 @@ self: {
        pname = "SybWidget";
        version = "0.5.6";
        sha256 = "0m3papl90fs3zmlqxsjn0cymk049352cl42bif2x7gij75cv2b68";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl syb-with-class template-haskell TypeCompose
        ];
        jailbreak = true;
@@ -14432,7 +14806,7 @@ self: {
        pname = "SyntaxMacros";
        version = "1.0.3";
        sha256 = "155vkv7kg026zc2crywdyna1df98mw41qm0sadqihaj49xk59vyc";
-       buildDepends = [
+       libraryHaskellDepends = [
          AspectAG base containers HList ListLike template-haskell TTTAS
          uu-parsinglib uulib
        ];
@@ -14451,7 +14825,7 @@ self: {
        pname = "Sysmon";
        version = "0.1.2";
        sha256 = "1zyp333vicjarcmip2q52nzfv948yl2q6qr3k3glp4v4m8f75ap3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ConfigFile filepath fingertree Glob MissingH mtl old-locale
          pretty statistics template-haskell time vector
        ];
@@ -14471,8 +14845,11 @@ self: {
        sha256 = "1063ckv034mb6s41xy8pr387y1hnknkyk4r29vmzdrm3pdcyzdn3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base Cabal deepseq directory filepath process unix
+       libraryHaskellDepends = [
+         base Cabal deepseq directory filepath process
+       ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process unix
        ];
        description = "Testing By Convention";
        license = stdenv.lib.licenses.bsd3;
@@ -14487,7 +14864,7 @@ self: {
        pname = "TBit";
        version = "0.4.2.3";
        sha256 = "1by1wy2w3ankg1php7m911kc53q2dv5jfl8v1iwp3mb68s8b6wrs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq fgl free hmatrix integration list-extras
          mtl numeric-tools parallel
        ];
@@ -14504,7 +14881,7 @@ self: {
        pname = "TCache";
        version = "0.12.0";
        sha256 = "0marslz5jg66r3i2d0yjjrj11bpywpadcxs5k4j6782iczxybd7s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory hashtables mtl old-time
          RefSerialize stm text
        ];
@@ -14518,7 +14895,7 @@ self: {
        pname = "TTTAS";
        version = "0.6.0";
        sha256 = "18p3rxh3g44ky5q4hjq53l4shg4gd8v68wra6bdxv8bjafxld1wp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS";
        description = "Typed Transformations of Typed Abstract Syntax";
        license = "LGPL";
@@ -14530,7 +14907,7 @@ self: {
        pname = "TV";
        version = "0.5.0";
        sha256 = "0vz9j5vjypnkbzld18f6kczfj54disf43x5052s4n7gqzsjxpxvb";
-       buildDepends = [ base DeepArrow TypeCompose ];
+       libraryHaskellDepends = [ base DeepArrow TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/TV";
        description = "Tangible Values -- composable interfaces";
        license = stdenv.lib.licenses.bsd3;
@@ -14544,7 +14921,7 @@ self: {
        pname = "TYB";
        version = "0.2.3";
        sha256 = "1rdwj6dg156i60i7s8xr310j0yza41jjqk6pmgx2giqjs122dz5n";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl template-haskell transformers
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
@@ -14560,7 +14937,7 @@ self: {
        pname = "TableAlgebra";
        version = "0.7.1";
        sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HaXml mtl pretty template-haskell
        ];
        description = "Ferry Table Algebra";
@@ -14575,7 +14952,7 @@ self: {
        sha256 = "02a6awbqwhmv7c74lgbp35ykqn31mgwp7ffd0j4rs42vv1a4ffkr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cookbook ];
+       executableHaskellDepends = [ base cookbook ];
        jailbreak = true;
        description = "A client for Quill databases";
        license = stdenv.lib.licenses.bsd3;
@@ -14590,7 +14967,7 @@ self: {
        sha256 = "10w3idjhrgmkrkjblrmb2wb2s2fg657nw5rmg5k147wrgrkzbsz3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec xhtml ];
+       executableHaskellDepends = [ base parsec xhtml ];
        homepage = "http://www.storytotell.org/code/tablify";
        description = "Tool to render CSV into tables of various formats";
        license = stdenv.lib.licenses.bsd3;
@@ -14602,7 +14979,7 @@ self: {
        pname = "Tainted";
        version = "0.1.0.2";
        sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/RossMeikleham/Tainted";
        description = "Tainted type, and associated operations";
        license = stdenv.lib.licenses.bsd3;
@@ -14616,7 +14993,8 @@ self: {
        sha256 = "0mxck66rz6lplgcl3a3i0gaybc2ki0q7wfilhkp2f3h3m50fg7wy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl old-time time ];
+       libraryHaskellDepends = [ base mtl old-time time ];
+       executableHaskellDepends = [ base mtl old-time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14628,7 +15006,7 @@ self: {
        pname = "Tape";
        version = "0.4.0.0";
        sha256 = "1d66l67cicn3q4a6glfxfkhc9cjm7vqi0bnyjad0bzyyv409j6bp";
-       buildDepends = [ base comonad distributive Stream ];
+       libraryHaskellDepends = [ base comonad distributive Stream ];
        jailbreak = true;
        homepage = "https://github.com/kwf/Tape";
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
@@ -14643,7 +15021,7 @@ self: {
        pname = "TeaHS";
        version = "0.3.1";
        sha256 = "1326lrpkw2gyn7y9px38gyzi2cnx87ki65r6mwds746d1s1zmmcn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl SDL SDL-image SDL-mixer SFont Sprig
        ];
        homepage = "http://liamoc.net/tea";
@@ -14658,7 +15036,7 @@ self: {
        pname = "Tensor";
        version = "1.1.0.1";
        sha256 = "1q8infjcszbbfqybg1fv33fy33chyvj2nbj9d2sxvsixx57hm12m";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/svenpanne/Tensor";
        description = "Tensor data types";
        license = stdenv.lib.licenses.bsd3;
@@ -14672,7 +15050,8 @@ self: {
        sha256 = "06m4mi9cl16sfyn9wibb0ph32vhgf501adjq059s3hdlxr4acdwr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary ];
+       libraryHaskellDepends = [ base binary ];
+       executableHaskellDepends = [ base ];
        description = "Efficient pure ternary tree Sets and Maps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14685,7 +15064,7 @@ self: {
        pname = "TestExplode";
        version = "0.1.0.0";
        sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
        ];
@@ -14701,8 +15080,8 @@ self: {
        pname = "Theora";
        version = "1.0";
        sha256 = "1gw97mxwb6ywc4qvfggjzsryl0m4g6g30ljx4xcvy6snfmgv00ig";
-       buildDepends = [ base ];
-       extraLibraries = [ ogg theora ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ ogg theora ];
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { ogg = null;  theora = null;};
@@ -14713,7 +15092,7 @@ self: {
        pname = "Thingie";
        version = "0.80";
        sha256 = "0fl6pk2vp765gyzc4afjdg0lgbnh5v08gfbp0kzny4ng25bmxqwa";
-       buildDepends = [ base cairo gtk mtl ];
+       libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14725,7 +15104,7 @@ self: {
        pname = "ThreadObjects";
        version = "0.0";
        sha256 = "0rpcv6kw351ykj36f83qdqygrhk4ylqlcgcswxl8gg1v33jaaqmz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Mutable objects that reside in their own threads";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -14736,10 +15115,12 @@ self: {
      mkDerivation {
        pname = "Thrift";
        version = "0.6.0.1";
-       revision = "1";
        sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv";
+       revision = "1";
        editedCabalFile = "56a8ab041685777391702f1475e5c2a3462b36765bd53de2e21e1f55aa5999d9";
-       buildDepends = [ base binary bytestring ghc-prim HTTP network ];
+       libraryHaskellDepends = [
+         base binary bytestring ghc-prim HTTP network
+       ];
        jailbreak = true;
        homepage = "http://thrift.apache.org";
        description = "Haskell bindings for the Apache Thrift RPC system";
@@ -14755,7 +15136,7 @@ self: {
        pname = "TicTacToe";
        version = "0.0.1";
        sha256 = "0542hripn5nlwdvnhkd9xzzh2b1x6alwnqxq877r92c7kqnlffw4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -14770,7 +15151,7 @@ self: {
        pname = "TigerHash";
        version = "0.2";
        sha256 = "02plz1y7lmvp3jpl5srsnx2nkl6yhhfn6pqj00szs688cahk2dik";
-       buildDepends = [ base binary bytestring dataenc ];
+       libraryHaskellDepends = [ base binary bytestring dataenc ];
        description = "TigerHash with C implementation";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -14785,7 +15166,11 @@ self: {
        sha256 = "1ylf4kzyf947szgib0ivkvygbinmy97nvy77d0crryzxdmccrzbj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers old-locale old-time random SDL SDL-gfx SDL-image
+         SDL-ttf
+       ];
+       executableHaskellDepends = [
          base containers old-locale old-time random SDL SDL-gfx SDL-image
          SDL-ttf
        ];
@@ -14800,7 +15185,7 @@ self: {
        pname = "TinyLaunchbury";
        version = "1.0.1";
        sha256 = "1xxadd8pqbgl0z8vrqn8fm6x0c9l2y3a7irjmjkh9750x6hdb4b9";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14812,7 +15197,7 @@ self: {
        pname = "TinyURL";
        version = "0.1.0";
        sha256 = "0y8bl6w3ix2zjhm10wazgi70sr02ydc3hrwjbr6whk341n140wsh";
-       buildDepends = [ base HTTP network ];
+       libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14826,7 +15211,7 @@ self: {
        sha256 = "1s8zvb38r9pxh55d5206lijprc6xsqnr0j670sdjrw7n8gyn7vav";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers matrix random ];
+       executableHaskellDepends = [ base containers matrix random ];
        jailbreak = true;
        description = "Game for Lounge Marmelade";
        license = stdenv.lib.licenses.gpl3;
@@ -14841,7 +15226,8 @@ self: {
        sha256 = "0ykicqwayja14z30hn5cy3c96sikqhbyrh0bcqykk9izwhxs339x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec ];
+       libraryHaskellDepends = [ base containers mtl ];
+       executableHaskellDepends = [ base containers mtl parsec ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
@@ -14856,8 +15242,8 @@ self: {
        pname = "Tournament";
        version = "0.0.1";
        sha256 = "1yzgcsp3g5sfyxavq1firna5z5m9bnk9ddrbxxmpy1yydmj1n5jk";
-       buildDepends = [ base containers mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [
          base containers mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -14874,7 +15260,7 @@ self: {
        pname = "TraceUtils";
        version = "0.1.0.2";
        sha256 = "0la19yynd7bpswi9012hf0vl9c4fdnn8p6y0287xanmdcs9zqz16";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Peaker/TraceUtils";
        description = "Functions that should have been in Debug.Trace";
        license = stdenv.lib.licenses.bsd3;
@@ -14888,7 +15274,7 @@ self: {
        sha256 = "1cd8sh6gi9zmvd70kzw1x9ycanfsyphjdy3r65xrph54ilwy511p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl ];
+       executableHaskellDepends = [ base containers mtl ];
        homepage = "https://github.com/mgrabmueller/TransformersStepByStep";
        description = "Tutorial on monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -14900,7 +15286,7 @@ self: {
        pname = "Transhare";
        version = "0.9";
        sha256 = "04n1ld6h3q71iqnvwyabzj69vdy2x98w0drriyx13ykywbd31036";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "A library to apply transformation to containers so as to maximize sharing of unchanged subcomponents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14911,7 +15297,7 @@ self: {
        pname = "TreeCounter";
        version = "0.0.2";
        sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal";
-       buildDepends = [ base ref-mtl stm ];
+       libraryHaskellDepends = [ base ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Wait-free Tree Counter";
@@ -14924,7 +15310,7 @@ self: {
        pname = "TreeStructures";
        version = "0.0.2";
        sha256 = "1lcj166i8f7850fqjv7xqxdn6zwpdynzxn3bf243wdnwmnn5pysx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://www.github.com/bhickey/TreeStructures";
        description = "A collection of heaps and search trees";
@@ -14937,7 +15323,7 @@ self: {
        pname = "TreeT";
        version = "0.0";
        sha256 = "0d1k4nblcnksh2j6b4v14r2xd2kn6cmqmyqhmy6wyz3kr0lyzxqd";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        description = "Transformer for Data.Tree";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -14948,7 +15334,7 @@ self: {
        pname = "Treiber";
        version = "0.0.4";
        sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd";
-       buildDepends = [ base ghc-prim monad-loops ref-mtl stm ];
+       libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Lock free Treiber stack";
@@ -14963,7 +15349,7 @@ self: {
        pname = "TrendGraph";
        version = "0.1.0.1";
        sha256 = "1rdlimlbdpa089knhnqzgxc8ngqag4m4w3r92jd95kwnmr8nizkp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers diagrams-cairo diagrams-lib mtl
          optparse-applicative time
        ];
@@ -14982,7 +15368,7 @@ self: {
        pname = "TrieMap";
        version = "4.1.0";
        sha256 = "14wril1sa35cja66y7ah9qwr3bmsi985y7rlxyj12x2fv6dclpc4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers primitive template-haskell
          th-expand-syns transformers unpack-funcs vector
        ];
@@ -14999,10 +15385,10 @@ self: {
        pname = "Twofish";
        version = "0.3.2";
        sha256 = "1bv79582fxwgk255fhss6k8irb7mlbdvlvvx8jyzs16g3fyw1y5a";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cereal crypto-api largeword mtl tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base binary bytestring cereal crypto-api HUnit largeword
          tagged
        ];
@@ -15021,7 +15407,7 @@ self: {
        sha256 = "0crymgw91xx0hblbmz488x39i2qzf9c15kv5x950ljmpyrhy5jhv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath random reactive-banana reactive-banana-sdl
          SDL SDL-ttf transformers
        ];
@@ -15037,7 +15423,7 @@ self: {
        pname = "TypeCompose";
        version = "0.9.10";
        sha256 = "1wpldqdf6czl36fs4pvvj2z3kg1487sanqncp4rbmgrrhbfmqxxq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/conal/TypeCompose";
        description = "Type composition classes & instances";
        license = stdenv.lib.licenses.bsd3;
@@ -15051,7 +15437,7 @@ self: {
        sha256 = "02ck7sik5wvh989k9ban1m2dlpfld0d0zs7sqb12m1f6wls7fghc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 ];
+       executableHaskellDepends = [ base haskell98 ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/oc/TypeIlluminator/";
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
        license = stdenv.lib.licenses.bsd3;
@@ -15064,7 +15450,7 @@ self: {
        pname = "TypeNat";
        version = "0.2.1.0";
        sha256 = "01dsw64zzwbkvm7q4jwyidjvxbkx6fvx8hhn70d2bpdxxammnxry";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/avieth/TypeNat";
        description = "Some Nat-indexed types for GHC";
@@ -15080,7 +15466,7 @@ self: {
        sha256 = "07qwvmdh5164v552qkk4fm66nlvb4dcv0wh5jircfgh7gsd60l6n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory time ];
+       executableHaskellDepends = [ base containers directory time ];
        homepage = "https://github.com/xpika/typingtester";
        description = "Command Line Typing speed tester";
        license = stdenv.lib.licenses.gpl3;
@@ -15094,13 +15480,12 @@ self: {
        pname = "UISF";
        version = "0.3.0.2";
        sha256 = "0i5kw450yk44kh25xbqzjwnjipzh81i20vk8il9ic2fh4d79va46";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base containers deepseq GLFW OpenGL stm transformers
        ];
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for Arrowized Graphical User Interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "UMM" = callPackage
@@ -15113,7 +15498,7 @@ self: {
        sha256 = "0k9kvlkcznk6ydfcymzzh0a4j4zkl5iblvnx6fkmk8xah1qnkq5h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base haskell98 old-time parsec process utf8-string
        ];
        homepage = "http://www.korgwal.com/umm/";
@@ -15131,7 +15516,7 @@ self: {
        pname = "URLT";
        version = "0.14";
        sha256 = "14qlyrc3ins3lwhd2c8lyhm1j3v6nj4qgs5g9xys4w6hnndz2g3s";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base Consumer happstack-server hsp hsx mtl
          QuickCheck regular template-haskell
        ];
@@ -15146,7 +15531,7 @@ self: {
        pname = "URLb";
        version = "0.0.1";
        sha256 = "1l62z7798bby4fbrz62ic802g8zah3flb2pmsd3ky7y5903s3nxr";
-       buildDepends = [ attoparsec base bytestring containers ];
+       libraryHaskellDepends = [ attoparsec base bytestring containers ];
        homepage = "http://github.com/solidsnack/URLb";
        description = "DEPRECATED A simple, liberal URL parser";
        license = stdenv.lib.licenses.bsd3;
@@ -15160,7 +15545,7 @@ self: {
        pname = "Unique";
        version = "0.4.2";
        sha256 = "0riyn68bi6wxz2mhqlywva6a1ngfr4k3gglp12dkhcmllh5l3dc2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers extra hashable unordered-containers
        ];
        jailbreak = true;
@@ -15176,7 +15561,7 @@ self: {
        pname = "Unixutils";
        version = "1.53";
        sha256 = "0gh8fii9kc2nah5l0gv1pzlxdxgw962vgr1w9kc5wksf85hgyplr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory exceptions filepath mtl process
          process-extras pureMD5 regex-tdfa unix zlib
        ];
@@ -15191,7 +15576,7 @@ self: {
        pname = "Unixutils-shadow";
        version = "1.0.0";
        sha256 = "11m8lgq2rjvh7j8si7sqixf4k4ns65jy0zp6apqp0xc23c1znyr7";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://src.seereason.com/haskell-unixutils-shadow";
        description = "A simple interface to shadow passwords (aka, shadow.h)";
        license = stdenv.lib.licenses.bsd3;
@@ -15203,11 +15588,10 @@ self: {
        pname = "Updater";
        version = "0.2";
        sha256 = "03n2r02bgv9hzlvxypdy1mrvdmzrxlm717bf7qp9f9ky1sj3ixp4";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/yokto/Updater";
        description = "Monadic FRP library based on stm";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "UrlDisp" = callPackage
@@ -15216,7 +15600,7 @@ self: {
        pname = "UrlDisp";
        version = "0.1.7";
        sha256 = "1y21v5k7s9sj8z5r3czp5i80x40zvyqxzr1xl28ardwj5q5rrvzp";
-       buildDepends = [ base cgi MaybeT mtl ];
+       libraryHaskellDepends = [ base cgi MaybeT mtl ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/UrlDisp";
        description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
@@ -15230,7 +15614,7 @@ self: {
        pname = "Useful";
        version = "0.0.6";
        sha256 = "01xb68qh29q6b0pdxvadqw7q1p855k14jdz1qjlhg6785n0qp954";
-       buildDepends = [ base containers random ];
+       libraryHaskellDepends = [ base containers random ];
        description = "Some useful functions and shorthands";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15241,7 +15625,7 @@ self: {
        pname = "UtilityTM";
        version = "0.0.4";
        sha256 = "1mjy3w4sw32rbmm13yhmpidfsj91v3p58jvki16z0kzk3fswpa85";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tonymorris/utility-tm";
        description = "Utility functions that are missing from the standard library";
        license = stdenv.lib.licenses.bsd3;
@@ -15260,13 +15644,13 @@ self: {
        sha256 = "0621x6mqa1qplswirxnzpzn24520qvl5ii1wyvqm8nfb69sbqzpg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bimap bytestring containers curlhs directory failure
          filepath mtl optparse-applicative parsec pretty-show regexpr safe
          split tagsoup tagsoup-parsec template-haskell text time
          transformers utf8-string vector
        ];
-       extraLibraries = [ curl ];
+       executableSystemDepends = [ curl ];
        homepage = "http://github.com/grwlf/vkhs";
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
@@ -15279,7 +15663,9 @@ self: {
        pname = "Validation";
        version = "0.2.0";
        sha256 = "10smif8y5bgjiarag3ws131kwji32mlh6mqfnmmp20xf41fsm0z3";
-       buildDepends = [ base bifunctors semigroupoids semigroups ];
+       libraryHaskellDepends = [
+         base bifunctors semigroupoids semigroups
+       ];
        jailbreak = true;
        homepage = "https://github.com/tonymorris/validation";
        description = "A data-type like Either but with an accumulating Applicative";
@@ -15292,7 +15678,7 @@ self: {
        pname = "Vec";
        version = "1.0.5";
        sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm";
-       buildDepends = [ array base ghc-prim ];
+       libraryHaskellDepends = [ array base ghc-prim ];
        homepage = "http://github.net/sedillard/Vec";
        description = "Fixed-length lists and low-dimensional linear algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -15304,7 +15690,7 @@ self: {
        pname = "Vec-Boolean";
        version = "1.0.6";
        sha256 = "0zxxpychddmlrv7r190gn4dl282ak4qfk2d92l24qxi9fds1rshk";
-       buildDepends = [ base Boolean Vec ];
+       libraryHaskellDepends = [ base Boolean Vec ];
        jailbreak = true;
        description = "Provides Boolean instances for the Vec package";
        license = stdenv.lib.licenses.bsd3;
@@ -15317,7 +15703,7 @@ self: {
        pname = "Vec-OpenGLRaw";
        version = "0.2.0.1";
        sha256 = "0qsi1s8qp3fkr5alh2m7y1a1lm5xypjvmk174ywf0aga2y20bblm";
-       buildDepends = [ base OpenGLRaw Vec ];
+       libraryHaskellDepends = [ base OpenGLRaw Vec ];
        homepage = "http://www.downstairspeople.org/darcs/Vec-opengl";
        description = "Instances and functions to interoperate Vec and OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -15342,7 +15728,7 @@ self: {
        pname = "VecN";
        version = "0.0.2";
        sha256 = "1hv8idxv9gniwwjs67q75bbcc5ry9r05cxjmsxk0q54l8zscdss2";
-       buildDepends = [ base Peano ];
+       libraryHaskellDepends = [ base Peano ];
        description = "a simple peano-indexed vector type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15353,8 +15739,8 @@ self: {
        pname = "ViennaRNA-bindings";
        version = "0.1.2.2";
        sha256 = "06zz3svdsy6qzbj7s02sbifkprmm58r14ss46r6680c9ybw9w5l3";
-       buildDepends = [ array base ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "ViennaRNA v2 bindings";
        license = "unknown";
@@ -15366,8 +15752,8 @@ self: {
        pname = "ViennaRNAParser";
        version = "1.2.5";
        sha256 = "0kc3b49g52dh0a4q8v5ir7pwa0x8s6rclmqjhkj95v1070ag4w0f";
-       buildDepends = [ base parsec process ];
-       testDepends = [ base hspec parsec ];
+       libraryHaskellDepends = [ base parsec process ];
+       testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
      }) {};
@@ -15380,7 +15766,10 @@ self: {
        sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers parseargs ];
+       libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [
+         base bytestring containers parseargs
+       ];
        homepage = "http://github.com/BartMassey/WAVE";
        description = "WAVE audio file IO library";
        license = stdenv.lib.licenses.bsd3;
@@ -15395,7 +15784,9 @@ self: {
        sha256 = "0gbjb432758wvd3p5brb4kjn037x6h30bzvn9f681pg0m1w52hgv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath mtl unix WL500gPLib ];
+       executableHaskellDepends = [
+         base directory filepath mtl unix WL500gPLib
+       ];
        jailbreak = true;
        description = "A simple command line tools to control the Asus WL500gP router";
        license = stdenv.lib.licenses.bsd3;
@@ -15410,7 +15801,8 @@ self: {
        sha256 = "15w065yg8hjhljgnmx88fnryhbh7dysmsqmpr9qnj96as7vrkwgs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base curl mtl tagsoup ];
+       libraryHaskellDepends = [ base curl mtl tagsoup ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "A simple library to access to the WL 500gP router from the Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -15424,11 +15816,11 @@ self: {
        pname = "WMSigner";
        version = "0.1.0.0";
        sha256 = "0im8rfyfnhq2s445cjm4xvnqqs8pgpavhmyk98jqshpfm9d1cd6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring binary bytestring cryptohash directory lens
          mtl random split vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cryptohash hspec lens random split vector
        ];
        jailbreak = true;
@@ -15442,7 +15834,7 @@ self: {
        pname = "WURFL";
        version = "0.1";
        sha256 = "13vfszyfyxwz4zi8zilifd0jad1gwlr75x931q8qbpi1kwr7mivk";
-       buildDepends = [ base haskell98 parsec ];
+       libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15454,7 +15846,7 @@ self: {
        pname = "WXDiffCtrl";
        version = "0.0.1";
        sha256 = "0vv8s483g3dkxyk833cjczj0a5zxiy9xh56kij6n0jjyzxb9bz0k";
-       buildDepends = [ base containers wx wxcore ];
+       libraryHaskellDepends = [ base containers wx wxcore ];
        homepage = "http://wewantarock.wordpress.com";
        description = "WXDiffCtrl";
        license = stdenv.lib.licenses.bsd3;
@@ -15471,10 +15863,10 @@ self: {
        sha256 = "11d9cwqfpvf999a5fi3a3v5b4gdrszzgf4gbdhx63afy42ylbnfj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers directory ghc-paths haskell98 parsec process
-         regex-compat
+       libraryHaskellDepends = [
+         base containers haskell98 parsec regex-compat
        ];
+       executableHaskellDepends = [ directory ghc-paths process ];
        jailbreak = true;
        homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/";
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
@@ -15490,7 +15882,7 @@ self: {
        pname = "Weather";
        version = "0.1.0.4";
        sha256 = "0g5rpz6gnf8hl7gpjc7nwci8x24yw02ps3jwjsi6js5yf3mlrxnv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HTTP text unordered-containers
        ];
        homepage = "https://github.com/bstamour/weather";
@@ -15504,7 +15896,7 @@ self: {
        pname = "WebBits";
        version = "2.2";
        sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z";
-       buildDepends = [ base containers mtl parsec pretty syb ];
+       libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        homepage = "http://github.com/brownplt/webbits";
        description = "JavaScript analysis tools";
        license = stdenv.lib.licenses.bsd3;
@@ -15518,7 +15910,9 @@ self: {
        pname = "WebBits-Html";
        version = "1.0.2";
        sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal";
-       buildDepends = [ base containers mtl parsec pretty syb WebBits ];
+       libraryHaskellDepends = [
+         base containers mtl parsec pretty syb WebBits
+       ];
        jailbreak = true;
        homepage = "http://www.cs.brown.edu/research/plt/";
        description = "JavaScript analysis tools";
@@ -15534,7 +15928,7 @@ self: {
        pname = "WebBits-multiplate";
        version = "0.0.0.1";
        sha256 = "1j3difi3f1w6bgbnsvqw9cv88aikin22myli0lx29pqn7xhqsbv3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base multiplate multiplate-simplified transformers WebBits
        ];
        jailbreak = true;
@@ -15552,7 +15946,7 @@ self: {
        pname = "WebCont";
        version = "0.0.1";
        sha256 = "1lr5iz0kqhr8w0c7038mlbysw1c3lbzfjis085n68ib104ykyyi6";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base concatenative containers formlets
          happstack-server happstack-state happstack-util mtl utf8-string
          xhtml
@@ -15571,7 +15965,8 @@ self: {
        sha256 = "0nl79q3y2qi0xnkppxj8d9h96hfwrgb3gksm2x1zp9lq7836562z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
+       executableHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "https://github.com/cameronbwhite/WeberLogic";
        description = "Logic interpreter";
@@ -15590,7 +15985,12 @@ self: {
        sha256 = "1iv969gd4xmagw74i6fmw4d864zxlzi4yf0y9ns1nvijn7w7s5jb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson array base bytestring containers directory filepath HaXml
+         HTTP hxt mtl network parsec process regex-pcre-builtin
+         template-haskell text transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [
          aeson array base bytestring containers directory filepath HaXml
          HTTP hxt mtl network parsec process regex-pcre-builtin
          template-haskell text transformers unordered-containers vector
@@ -15612,12 +16012,12 @@ self: {
        pname = "Wheb";
        version = "0.3.1.0";
        sha256 = "13x204lz2azfrry38w791rni2d0g9xsg5lhajrkrgfhdn56yrzqs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive containers cookie
          http-types mtl pwstore-fast stm text time transformers unix uuid
          wai wai-extra wai-websockets warp web-routes websockets
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
@@ -15634,7 +16034,7 @@ self: {
        pname = "WikimediaParser";
        version = "0.1";
        sha256 = "0rzpf8z414qvkbks16zizsxsinvbdxbm1n0dbav11p286791xx1j";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15648,12 +16048,13 @@ self: {
        pname = "Win32";
        version = "2.3.1.0";
        sha256 = "1y9z682gmgjkrc8lijkidrlwh5pr30zgpvx2sc3gnvn8krg6jnk8";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ advapi32 gdi32 shell32 shfolder user32 winmm ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [
+         advapi32 gdi32 shell32 shfolder user32 winmm
+       ];
        homepage = "https://github.com/haskell/win32";
        description = "A binding to part of the Win32 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { advapi32 = null;  gdi32 = null;  shell32 = null;
           shfolder = null;  user32 = null;  winmm = null;};
 
@@ -15663,7 +16064,7 @@ self: {
        pname = "Win32-dhcp-server";
        version = "0.3.1";
        sha256 = "0mkxk822gcg1r61cf5wq9ayya51am4dy8v2xqm3ld30d7hss4dij";
-       buildDepends = [ base text Win32 Win32-errors ];
+       libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "http://github.com/mikesteele81/win32-dhcp-server";
        description = "Win32 DHCP Server Management API";
        license = stdenv.lib.licenses.bsd3;
@@ -15676,7 +16077,7 @@ self: {
        pname = "Win32-errors";
        version = "0.2.2.1";
        sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031";
-       buildDepends = [ base template-haskell text Win32 ];
+       libraryHaskellDepends = [ base template-haskell text Win32 ];
        homepage = "http://github.com/mikesteele81/win32-errors";
        description = "Alternative error handling for Win32 foreign calls";
        license = stdenv.lib.licenses.bsd3;
@@ -15689,8 +16090,8 @@ self: {
        pname = "Win32-extras";
        version = "0.2.0.1";
        sha256 = "00lrqvsa74mqv0k4yz00j2jdpmchkyhcicqv24z9a53iv1i0xp7h";
-       buildDepends = [ base Win32 ];
-       extraLibraries = [ imm32 msimg32 ];
+       libraryHaskellDepends = [ base Win32 ];
+       librarySystemDepends = [ imm32 msimg32 ];
        homepage = "http://hub.darcs.net/shelarcy/Win32-extras/";
        description = "Provides missing Win32 API";
        license = stdenv.lib.licenses.bsd3;
@@ -15703,7 +16104,7 @@ self: {
        pname = "Win32-junction-point";
        version = "0.2.1.1";
        sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941";
-       buildDepends = [ base text Win32 Win32-errors ];
+       libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "http://github.com/mikesteele81/Win32-junction-point";
        description = "Support for manipulating NTFS junction points";
        license = stdenv.lib.licenses.bsd3;
@@ -15718,7 +16119,8 @@ self: {
        sha256 = "0zzbb00rykl8y1prkcm3paaamhmdrqji34070b9zg7sg2pc5k4f4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers directory Win32 ];
+       libraryHaskellDepends = [ base containers directory Win32 ];
+       executableHaskellDepends = [ base directory ];
        description = "A binding to part of the Win32 library for file notification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15732,7 +16134,7 @@ self: {
        sha256 = "0dh4z7a0mxwpqhx1cxvwwjc7w24mcrqc0bmg7bp86kd6zqz6rjly";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base text Win32 Win32-errors ];
+       libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "https://github.com/anton-dessiatov/Win32-security";
        description = "Haskell bindings to a security-related functions of the Windows API";
        license = stdenv.lib.licenses.mit;
@@ -15745,8 +16147,8 @@ self: {
        pname = "Win32-services";
        version = "0.3";
        sha256 = "07vby574s528g259zq8jby1327b6jqn4zlzs406ml99w1p02d9js";
-       buildDepends = [ base Win32 Win32-errors ];
-       extraLibraries = [ Advapi32 ];
+       libraryHaskellDepends = [ base Win32 Win32-errors ];
+       librarySystemDepends = [ Advapi32 ];
        homepage = "http://github.com/mikesteele81/win32-services";
        description = "Windows service applications";
        license = stdenv.lib.licenses.bsd3;
@@ -15761,7 +16163,7 @@ self: {
        pname = "Win32-services-wrapper";
        version = "0.1.3.0";
        sha256 = "1nihf12bcgahs5220pdny1kf54973qxh7llhzv5d9s9lxias2jyd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath Win32 Win32-errors Win32-services
        ];
        description = "Wrapper code for making a Win32 service";
@@ -15777,7 +16179,7 @@ self: {
        pname = "Wired";
        version = "0.3";
        sha256 = "14zxf849r4k3mk5i5rakfjp2f216sz84ww4hfggq9cnr9w8j406j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base chalmers-lava2000 containers mtl QuickCheck
        ];
        homepage = "http://www.cse.chalmers.se/~emax/wired/";
@@ -15791,7 +16193,7 @@ self: {
        pname = "WordNet";
        version = "1.1.0";
        sha256 = "0b44xxkihafzsw25xx484xxw17zlzzqbj0bx8cs2nvf3p7jxd02k";
-       buildDepends = [ array base containers filepath ];
+       libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15803,7 +16205,7 @@ self: {
        pname = "WordNet-ghc74";
        version = "0.1.3";
        sha256 = "1ab5wybawa3dfq89dn0g3zdhsqd03bcm3qky2d4z6irw7afdqrr8";
-       buildDepends = [ array base containers filepath ];
+       libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15817,7 +16219,8 @@ self: {
        sha256 = "08d02h4ynkwxqxxqzk8hfmdj9y7rg23biybb969pk0scgvg7iyd5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base boxes cmdargs ];
+       libraryHaskellDepends = [ base boxes cmdargs ];
+       executableHaskellDepends = [ base boxes cmdargs ];
        jailbreak = true;
        homepage = "https://github.com/gbgar/Wordlint";
        description = "Plaintext prose redundancy linter";
@@ -15833,10 +16236,10 @@ self: {
      mkDerivation {
        pname = "Workflow";
        version = "0.8.3";
-       revision = "1";
        sha256 = "08r1s840771z1gy44dj3xc6ary7gk3ka3zvji5pmgzi998x4p6y8";
+       revision = "1";
        editedCabalFile = "1be542eaf091e04c561a2a589f37330b0a65d6d3d5a44609c197a74e8385c64b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory exceptions
          extensible-exceptions mtl old-time RefSerialize stm TCache vector
        ];
@@ -15851,7 +16254,9 @@ self: {
        pname = "WxGeneric";
        version = "0.8.1";
        sha256 = "0lvbdmb1qwsz8bz0z715nzgbpshfckm4syk1ny52akkb4ddkrd60";
-       buildDepends = [ base containers mtl SybWidget wx wxcore xtc ];
+       libraryHaskellDepends = [
+         base containers mtl SybWidget wx wxcore xtc
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/WxGeneric";
        description = "Generic (SYB3) construction of wxHaskell widgets";
@@ -15859,34 +16264,29 @@ self: {
      }) {};
 
   "X11" = callPackage
-    ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
-     , libXrandr, libXrender
-     }:
+    ({ mkDerivation, base, data-default, libX11, libXext, libXrandr }:
      mkDerivation {
        pname = "X11";
        version = "1.6.1.2";
        sha256 = "1kzjcynm3rr83ihqx2y2d852jc49da4p18gv6jzm7g87z22x85jj";
-       buildDepends = [ base data-default ];
-       extraLibraries = [
-         libX11 libXext libXinerama libXrandr libXrender
-       ];
+       libraryHaskellDepends = [ base data-default ];
+       librarySystemDepends = [ libX11 libXext libXrandr ];
        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) libXrandr;};
 
   "X11-extras" = callPackage
     ({ mkDerivation, base, libX11, X11 }:
      mkDerivation {
        pname = "X11-extras";
        version = "0.4";
-       revision = "1";
        sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a";
+       revision = "1";
        editedCabalFile = "f7b315acd1fb4d44ee6312b2e8d397b7cda103cf5e9e8ca6867389ef6cadff3c";
-       buildDepends = [ base X11 ];
-       extraLibraries = [ libX11 ];
+       libraryHaskellDepends = [ base X11 ];
+       librarySystemDepends = [ libX11 ];
        jailbreak = true;
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
@@ -15899,7 +16299,7 @@ self: {
        pname = "X11-rm";
        version = "0.2";
        sha256 = "11jxlaad9jgjddd5v8ygy2rdrajrbm9dlp6f0mslvxa2wzn4v4r3";
-       buildDepends = [ base X11 ];
+       libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15911,8 +16311,8 @@ self: {
        pname = "X11-xdamage";
        version = "0.1.2";
        sha256 = "0r6dq9xx0v100162y7bvkj1l0lv5m697y35c659kgjj0mg8p9bjv";
-       buildDepends = [ base X11 ];
-       extraLibraries = [ Xdamage ];
+       libraryHaskellDepends = [ base X11 ];
+       librarySystemDepends = [ Xdamage ];
        homepage = "http://darcs.haskell.org/X11-xdamage";
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
@@ -15925,8 +16325,8 @@ self: {
        pname = "X11-xfixes";
        version = "0.1.1";
        sha256 = "0wwhyqqybrjvy8mi5d5429wraky93xq348gr9ldhg2qj95hj13yk";
-       buildDepends = [ base X11 ];
-       extraLibraries = [ Xfixes ];
+       libraryHaskellDepends = [ base X11 ];
+       librarySystemDepends = [ Xfixes ];
        homepage = "https://github.com/reacocard/x11-xfixes";
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
@@ -15934,23 +16334,16 @@ self: {
      }) { Xfixes = null;};
 
   "X11-xft" = callPackage
-    ({ mkDerivation, base, fontconfig, freetype, libXft, pkgconfig
-     , utf8-string, X11
-     }:
+    ({ mkDerivation, base, libXft, utf8-string, X11 }:
      mkDerivation {
        pname = "X11-xft";
        version = "0.3.1";
        sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf";
-       buildDepends = [ base utf8-string X11 ];
-       extraLibraries = [ fontconfig freetype pkgconfig ];
-       pkgconfigDepends = [ libXft ];
-       configureFlags = [
-         "--extra-include-dirs=${freetype}/include/freetype2"
-       ];
+       libraryHaskellDepends = [ base utf8-string X11 ];
+       libraryPkgconfigDepends = [ libXft ];
        description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
        license = "LGPL";
-     }) { inherit (pkgs) fontconfig;  inherit (pkgs) freetype;
-          inherit (pkgs.xlibs) libXft;  inherit (pkgs) pkgconfig;};
+     }) { inherit (pkgs.xlibs) libXft;};
 
   "X11-xshape" = callPackage
     ({ mkDerivation, base, X11 }:
@@ -15958,7 +16351,7 @@ self: {
        pname = "X11-xshape";
        version = "0.1.1";
        sha256 = "19p71lc0hihfn0xzl29j01kd0zf9yalspwj7dava0ybc1rm3g62h";
-       buildDepends = [ base X11 ];
+       libraryHaskellDepends = [ base X11 ];
        homepage = "http://darcs.haskell.org/X11-xshape";
        description = "A binding to the Xshape X11 extension library";
        license = stdenv.lib.licenses.bsd3;
@@ -15970,7 +16363,7 @@ self: {
        pname = "XAttr";
        version = "0.1.1";
        sha256 = "16vap0rw026lgxfcqpdfsx7l26ik97rhkkv1mg2j61akydhijs67";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "Read, set, and list extended attributes";
        license = "GPL";
      }) {};
@@ -15981,8 +16374,8 @@ self: {
        pname = "XInput";
        version = "0.1";
        sha256 = "1kk0gccv83mw8463x29c7rpl5davmhk9vyf82i4rbksgrdzkhjh9";
-       buildDepends = [ base Win32 ];
-       extraLibraries = [ xinput ];
+       libraryHaskellDepends = [ base Win32 ];
+       librarySystemDepends = [ xinput ];
        homepage = "http://code.fac9.com/xinput/";
        description = "Bindings for the DirectX XInput library";
        license = stdenv.lib.licenses.bsd3;
@@ -15995,8 +16388,8 @@ self: {
        pname = "XMMS";
        version = "0.1.1";
        sha256 = "08l53b0wp6v9wjfn53xfa1vlh64bnqidajc4lzlk8p31km1c09qx";
-       buildDepends = [ base containers ];
-       extraLibraries = [ xmmsclient xmmsclient-glib ];
+       libraryHaskellDepends = [ base containers ];
+       librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        homepage = "http://kawais.org.ua/XMMS/";
        description = "XMMS2 client library";
        license = "LGPL";
@@ -16011,7 +16404,7 @@ self: {
        pname = "XMPP";
        version = "0.1.2";
        sha256 = "03gypa9kln2v3zqyxszn4k2x364g8wj0hppsy10ywmandghsvn7b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 hsdns mtl network parsec random utf8-string
        ];
        jailbreak = true;
@@ -16028,12 +16421,15 @@ self: {
      mkDerivation {
        pname = "XSaiga";
        version = "1.0.0.0";
-       revision = "3";
        sha256 = "0smf0ym26kv0fa34plnsndxp5hflc7w6g0wbkg6n4cy9bz4sgd4z";
+       revision = "3";
        editedCabalFile = "a152097b5010d51d0192d2c1748dce912a050f3f705f5a4b86ffa7a2f726488f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cgi containers hsparql pretty rdf4h text ];
+       libraryHaskellDepends = [ base pretty ];
+       executableHaskellDepends = [
+         base cgi containers hsparql pretty rdf4h text
+       ];
        jailbreak = true;
        homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html";
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
@@ -16047,8 +16443,8 @@ self: {
        pname = "Xauth";
        version = "0.1";
        sha256 = "1mvflp6y1nz9961gngbwk0b7wr8sx3p6296jfvvb6ln1kvm2scxs";
-       buildDepends = [ base ];
-       pkgconfigDepends = [ libXau ];
+       libraryHaskellDepends = [ base ];
+       libraryPkgconfigDepends = [ libXau ];
        description = "A binding to the X11 authentication library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libXau;};
@@ -16063,7 +16459,7 @@ self: {
        sha256 = "1n3y232v9i5jzbshk2zw675g09snc45ni60acmi6kvfsk7nkmfw8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring cairo containers directory filepath gtk mtl
          old-time SHA unix
        ];
@@ -16078,7 +16474,7 @@ self: {
        pname = "XmlHtmlWriter";
        version = "0.0.0.1";
        sha256 = "0dv5nvvqy6w0ndjyab4bwhjpw1hlx8xi4bv2jw4rl8v6y68bilk1";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        homepage = "http://github.com/mmirman/haskogeneous/tree/XmlHtmlWriter";
        description = "A library for writing XML and HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -16091,7 +16487,7 @@ self: {
        pname = "Xorshift128Plus";
        version = "0.1.0.1";
        sha256 = "11g1gipc9v81h5jzndr3j7j4mwr4lva9b52fd0hml4mrzf6vj2dx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kanaihiroki/Xorshift128Plus";
        description = "Pure haskell implementation of xorshift128plus random number generator";
        license = stdenv.lib.licenses.publicDomain;
@@ -16108,7 +16504,7 @@ self: {
        sha256 = "1r2n1vbzq755p68fzb5f6fm1yjfq2c5jgx52ri9p5rlrwmfk3hw5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base data-accessor-transformers fclabels monads-fd random SDL
          SDL-image SDL-mixer SDL-ttf transformers
        ];
@@ -16124,7 +16520,7 @@ self: {
        pname = "YFrob";
        version = "0.4";
        sha256 = "17pp79yr8jfmhx85vlr5kx7q5wha48p3ra7l4ligd583yxzvlnif";
-       buildDepends = [ array base HGL Yampa ];
+       libraryHaskellDepends = [ array base HGL Yampa ];
        homepage = "http://www.haskell.org/yampa/";
        description = "Yampa-based library for programming robots";
        license = stdenv.lib.licenses.bsd3;
@@ -16149,7 +16545,7 @@ self: {
        sha256 = "0qa7m9y3dclr2r2vpd2cmpc58nib158hnr49hrdjvk00ncd4lyvk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder blaze-html bytestring case-insensitive
          clientsession conduit containers data-default directory filepath
          hamlet hjsmin http-conduit http-types mime-mail monad-control mtl
@@ -16177,9 +16573,10 @@ self: {
        sha256 = "0nk7zw3ikv459hzrs0si06j4qf2yrgggsiv8vpm0r1lg5v5l3vng";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers directory dlist HUnit regex-compat
+       libraryHaskellDepends = [
+         base bytestring containers dlist HUnit regex-compat
        ];
+       executableHaskellDepends = [ directory ];
        homepage = "http://www.ben-kiki.org/oren/YamlReference";
        description = "YAML reference implementation";
        license = "LGPL";
@@ -16192,7 +16589,7 @@ self: {
        pname = "Yampa";
        version = "0.10.2";
        sha256 = "1pmszrbf1fxid4km0jdam8iqfba2mfyz8mzn6vxfb0da19vlz4cq";
-       buildDepends = [ base deepseq random ];
+       libraryHaskellDepends = [ base deepseq random ];
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -16206,8 +16603,9 @@ self: {
        sha256 = "06mgmnj8zsnfzg3li3nw4a5lmiz0jkc4hxzilwhh1r84qiki72xp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base deepseq random vector-space ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base deepseq random vector-space ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/ony/Yampa-core";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -16223,7 +16621,9 @@ self: {
        sha256 = "028a7lrfyikvky52s19kffssnry1grnip3sm7z55bs5fazma1im1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bytestring containers HCodecs Yampa ];
+       executableHaskellDepends = [
+         array base bytestring containers HCodecs Yampa
+       ];
        homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
        description = "Software synthesizer";
        license = stdenv.lib.licenses.bsd3;
@@ -16235,7 +16635,7 @@ self: {
        pname = "Yocto";
        version = "0.1.0";
        sha256 = "1krp17rw25b7a280rf3idpfzkx39kpfcjqwznz96y0d2sdqbhg6p";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        homepage = "https://github.com/ajg/yocto";
        description = "A Minimal JSON Parser & Printer for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -16249,7 +16649,7 @@ self: {
        pname = "Yogurt";
        version = "0.4.1";
        sha256 = "04fzixjgsn0azx2dp352kipxdijfafsm5dnrcvxpxdxms35npffq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl network old-locale process readline regex-posix
          syb time
        ];
@@ -16269,11 +16669,11 @@ self: {
        sha256 = "151kamqwdwnhinvsmzdq9ckryyvnrf9ihzw6qm4j851y375452hl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers hint mtl network old-locale process regex-posix syb
          time Yogurt
        ];
-       extraLibraries = [ readline ];
+       executableSystemDepends = [ readline ];
        homepage = "http://code.google.com/p/yogurt-mud/";
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
@@ -16286,7 +16686,7 @@ self: {
        pname = "ZEBEDDE";
        version = "0.1.0.0";
        sha256 = "1i85pah79342ivmcg73q305awbf9fi6gw4ckg9i019d6vmdg5d17";
-       buildDepends = [ base vect ];
+       libraryHaskellDepends = [ base vect ];
        jailbreak = true;
        description = "Polymer growth simulation method";
        license = stdenv.lib.licenses.bsd3;
@@ -16299,7 +16699,9 @@ self: {
        pname = "ZFS";
        version = "0.0.2";
        sha256 = "1mwpcgkw1cci2grhb8vl081wykkgsmfbanwapp10mrzzp0df1yzr";
-       buildDepends = [ base CC-delcont containers mtl network unix ];
+       libraryHaskellDepends = [
+         base CC-delcont containers mtl network unix
+       ];
        homepage = "https://github.com/jkarni/ZipperFS";
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
@@ -16314,7 +16716,7 @@ self: {
        sha256 = "1s005k892z9651mr2jj0jdwpm8aa0y72vi405xi4h6czg52i4rb3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base gtk mtl random ];
+       executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16326,7 +16728,7 @@ self: {
        pname = "ZipFold";
        version = "0.1.4";
        sha256 = "05cnpl9c6i0j8jqr4j43b32jgryv34gahimhp9g1m45idgnl2sn0";
-       buildDepends = [ base TypeCompose ];
+       libraryHaskellDepends = [ base TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/ZipFold";
        description = "Zipping folds";
        license = stdenv.lib.licenses.bsd3;
@@ -16338,7 +16740,7 @@ self: {
        pname = "ZipperAG";
        version = "0.9";
        sha256 = "0nl08r7s3r5hr5jag499fillca16wsb8yqz1dlzydvacqcklcxr9";
-       buildDepends = [ base syz ];
+       libraryHaskellDepends = [ base syz ];
        homepage = "www.di.uminho.pt/~prmartins";
        description = "An implementationg of Attribute Grammars using Functional Zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -16352,11 +16754,11 @@ self: {
        pname = "Zora";
        version = "1.2.0";
        sha256 = "1yni2yq8ynq9jhnzabyx0ahmvmvcyblc0swxy0n7qdzlz5rxzm3i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory fgl graphviz random shelly
          text
        ];
-       testDepends = [ base containers random tasty tasty-hunit ];
+       testHaskellDepends = [ base containers random tasty tasty-hunit ];
        homepage = "http://github.com/bgwines/zora";
        description = "Graphing library wrapper + assorted useful functions";
        license = stdenv.lib.licenses.bsd3;
@@ -16368,7 +16770,7 @@ self: {
        pname = "Zwaluw";
        version = "0.1";
        sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/Zwaluw";
        description = "Combinators for bidirectional URL routing";
        license = stdenv.lib.licenses.bsd3;
@@ -16385,7 +16787,7 @@ self: {
        sha256 = "0jfnf0rq3rfic196zjwbaiamyis98zrr8d4zn2myjlgqlzhljzs0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base biofasta biopsl cmdargs containers directory process
        ];
        homepage = "http://blog.malde.org/index.php/a50-a-graphical-comparison-of-genome-assemblies";
@@ -16399,8 +16801,8 @@ self: {
        pname = "abacate";
        version = "0.0.0.0";
        sha256 = "1lxsn3n77fk7jl8i76nffj1zngvi2s38y17s54ha29h8hrp3s3dg";
-       buildDepends = [ base parsec text ];
-       testDepends = [ base HUnit text ];
+       libraryHaskellDepends = [ base parsec text ];
+       testHaskellDepends = [ base HUnit text ];
        jailbreak = true;
        homepage = "http://github.com/marcotmarcot/abacate";
        description = "Parser for a language similar to Cucumber's Gherkin";
@@ -16416,7 +16818,9 @@ self: {
        sha256 = "0i162j9wlpcisqzf9klqvag9hrs9v7araw4l16cvw0yrifvqzswd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base minisat random random-shuffle Safe ];
+       executableHaskellDepends = [
+         array base minisat random random-shuffle Safe
+       ];
        homepage = "https://github.com/pa-ba/abc-puzzle";
        description = "Generate instances of the ABC Logic Puzzle";
        license = stdenv.lib.licenses.bsd3;
@@ -16433,13 +16837,14 @@ self: {
        sha256 = "1ki5h3058n3kpvaspl8g1vadprw6kb3xxyadb3a4k1irkfz8lfkf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aig base containers directory vector ];
-       testDepends = [
+       libraryHaskellDepends = [ aig base containers directory vector ];
+       librarySystemDepends = [ abc ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          aig base directory QuickCheck tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck vector
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ abc ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16451,7 +16856,9 @@ self: {
        pname = "abcnotation";
        version = "1.9.0";
        sha256 = "0vmpgdqasnhj0fbb5wl7ikxmp6kzrlnbixp2yj4x93mh8vrrsk40";
-       buildDepends = [ base parsec prettify process semigroups ];
+       libraryHaskellDepends = [
+         base parsec prettify process semigroups
+       ];
        description = "Haskell representation and parser for ABC notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16464,10 +16871,10 @@ self: {
      mkDerivation {
        pname = "abeson";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "1g258gfk7sk8hsd4nixah0vj69rwphvv6aywsvdldm8pbw51sy1c";
+       revision = "1";
        editedCabalFile = "fc1839c19327f8fb9b36d2aa6dd133e3d391696183b3292894f9f7e1ca188727";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bson bytestring data-default-class
          scientific text time unordered-containers uuid vector
        ];
@@ -16483,7 +16890,7 @@ self: {
        pname = "abstract-deque";
        version = "0.3";
        sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
-       buildDepends = [ array base containers random time ];
+       libraryHaskellDepends = [ array base containers random time ];
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "Abstract, parameterized interface to mutable Deques";
        license = stdenv.lib.licenses.bsd3;
@@ -16497,11 +16904,11 @@ self: {
        pname = "abstract-deque-tests";
        version = "0.3";
        sha256 = "19gb5x5z3nvazdra3skm24c2g2byj0i4cjbzfwfghnb5q96gn5sz";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque array base containers HUnit random test-framework
          test-framework-hunit time
        ];
-       testDepends = [
+       testHaskellDepends = [
          abstract-deque array base containers HUnit random test-framework
          test-framework-hunit time
        ];
@@ -16516,7 +16923,7 @@ self: {
        pname = "abstract-par";
        version = "0.3.3";
        sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/simonmar/monad-par";
        description = "Type classes generalizing the functionality of the 'monad-par' library";
        license = stdenv.lib.licenses.bsd3;
@@ -16528,7 +16935,9 @@ self: {
        pname = "abstract-par-accelerate";
        version = "0.3.3";
        sha256 = "0k1730mg2vyf21837fc459m8si1ffnbj78cdkbgglp2vn51f3nz4";
-       buildDepends = [ abstract-par accelerate array base vector ];
+       libraryHaskellDepends = [
+         abstract-par accelerate array base vector
+       ];
        homepage = "https://github.com/simonmar/monad-par";
        description = "Provides the class ParAccelerate, nothing more";
        license = stdenv.lib.licenses.bsd3;
@@ -16543,7 +16952,7 @@ self: {
        pname = "abt";
        version = "0.1.1.0";
        sha256 = "1hgbzzpxn6gcs3zjs8hqz065gqk2x6gzra2b1fw9lyb2x4lw42y9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base profunctors transformers transformers-compat vinyl
        ];
        jailbreak = true;
@@ -16558,7 +16967,9 @@ self: {
        pname = "ac-machine";
        version = "0.2.0.5";
        sha256 = "00s2nvd85l00kpl45ipaq4ypa1ymaxmvnaf5mdvdladg4icl50i4";
-       buildDepends = [ base hashable unordered-containers vector ];
+       libraryHaskellDepends = [
+         base hashable unordered-containers vector
+       ];
        jailbreak = true;
        description = "Aho-Corasick string matching algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -16570,7 +16981,7 @@ self: {
        pname = "ac-machine-conduit";
        version = "0.1.0.0";
        sha256 = "1nsnbvllwznbqycw33f09vfgqvqmqfkcbi367clm6k4v6rfswzl3";
-       buildDepends = [ ac-machine base conduit text ];
+       libraryHaskellDepends = [ ac-machine base conduit text ];
        jailbreak = true;
        description = "Drive Aho-Corasick machines in Conduit pipelines";
        license = stdenv.lib.licenses.bsd3;
@@ -16585,7 +16996,7 @@ self: {
        pname = "accelerate";
        version = "0.15.1.0";
        sha256 = "07bbam9za0g15vm0h0p9dypblw2f709v4qmvc52jcvmsv1drl3yv";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers fclabels ghc-prim hashable hashtables pretty
          template-haskell unordered-containers
        ];
@@ -16602,10 +17013,10 @@ self: {
        pname = "accelerate-arithmetic";
        version = "0.0.1";
        sha256 = "093j1wdabhws695hfb4cmj05ys6i4hkh0yppkszmhn5z4imlv741";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-utility base QuickCheck utility-ht
        ];
-       testDepends = [ accelerate base QuickCheck ];
+       testHaskellDepends = [ accelerate base QuickCheck ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-arithmetic/";
        description = "Linear algebra and interpolation using the Accelerate framework";
@@ -16624,9 +17035,13 @@ self: {
        sha256 = "1dcra6qpva8sg5bdh6ilrfdg44h7p6dfh7vkrhifiim4vkvgh9sc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-cuda accelerate-io
-         accelerate-utility base cublas cuda random utility-ht vector
+         accelerate-utility base cublas cuda utility-ht vector
+       ];
+       executableHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-cuda accelerate-utility
+         base cublas random
        ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-cublas/";
@@ -16644,10 +17059,10 @@ self: {
      mkDerivation {
        pname = "accelerate-cuda";
        version = "0.15.0.0";
-       revision = "2";
        sha256 = "1z8nfciwxm2f2vaddnhan5gi9i1l7qa9h9fsngmdh8d6wabxxidy";
+       revision = "2";
        editedCabalFile = "5ed199c4c1d360ed3eaee24df7016462ed1fb1313ff47d6828be546eec8708fc";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate array base binary bytestring cryptohash cuda directory
          fclabels filepath hashable hashtables language-c-quote
          mainland-pretty mtl old-time pretty process SafeSemaphore srcloc
@@ -16669,7 +17084,7 @@ self: {
        sha256 = "12faz5z0k682381fgwav91wx5wny0n5jdzgnrajx3sxc8gpg5xd7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-cuda accelerate-fourier accelerate-utility
          base cuda cufft
        ];
@@ -16684,13 +17099,13 @@ self: {
      mkDerivation {
        pname = "accelerate-examples";
        version = "0.15.0.0";
-       revision = "1";
        sha256 = "1jfwb0ryb8idfjc1gccb1h67hl730qn455k5z5wna8aikfscy7rq";
+       revision = "1";
        editedCabalFile = "2cf8a02096ae9902b9336ce9d0665b3233abb20381d0cb4585efc53357d795cc";
+       configureFlags = [ "-f-opencl" ];
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ accelerate-cuda ekg ];
-       configureFlags = [ "-f-opencl" ];
+       executableHaskellDepends = [ accelerate-cuda ekg ];
        homepage = "https://github.com/AccelerateHS/accelerate-examples";
        description = "Examples using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
@@ -16701,10 +17116,12 @@ self: {
      mkDerivation {
        pname = "accelerate-fft";
        version = "0.15.0.0";
-       revision = "1";
        sha256 = "0nxlw8z7bnr29vp24qbbwwmq9rj2q6jqqkmm46pp8dp582y4yk6v";
+       revision = "1";
        editedCabalFile = "c23b93ae20f528782aeb10b528fa2a7847cce5c1aa9db546f3b000d7f05f53ca";
-       buildDepends = [ accelerate accelerate-cuda base cuda cufft ];
+       libraryHaskellDepends = [
+         accelerate accelerate-cuda base cuda cufft
+       ];
        jailbreak = true;
        homepage = "https://github.com/AccelerateHS/accelerate-fft";
        description = "FFT using the Accelerate library";
@@ -16719,7 +17136,7 @@ self: {
        pname = "accelerate-fftw";
        version = "0.0";
        sha256 = "03ffsa6xshhrx8a4grld128g46x2nkkydwql8h7jw7b2igr7i1ks";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-io base carray fft storable-complex
        ];
        jailbreak = true;
@@ -16738,11 +17155,11 @@ self: {
        pname = "accelerate-fourier";
        version = "0.0";
        sha256 = "0b7cm540im3z9ja7a68sbs5y0ayzbx5h4sbwr437f05qdwkg7b2q";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-utility base containers
          QuickCheck transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-utility base QuickCheck
          utility-ht
        ];
@@ -16763,7 +17180,7 @@ self: {
        sha256 = "1679sn9ajn6fmj9pdgjdr434vcgj05chvn2fld3sri16q3jbqrga";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          accelerate accelerate-cuda accelerate-cufft accelerate-fftw
          accelerate-fourier base criterion
        ];
@@ -16780,10 +17197,10 @@ self: {
      mkDerivation {
        pname = "accelerate-io";
        version = "0.15.0.0";
-       revision = "1";
        sha256 = "00p8jmxsgywhx30nd44pl6hdcr076y2s6z2fsam6sgrmgr0qx936";
+       revision = "1";
        editedCabalFile = "5c3f8f7ebc03117652646329743ea251d281f72d81454e55538c27e87e8c0ecc";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate array base bmp bytestring repa vector
        ];
        jailbreak = true;
@@ -16799,7 +17216,7 @@ self: {
        pname = "accelerate-utility";
        version = "0.1";
        sha256 = "1n5hyklil2x2x5bc5z7iq0yz4p8lab8xxdnlwzgjpn3lliq0vgpv";
-       buildDepends = [ accelerate base utility-ht ];
+       libraryHaskellDepends = [ accelerate base utility-ht ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-utility/";
        description = "Utility functions for the Accelerate framework";
@@ -16813,7 +17230,7 @@ self: {
        pname = "accentuateus";
        version = "0.9.4";
        sha256 = "16hgs81cs3zgbvsprh9lzvyxbh58g7rijf1d4j0dkrpnqnrvg0hy";
-       buildDepends = [ base bytestring HTTP json network text ];
+       libraryHaskellDepends = [ base bytestring HTTP json network text ];
        jailbreak = true;
        homepage = "http://accentuate.us/";
        description = "A Haskell implementation of the Accentuate.us API.";
@@ -16827,7 +17244,7 @@ self: {
        pname = "access-time";
        version = "0.1.0.4";
        sha256 = "13kg8mjrnif88r0w7b041x4vmzdm9aqrx4fskc3qv3smpq2q2ngs";
-       buildDepends = [ base filepath old-time time unix ];
+       libraryHaskellDepends = [ base filepath old-time time unix ];
        jailbreak = true;
        homepage = "http://www.github.com/batterseapower/access-time";
        description = "Cross-platform support for retrieving file access times";
@@ -16843,10 +17260,12 @@ self: {
        pname = "ace";
        version = "0.6";
        sha256 = "0f07j2rj9ylvdrijwwlpx66mj503mhjfq1x2mylpxkr6kmjjniyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup data-default parsec text
        ];
-       testDepends = [ base bifunctors hspec HUnit mtl parsec text ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
        description = "Attempto Controlled English parser and printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16860,7 +17279,7 @@ self: {
        pname = "acid-state";
        version = "0.12.4";
        sha256 = "0mb2p29pi9dhby2bwn6zkg1nn3sf6vr7xzf6npx3738ffj3b2bad";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers directory
          extensible-exceptions filepath mtl network safecopy stm
          template-haskell unix
@@ -16878,7 +17297,7 @@ self: {
        pname = "acid-state-tls";
        version = "0.9.2";
        sha256 = "04w3r1x3msvsixmdlif99ly4k0py9bzb8pgi06j780zz5lpm1zpi";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state base directory HsOpenSSL network safecopy
        ];
        jailbreak = true;
@@ -16893,7 +17312,7 @@ self: {
        pname = "acl2";
        version = "0.0.1";
        sha256 = "0bwlsdxk3lbir90xhar7xd83cwarqcm0a86gvwaghknpil2ay4cg";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        description = "Writing and calling ACL2 from Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16904,7 +17323,7 @@ self: {
        pname = "acme-all-monad";
        version = "0.1.0.0";
        sha256 = "1qay7m16yjsjg8anbinkagb2v8r67k5wsppkrwyskn9jcb1wnbgv";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        description = "A monad which is powerful enough to interpret any action";
        license = stdenv.lib.licenses.publicDomain;
@@ -16918,8 +17337,9 @@ self: {
        sha256 = "0n6mawj9kq6s84j4yxwqabhni7kzgvhmhxi9dw1mrwnxkh5ial8v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/drwebb/acme-box";
        description = "A full featured empty project";
        license = stdenv.lib.licenses.bsd3;
@@ -16931,7 +17351,7 @@ self: {
        pname = "acme-cadre";
        version = "0.1";
        sha256 = "1nclcq48r547rgmd4h0hf498z27d15lp4da9yb3a3sy7qk6m92bi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "car, cdr and more";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -16942,7 +17362,7 @@ self: {
        pname = "acme-cofunctor";
        version = "0.1.0.0";
        sha256 = "06ii13zfr5iqf0cxaw35mxjxx16q0n7mvbgnqv0gwyfmgm3vxv6m";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jaspervdj/acme-cofunctor";
        description = "A Cofunctor is a structure from category theory dual to Functor";
        license = stdenv.lib.licenses.bsd3;
@@ -16954,7 +17374,7 @@ self: {
        pname = "acme-colosson";
        version = "0.1";
        sha256 = "0mfnav0wb0ks365n3kghaic6nasp3qaznhmsdccx35h164ixj9vc";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        description = "Determines whether it is numberwang";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16965,7 +17385,7 @@ self: {
        pname = "acme-comonad";
        version = "0.1.0.0";
        sha256 = "1sc0alwdgfls18y4q4y0qkbzqm4fgzd9yv6dwwnzw3472vsz2x8s";
-       buildDepends = [ base comonad ];
+       libraryHaskellDepends = [ base comonad ];
        jailbreak = true;
        description = "A more efficient dualization";
        license = stdenv.lib.licenses.bsd3;
@@ -16979,7 +17399,8 @@ self: {
        sha256 = "1vvhfncnrq4pbzrgq45kannqv1c029b96lvi1qzwvzf513rqfb3z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/Fuuzetsu/acme-cutegirl";
        description = "Maybe gives you a cute girl";
        license = stdenv.lib.licenses.gpl3;
@@ -16991,7 +17412,7 @@ self: {
        pname = "acme-dont";
        version = "1.1";
        sha256 = "1kj3qjgn1rz093050z49w3js4is9p0g9pk5g7d7wvg28hpzk28n3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A don't construct";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17002,7 +17423,7 @@ self: {
        pname = "acme-flipping-tables";
        version = "0";
        sha256 = "1xl5gwc67acg47fdkgrn7sjvvvnc4sjf5vifph0jb3c7gv93n757";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jystic/acme-flipping-tables";
        description = "Stop execution with rage";
        license = stdenv.lib.licenses.bsd3;
@@ -17014,7 +17435,7 @@ self: {
        pname = "acme-hq9plus";
        version = "0.1";
        sha256 = "0da4ysj74fmhcbbvxxfb6w97pr870518k90vwnc3z8kglj1ni187";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/joeyadams/haskell-acme-hq9plus";
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
@@ -17031,7 +17452,7 @@ self: {
        sha256 = "1nmv8ilh783jrp6mxl308ybv032xi833awhsys7svma3l9v5i4gi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-exceptions mtl network pretty
        ];
        jailbreak = true;
@@ -17048,7 +17469,8 @@ self: {
        sha256 = "1h1vdzqarrmb8sl6y6250h6fia4rxi9vz4i4sj7km7nyk3778zyk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17060,7 +17482,7 @@ self: {
        pname = "acme-io";
        version = "0.1.0.1";
        sha256 = "091czdcbydc75ndaw2ns8cncxa6ihlvclhrbcz9vp29kvhf483cb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "N/A";
        description = "The only true way to do IO in Haskell!";
@@ -17073,7 +17495,7 @@ self: {
        pname = "acme-lolcat";
        version = "0.1.1";
        sha256 = "08issbr9lgc2saqvgs80sxl1sgi7ig5jg6iykv1g1zl5k1kv2a32";
-       buildDepends = [ base parsec random random-shuffle text ];
+       libraryHaskellDepends = [ base parsec random random-shuffle text ];
        homepage = "https://github.com/llelf/acme-lolcat";
        description = "LOLSPEAK translator";
        license = stdenv.lib.licenses.bsd3;
@@ -17085,7 +17507,7 @@ self: {
        pname = "acme-lookofdisapproval";
        version = "0.1";
        sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/llelf/acme-lookofdisapproval";
        description = "Express your disapproval";
        license = stdenv.lib.licenses.bsd3;
@@ -17097,7 +17519,7 @@ self: {
        pname = "acme-memorandom";
        version = "0.0.3";
        sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi";
-       buildDepends = [ base MemoTrie random ];
+       libraryHaskellDepends = [ base MemoTrie random ];
        homepage = "https://github.com/ion1/acme-memorandom";
        description = "Memoized random number generation";
        license = stdenv.lib.licenses.mit;
@@ -17109,7 +17531,7 @@ self: {
        pname = "acme-microwave";
        version = "0.1.0.2";
        sha256 = "136lwxcimj241nq9l0x7icxk1q9xz826sg07d40yj87shir52j39";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The eighth wonder of the world, kitchen math!";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17120,7 +17542,7 @@ self: {
        pname = "acme-miscorder";
        version = "0.1.0.0";
        sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        jailbreak = true;
        description = "Miscellaneous newtypes for orderings of discutable use";
        license = stdenv.lib.licenses.publicDomain;
@@ -17132,7 +17554,7 @@ self: {
        pname = "acme-missiles";
        version = "0.3";
        sha256 = "0nvkgdj04i21gq5k541an8zjz0hzzy7dpi384yrhcyh14jsxhqz5";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Cause serious international side effects";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -17143,7 +17565,7 @@ self: {
        pname = "acme-now";
        version = "1.0.0.1";
        sha256 = "0lnrsndx7r00b7vgh9jmp5j635m4pb2bzx0lfhqidkzfc2llzwsm";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        description = "An interface to the philosophical and metaphysical \"now\"";
        license = stdenv.lib.licenses.publicDomain;
@@ -17155,7 +17577,7 @@ self: {
        pname = "acme-numbersystem";
        version = "0.3.0.0";
        sha256 = "1p5rdssdmds6yqgv3yvlh835h180h9q9430j8i6qrhygqn8lmv87";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        description = "Define the less than and add and subtract for nats";
        license = stdenv.lib.licenses.bsd3;
@@ -17168,8 +17590,8 @@ self: {
        pname = "acme-omitted";
        version = "2.0.0.0";
        sha256 = "0pj6jlm4i05m0nys8d66d0xfkhfz6gfa9122bsk64xcms5n0hxad";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/joachifm/acme-omitted#readme";
        description = "A name for omitted definitions";
        license = stdenv.lib.licenses.bsd3;
@@ -17192,7 +17614,7 @@ self: {
        pname = "acme-operators";
        version = "0.2.0.0";
        sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/phadej/acme-operators#readme";
        description = "Operators of base, all in one place!";
        license = stdenv.lib.licenses.bsd3;
@@ -17204,7 +17626,7 @@ self: {
        pname = "acme-php";
        version = "0.0.3";
        sha256 = "091ddg3441ac6hbzd84jzakll7nvz2r6mcfdwxy8d7rd8wx9jdyz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17215,7 +17637,7 @@ self: {
        pname = "acme-pointful-numbers";
        version = "0.1.2.4";
        sha256 = "02gml2db5vigkwkx99lqzjkpfaqdc74x16bgdx62kf7r3nn37my9";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        description = "Make more than one point in numeric literals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17226,7 +17648,7 @@ self: {
        pname = "acme-realworld";
        version = "0.1.1";
        sha256 = "0ffhichjhhic7d5cjypmd2zmcq0dpqiz5ygsw0y67v83hry0vf8r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Primitives for manipulating the state of the universe";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17237,7 +17659,7 @@ self: {
        pname = "acme-safe";
        version = "0.1.0.0";
        sha256 = "0bmv45b3v45967gdvsy37xfw6x50qpl8234y20m3nc48f4nf0z68";
-       buildDepends = [ acme-dont base ];
+       libraryHaskellDepends = [ acme-dont base ];
        homepage = "http://github.com/fgaz/acme-safe";
        description = "Safe versions of some infamous haskell functions such as fromJust";
        license = "unknown";
@@ -17251,8 +17673,8 @@ self: {
        pname = "acme-schoenfinkel";
        version = "0.1.1";
        sha256 = "0jvbrivxpq8jb5rhz6j3pxx2g3d0ckviprp4iza31d6ik7cpk8ad";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -17267,7 +17689,7 @@ self: {
        pname = "acme-strfry";
        version = "0.1";
        sha256 = "1r6xnkyx22khzq6hlb8bk0fnbb6hlwbf12wajhx8vcxa7bkhh8lb";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/ehird/acme-strfry";
        description = "A binding to the glibc strfry function";
@@ -17280,7 +17702,7 @@ self: {
        pname = "acme-stringly-typed";
        version = "1.0.0.0";
        sha256 = "18wvsvdmbwh9dcawiy4f9pn4vg98kdq9zxc37sz7dpmaigimw16f";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Stringly Typed Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -17292,7 +17714,7 @@ self: {
        pname = "acme-strtok";
        version = "0.1.0.3";
        sha256 = "1anj8yygzcqkl4nwqwbrmwsqda84qcl8yzq7pgx2b7p895xcfa68";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A Haskell port of the C/PHP strtok function";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -17303,7 +17725,7 @@ self: {
        pname = "acme-timemachine";
        version = "0.0.1.0";
        sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb";
-       buildDepends = [ base ghc-prim mtl transformers ];
+       libraryHaskellDepends = [ base ghc-prim mtl transformers ];
        description = "An easy way to perform and unperform IO and other stateful actions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17314,8 +17736,8 @@ self: {
        pname = "acme-year";
        version = "2015";
        sha256 = "1ymsxy51vi2i75jkq0hfm2ii8qp78c3g35ijma0ygcrq9mmm12rv";
-       buildDepends = [ base ];
-       testDepends = [ base time ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base time ];
        homepage = "http://github.com/joeyadams/hs-acme-year";
        description = "Get the current year";
        license = stdenv.lib.licenses.publicDomain;
@@ -17340,7 +17762,7 @@ self: {
        pname = "action-permutations";
        version = "0.0.0.1";
        sha256 = "0rhlzpwshixpnqma7sk28f22dkwz39b6lcwnzmd31rcnz5cyw6d4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Execute a set of actions (e.g. parsers) in each possible order";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17353,10 +17775,10 @@ self: {
        pname = "active";
        version = "0.2.0.4";
        sha256 = "1xm2y8knqhd883c41194h323vchv4hx57wl32l9f64kf7gdglag0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
        description = "Abstractions for animation";
@@ -17377,7 +17799,7 @@ self: {
        sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          activehs-base array base blaze-html bytestring cmdargs containers
          data-pprint deepseq dia-base dia-functions directory filepath
          haskell-src-exts highlighting-kate hint hoogle mtl old-locale
@@ -17396,7 +17818,7 @@ self: {
        pname = "activehs-base";
        version = "0.3.0.3";
        sha256 = "1q433by9ygs7rrjj8z76hg94zyh2cp4qiwsv7q1mywr5scfccn32";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
@@ -17408,7 +17830,9 @@ self: {
        pname = "activitystreams-aeson";
        version = "0.2.0.1";
        sha256 = "1bprj41552zr1aj0k73c3skdhg8jb60rhcm9p9hjcmy2al9izsag";
-       buildDepends = [ aeson base text time unordered-containers ];
+       libraryHaskellDepends = [
+         aeson base text time unordered-containers
+       ];
        jailbreak = true;
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
@@ -17420,7 +17844,7 @@ self: {
        pname = "actor";
        version = "0.1.1";
        sha256 = "1ic74yrfy6hk7217vh2ff6yacvf3dc5m1hjkcpfvxzdk5xhdv2b5";
-       buildDepends = [ base haskell98 stm time ];
+       libraryHaskellDepends = [ base haskell98 stm time ];
        homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html";
        description = "Actors with multi-headed receive clauses";
        license = stdenv.lib.licenses.bsd3;
@@ -17436,11 +17860,11 @@ self: {
        pname = "ad";
        version = "4.2.3";
        sha256 = "0w9nd8llzcjb91x1d3mh5482pavbx1jpn8w2ahm6ydjwvijjd9r5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad containers data-reify erf free nats reflection
          transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
@@ -17453,7 +17877,7 @@ self: {
        pname = "adaptive-containers";
        version = "0.3";
        sha256 = "16h0zi55hf9g07xisbcmgkx72m9laiqykh2r9nh2siczx3sxi1qk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~dons/code/adaptive-containers";
        description = "Self optimizing container types";
        license = stdenv.lib.licenses.bsd3;
@@ -17466,7 +17890,7 @@ self: {
        pname = "adaptive-tuple";
        version = "0.2.0";
        sha256 = "1kf4d3qf8nv61c7pajv234b2vil84c2cq40csnm456lg55qh53r1";
-       buildDepends = [ base template-haskell type-level ];
+       libraryHaskellDepends = [ base template-haskell type-level ];
        homepage = "http://inmachina.net/~jwlato/haskell/";
        description = "Self-optimizing tuple types";
        license = stdenv.lib.licenses.bsd3;
@@ -17480,7 +17904,9 @@ self: {
        pname = "adb";
        version = "0.1.0.0";
        sha256 = "17dxvdzmg3i8n0gbgbj0jyhm90w0dq7j27id8n24frild2w4c0d0";
-       buildDepends = [ base bytestring cereal containers mtl network ];
+       libraryHaskellDepends = [
+         base bytestring cereal containers mtl network
+       ];
        jailbreak = true;
        description = "Android Debug Bridge (ADB) protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -17497,7 +17923,7 @@ self: {
        sha256 = "1iy0dmaw48nvgq4cqlx41n51almhz1w4k7rjpgsxqbsdnlwd8zdl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath http-conduit MissingH mtl
          network network-uri old-locale parsec parsec-permutation strict
          text time
@@ -17516,7 +17942,7 @@ self: {
        sha256 = "054kcm0ibh1qdkyci36w3yxwxln56hz1yvi7gskp636nzhw5sjrw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        description = "Adds license info to the top of a file";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17530,7 +17956,7 @@ self: {
        pname = "adhoc-network";
        version = "1.0.3";
        sha256 = "1whdrmxw13nr7bb95rhqaz3klgmcwx4ai51bz5yb38nldf4ac377";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers Crypto dataenc HaXml hsgnutls network
          old-locale parsec pkcs1 random time utf8-string xml-parsec
        ];
@@ -17548,10 +17974,10 @@ self: {
        pname = "adict";
        version = "0.4.1";
        sha256 = "07w3595cwlicvwg04w9i5sg1x9d3r8c64pq0yi5pmnza7jpd5vgq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers dawg PSQueue vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers dawg QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
@@ -17570,7 +17996,7 @@ self: {
        pname = "adjunctions";
        version = "4.2.1";
        sha256 = "0vzlz2q6863ywnhvax3m5xq99x6bz1h47z7z8hmnqdfg5pa4r9k5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad containers contravariant distributive free mtl
          profunctors semigroupoids semigroups tagged transformers void
        ];
@@ -17589,7 +18015,10 @@ self: {
        sha256 = "0jc6xwh1m2hmpfclsi27233775kp4yk0wrkr498qx7fs6p7xflpv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754 language-css mtl pretty
+       ];
+       executableHaskellDepends = [
          base binary bytestring data-binary-ieee754 language-css mtl pretty
        ];
        jailbreak = true;
@@ -17610,8 +18039,8 @@ self: {
        sha256 = "1lmmyxa22lm9a86w0gap8g676mnh5l1kxczbsv8ymb98fzcg6a27";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers htrace ];
-       testDepends = [
+       libraryHaskellDepends = [ array base containers htrace ];
+       testHaskellDepends = [
          array base containers htrace HUnit mtl QuickCheck random-shuffle
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -17632,8 +18061,8 @@ self: {
        sha256 = "13zlmhgyf46pcnrjwcrk7l6nmrkgqvycrajq3v7z72kjixakis6s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ adp-multi base containers monadiccp ];
-       testDepends = [
+       libraryHaskellDepends = [ adp-multi base containers monadiccp ];
+       testHaskellDepends = [
          adp-multi base containers monadiccp mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -17645,24 +18074,24 @@ self: {
      }) {};
 
   "aeson_0_7_0_6" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
-     , old-locale, QuickCheck, scientific, syb, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, unordered-containers, vector
+    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+     , dlist, ghc-prim, hashable, HUnit, mtl, old-locale, QuickCheck
+     , scientific, syb, template-haskell, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
        version = "0.7.0.6";
-       revision = "1";
        sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
+       revision = "1";
        editedCabalFile = "8b87a1343dd8d93d98e48e530f2ec14f5949fcdc96c8ecc81458a1d20defd001";
-       buildDepends = [
-         attoparsec base blaze-builder bytestring containers deepseq dlist
-         ghc-prim hashable mtl old-locale scientific syb template-haskell
-         text time unordered-containers vector
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist ghc-prim
+         hashable mtl old-locale scientific syb template-haskell text time
+         unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers ghc-prim HUnit QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
@@ -17674,22 +18103,22 @@ self: {
      }) {};
 
   "aeson" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
-     , QuickCheck, scientific, syb, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, time
-     , transformers, unordered-containers, vector
+    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+     , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
+     , syb, template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
        version = "0.9.0.1";
        sha256 = "1g7qdq7zpyvqwmh4sfhizqpb51cg24lrcj9vq5msz8k896y7vfcj";
-       buildDepends = [
-         attoparsec base blaze-builder bytestring containers deepseq dlist
-         ghc-prim hashable mtl scientific syb template-haskell text time
-         transformers unordered-containers vector
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist ghc-prim
+         hashable mtl scientific syb template-haskell text time transformers
+         unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers ghc-prim HUnit QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
@@ -17705,7 +18134,7 @@ self: {
        pname = "aeson-applicative";
        version = "0.1.0.0";
        sha256 = "0plbpln1glmf8a53f4nag1lx7sy8lcali6f1m526zifgak99p3qz";
-       buildDepends = [ aeson base text unordered-containers ];
+       libraryHaskellDepends = [ aeson base text unordered-containers ];
        jailbreak = true;
        homepage = "https://github.com/gregwebs/aeson-applicative-dsl";
        description = "make To/From JSOn instances from an applicative description";
@@ -17721,7 +18150,7 @@ self: {
        pname = "aeson-better-errors";
        version = "0.9.0";
        sha256 = "00b9mjf636pfgg50961y86qbkpix19x5pvbzlha0mr0icqqaan76";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring dlist mtl scientific text transformers
          transformers-compat unordered-containers vector void
        ];
@@ -17738,7 +18167,7 @@ self: {
        pname = "aeson-bson";
        version = "0.3.0";
        sha256 = "0a4hrx56q1kfvf2ff9flsmrpgpvz3rshri9dpj4a9bf76ah04jn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array attoparsec base bson bytestring containers text
          unordered-containers vector
        ];
@@ -17754,10 +18183,10 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-casing";
-       version = "0.1.0.1";
-       sha256 = "0paspgxayshz007gibijrh4j141q0lxshl6h9nyn24lbkrs62nnb";
-       buildDepends = [ aeson base ];
-       testDepends = [
+       version = "0.1.0.2";
+       sha256 = "07r19341n6k5pxk0xr7y5sylxgd9ryyhj7gx2irxhqsg9hn11yax";
+       libraryHaskellDepends = [ aeson base ];
+       testHaskellDepends = [
          aeson base tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "Tools to change the formatting of field names in Aeson instances";
@@ -17776,11 +18205,14 @@ self: {
        sha256 = "00bmvdnqhw364i1j2f1n2didfzpgs93ia8djmmq81adgry73xmbq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring edit-distance-vector hashable mtl
-         optparse-applicative scientific text unordered-containers vector
+       libraryHaskellDepends = [
+         aeson base bytestring edit-distance-vector hashable mtl scientific
+         text unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
          aeson base QuickCheck quickcheck-instances text
          unordered-containers vector
        ];
@@ -17797,10 +18229,10 @@ self: {
        pname = "aeson-lens";
        version = "0.5.0.0";
        sha256 = "1pr8cxkx41wi7095cp1gpqrwadwx6azcrdi1kr1ik0fs6606dkks";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring lens text unordered-containers vector
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        description = "Lens of Aeson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17813,10 +18245,10 @@ self: {
      mkDerivation {
        pname = "aeson-native";
        version = "0.3.3.2";
-       revision = "1";
        sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh";
+       revision = "1";
        editedCabalFile = "c9519a30bce75564cfbe84aade5ffb99fad12ecea1c7d2c362cca2234b8ae497";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual-native bytestring
          containers deepseq hashable mtl old-locale syb text time
          unordered-containers vector
@@ -17838,9 +18270,11 @@ self: {
        sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base bytestring cmdargs text unordered-containers
-         vector
+       libraryHaskellDepends = [
+         aeson base bytestring text unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs
        ];
        homepage = "http://github.com/informatikr/aeson-pretty";
        description = "JSON pretty-printing library and command-line tool";
@@ -17856,11 +18290,11 @@ self: {
        pname = "aeson-qq";
        version = "0.8.0";
        sha256 = "12vs3mh1a6j2r74xr11bpzb69i0k25dxplhvw15ph72kmhfbri7f";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base haskell-src-meta parsec scientific
          template-haskell text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base ghc-prim haskell-src-meta hspec parsec
          scientific template-haskell text vector
        ];
@@ -17881,12 +18315,12 @@ self: {
        pname = "aeson-schema";
        version = "0.3.0.7";
        sha256 = "1r84ih3bhnzfl3hl6a4ph4x2l25ls11py3mrxqd04kcpyqzsll5g";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
          text th-lift transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring containers directory filepath
          hashable hint HUnit mtl QuickCheck regex-compat scientific
          template-haskell temporary test-framework test-framework-hunit
@@ -17903,8 +18337,8 @@ self: {
        pname = "aeson-serialize";
        version = "0.0.0";
        sha256 = "010lbzm5ik2gdiqm8slnf9kwgbnz8ib03c901schrw5kildfxq51";
-       buildDepends = [ aeson base cereal ];
-       testDepends = [ aeson base cereal hspec HUnit ];
+       libraryHaskellDepends = [ aeson base cereal ];
+       testHaskellDepends = [ aeson base cereal hspec HUnit ];
        description = "Simple serialization functions for aeson types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17917,7 +18351,7 @@ self: {
        pname = "aeson-smart";
        version = "0.2.0.0";
        sha256 = "1r3262k6d7nskbnnam5rw5vq7i84347amz8lk6hrjn3c4bwacf35";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default template-haskell text unordered-containers
          vector
        ];
@@ -17936,7 +18370,7 @@ self: {
        pname = "aeson-streams";
        version = "0.1.0";
        sha256 = "1mmkilvjrffzbf7d024kpc4i6b72f7dbq5hrkvrzr0q7dg1mg825";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring HsOpenSSL http-streams io-streams
        ];
        jailbreak = true;
@@ -17953,10 +18387,10 @@ self: {
        pname = "aeson-t";
        version = "0.0.5";
        sha256 = "1mpqkjxsg4bpmbkj8ys39g53knw851l428x83619bmvnlrj1fkkd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-qq base bytestring hspec text unordered-containers
          vector
        ];
@@ -17972,8 +18406,8 @@ self: {
        pname = "aeson-toolkit";
        version = "0.0.1";
        sha256 = "07cb4f4zwm64x0q5z63gsskl80s6qbwnk4nl6x2jiardcl3k8cl3";
-       buildDepends = [ aeson base bytestring failure text ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ aeson base bytestring failure text ];
+       testHaskellDepends = [ base hspec ];
        description = "A generalization of Aeson over Failure";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -17986,7 +18420,7 @@ self: {
        pname = "aeson-utils";
        version = "0.3.0.2";
        sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific text
        ];
        description = "Utilities for working with Aeson";
@@ -18001,7 +18435,7 @@ self: {
        pname = "affine-invariant-ensemble-mcmc";
        version = "0.2.0.0";
        sha256 = "116ln9zf4n0xy95nyyb3kwhg7ds36m793ys5yd5ha74vqf48gvk5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mwc-random primitive split vector
        ];
        jailbreak = true;
@@ -18019,10 +18453,10 @@ self: {
        pname = "afis";
        version = "0.1.2";
        sha256 = "0ppq3rbwszz3wczg0zgk8hjqplv2ck11bbq5xr8306s5n02ybcf9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-random cryptohash packer
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-random cryptohash HUnit mtl
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -18042,7 +18476,7 @@ self: {
        sha256 = "06p2xp5myipjhyzqak4zwr755kc1l4qljdf2bxn8rg0m7rhy01vk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory language-c mtl process yices
        ];
        jailbreak = true;
@@ -18063,7 +18497,7 @@ self: {
        sha256 = "070xszykrazkisp1lsh2q1ri1i64lhd8psz8g4blv37zm899fpga";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          Agda base cmdargs containers directory filepath HJavaScript mtl
          pandoc snap-core snap-server transformers utf8-string xhtml
        ];
@@ -18084,7 +18518,12 @@ self: {
        sha256 = "0pmnrij90xag46af4c5yws5g26pf77l5ck864f4cyw5g9acw67g6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bitwise bytestring containers data-default Diff
+         fclabels mtl network pipes pipes-concurrency pipes-network safe
+         snmp time transformers unix
+       ];
+       executableHaskellDepends = [
          base binary bitwise bytestring containers data-default Diff
          fclabels mtl network pipes pipes-concurrency pipes-network safe
          snmp time transformers unix
@@ -18101,7 +18540,8 @@ self: {
        sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        description = "Unification and Matching in an Abelian Group";
        license = "GPL";
      }) {};
@@ -18112,7 +18552,7 @@ self: {
        pname = "aig";
        version = "0.2.3";
        sha256 = "0363wr5fnryz49ksj6mvwngpqi2bj7ldgyzh6hgvmvvdz5nmmxzr";
-       buildDepends = [ base mtl QuickCheck vector ];
+       libraryHaskellDepends = [ base mtl QuickCheck vector ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18125,7 +18565,7 @@ self: {
        pname = "air";
        version = "2015.5.4";
        sha256 = "1g9zzsxhmkiqpdmmapsvvh3vq5dp5gmmyr0x7ja59529xndslwaj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath mtl text time
        ];
        homepage = "https://github.com/nfjinjing/air";
@@ -18141,7 +18581,7 @@ self: {
        pname = "air-extra";
        version = "2015.5.4";
        sha256 = "07k01yjr9kj5q0dr871w9jmf23sdd75xrwgldsrkpppfc8kvnd97";
-       buildDepends = [
+       libraryHaskellDepends = [
          air array base bytestring containers directory filepath parallel
          parsec regexpr text time
        ];
@@ -18156,7 +18596,7 @@ self: {
        pname = "air-spec";
        version = "2013.7.1";
        sha256 = "0s4y2805nmfydzxgr5lnhmyzkb6rh9mx2kpvzqqgyh4jvccdnwfx";
-       buildDepends = [ base hspec text ];
+       libraryHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/nfjinjing/air-spec";
        description = "air spec helper";
        license = stdenv.lib.licenses.bsd3;
@@ -18168,7 +18608,7 @@ self: {
        pname = "air-th";
        version = "2014.11.17";
        sha256 = "0rhp56qvwiwlrs7pvpbslybvlp4xnllfjab6pap2chxgywas34pq";
-       buildDepends = [ air base template-haskell ];
+       libraryHaskellDepends = [ air base template-haskell ];
        homepage = "https://github.com/nfjinjing/air-th";
        description = "air";
        license = stdenv.lib.licenses.bsd3;
@@ -18184,7 +18624,7 @@ self: {
        pname = "airbrake";
        version = "0.2.0.0";
        sha256 = "03z5hjrdwv8kjsj1vhipqhfmc19mi5cnjkcvcm71b0gmnpd71shq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup bytestring directory exceptions filepath
          http-conduit monad-control network semigroups template-haskell text
          transformers utf8-string wai
@@ -18210,14 +18650,18 @@ self: {
        sha256 = "118valfn96mwdl8pfrvpqgp1rg9armcwlw2r4lvvzb6ci0nyp9n8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring blaze-builder bytestring
          bytestring-trie case-insensitive cryptohash directory either
          filepath http-date http-media http-types lifted-base mime-types
          monad-control mtl network old-locale random text time transformers
-         transformers-base unix unordered-containers wai warp
+         transformers-base unix unordered-containers wai
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base blaze-builder bytestring http-types mtl text time
+         unordered-containers wai warp
+       ];
+       testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck text
          transformers wai
        ];
@@ -18232,7 +18676,9 @@ self: {
        pname = "aivika";
        version = "4.3";
        sha256 = "01vcjc6i040lp92xhxma6sp3iffam9d7nxqch6i64pajvd8cq97j";
-       buildDepends = [ array base containers mtl random vector ];
+       libraryHaskellDepends = [
+         array base containers mtl random vector
+       ];
        homepage = "http://github.com/dsorokin/aivika";
        description = "A multi-paradigm simulation library";
        license = stdenv.lib.licenses.bsd3;
@@ -18246,7 +18692,7 @@ self: {
        pname = "aivika-experiment";
        version = "4.0.3";
        sha256 = "1v0x37kmav87b3mxvribw6658glf5hbk7npipkabp1qbfz5sp7zv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aivika base containers directory filepath mtl network-uri
          parallel-io split
        ];
@@ -18263,7 +18709,7 @@ self: {
        pname = "aivika-experiment-cairo";
        version = "4.3.1";
        sha256 = "0p54ssbl0ack51gwlj962x45954v4h22mqq6zqa5r8xrbcig2pdb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-cairo
        ];
        homepage = "http://github.com/dsorokin/aivika-experiment-cairo";
@@ -18280,7 +18726,7 @@ self: {
        pname = "aivika-experiment-chart";
        version = "4.3.1";
        sha256 = "18fagq4ddvqzi6r0c850yassgncicqy0plasfn262fmhgwflpa8n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
        ];
@@ -18297,7 +18743,7 @@ self: {
        pname = "aivika-experiment-diagrams";
        version = "4.3.1";
        sha256 = "1plb44bcjnawg3fsb9crmlyzwzyiz802ldsk559ni9sb590ywr7n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-diagrams
          containers filepath
        ];
@@ -18315,7 +18761,9 @@ self: {
        pname = "aivika-transformers";
        version = "3.0";
        sha256 = "1b9hkza735g1gxr3l73fz48y29fyph89j8114wzld3ydma2f6d1z";
-       buildDepends = [ aivika array base containers mtl random vector ];
+       libraryHaskellDepends = [
+         aivika array base containers mtl random vector
+       ];
        homepage = "http://github.com/dsorokin/aivika-transformers";
        description = "Transformers for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
@@ -18334,10 +18782,15 @@ self: {
        sha256 = "1x2rc0gyyg7idc07hi64fvkv5h5a652kmcrczfxqyzbiyx2fjphs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers cpphs directory fgl
-         filepath haskeline HsSyck HTTP mtl network old-time pretty process
-         random regex-compat syb temporary unix utf8-string zlib
+         filepath haskeline HsSyck mtl old-time pretty process random
+         regex-compat syb temporary unix utf8-string zlib
+       ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory fgl filepath
+         haskeline HsSyck HTTP mtl network old-time pretty process random
+         regex-compat syb temporary unix utf8-string zlib
        ];
        homepage = "http://ajhc.metasepi.org/";
        description = "Haskell compiler that produce binary through C language";
@@ -18351,9 +18804,9 @@ self: {
        pname = "al";
        version = "0.1.4";
        sha256 = "1jr707fhsl1jvjidaznxj7xsi6br2v7gzckfhvcrmicd4i98yg1q";
-       buildDepends = [ base mtl ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ openal ];
+       libraryHaskellDepends = [ base mtl ];
+       libraryPkgconfigDepends = [ openal ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/phaazon/al";
        description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
@@ -18365,8 +18818,8 @@ self: {
        pname = "alarmclock";
        version = "0.2.0.8";
        sha256 = "1g06bnbp0y6dcz7zgbh828klk7xc1spwzw3ff6jpqh74cm82vq6f";
-       buildDepends = [ base stm time unbounded-delays ];
-       testDepends = [ base time ];
+       libraryHaskellDepends = [ base stm time unbounded-delays ];
+       testHaskellDepends = [ base time ];
        homepage = "https://bitbucket.org/davecturner/alarmclock";
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
@@ -18380,7 +18833,7 @@ self: {
        sha256 = "1j18hqyrfyyhngla4dikdchi659bi7gj1lsl38r08645hf9n5395";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ argparser base containers threefish ];
+       executableHaskellDepends = [ argparser base containers threefish ];
        homepage = "https://github.com/Rnhmjoj/alea";
        description = "a diceware passphrase generator";
        license = stdenv.lib.licenses.mit;
@@ -18388,8 +18841,8 @@ self: {
      }) {};
 
   "alex" = callPackage
-    ({ mkDerivation, array, base, containers, directory, happy, perl
-     , process, QuickCheck
+    ({ mkDerivation, array, base, containers, directory, process
+     , QuickCheck
      }:
      mkDerivation {
        pname = "alex";
@@ -18397,13 +18850,14 @@ self: {
        sha256 = "17x13nbbr79xgdlzywjqw19vcl6iygjnssjnxnajgijkv764wknn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers directory QuickCheck ];
-       testDepends = [ base process ];
-       buildTools = [ happy perl ];
+       executableHaskellDepends = [
+         array base containers directory QuickCheck
+       ];
+       testHaskellDepends = [ base process ];
        homepage = "http://www.haskell.org/alex/";
        description = "Alex is a tool for generating lexical analysers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) perl;};
+     }) {};
 
   "alex-meta" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy
@@ -18413,13 +18867,12 @@ self: {
        pname = "alex-meta";
        version = "0.3.0.8";
        sha256 = "1ja5y2dyil4h6j7q9dhrxzhry018fqc7vy3v5mrkvxyp7bhw1n9f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers haskell-src-meta QuickCheck template-haskell
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        description = "Quasi-quoter for Alex lexers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alfred" = callPackage
@@ -18429,10 +18882,10 @@ self: {
      mkDerivation {
        pname = "alfred";
        version = "0.5";
-       revision = "1";
        sha256 = "1c6ak56g29wkas66x7yhg1zk039mp2mvlp7njixchhh2c4kx9fvn";
+       revision = "1";
        editedCabalFile = "06e4b9ba672fc3d29452df70d2e9f9018ada5e8b62aa5890b9a70d9d937d6581";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring hexpat http-conduit http-types network-uri
          text xmlgen
        ];
@@ -18447,10 +18900,10 @@ self: {
      mkDerivation {
        pname = "algebra";
        version = "4.2";
-       revision = "1";
        sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs";
+       revision = "1";
        editedCabalFile = "621c4b71305b0a6a926f055608b5ca76c4c2360a523bcdf88d80fd10d20f4210";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions array base containers distributive mtl nats
          semigroupoids semigroups tagged transformers void
        ];
@@ -18468,12 +18921,11 @@ self: {
        pname = "algebra-dag";
        version = "0.1.1.1";
        sha256 = "1pr6bbj67n13bw120l82zn5bj7bj0x00b754w852pbpij03fjay9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers fgl mtl parsec template-haskell transformers
        ];
        description = "Infrastructure for DAG-shaped relational algebra plans";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebra-sql" = callPackage
@@ -18488,14 +18940,18 @@ self: {
        sha256 = "1wvm9qkixmyawwjd6ypshsmby7y7229zwidj3qhzkbmyi7p5sgzj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
+         dlist errors fgl filepath ghc-prim mtl multiset parsec pretty
+         process template-haskell text time transformers
+       ];
+       executableHaskellDepends = [
          aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
          dlist errors fgl filepath ghc-prim mtl multiset parsec pretty
          process template-haskell text time transformers
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic" = callPackage
@@ -18504,7 +18960,7 @@ self: {
        pname = "algebraic";
        version = "0.1.0.2";
        sha256 = "15gv6w9vz02960r6bd0k979vi6kj7pfxg705ajbrsd1pnwklfnwh";
-       buildDepends = [ accelerate base ];
+       libraryHaskellDepends = [ accelerate base ];
        jailbreak = true;
        homepage = "https://github.com/wdanilo/algebraic";
        description = "General linear algebra structures";
@@ -18518,7 +18974,7 @@ self: {
        pname = "algebraic-classes";
        version = "0.6";
        sha256 = "0i34n1lmnw12xrnaqvmiydnnlm8m8ky12chwb9jmnsf3klv8qm61";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
        description = "Conversions between algebraic classes and F-algebras";
@@ -18531,7 +18987,7 @@ self: {
        pname = "align";
        version = "0.1.1.2";
        sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9";
-       buildDepends = [ base containers transformers vector ];
+       libraryHaskellDepends = [ base containers transformers vector ];
        description = "Sequence alignment algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18544,7 +19000,7 @@ self: {
        sha256 = "1vn8l9lxih2w8bjkfl8j4xxi8p44c1gqia63gi143xk9s035rjh2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base optparse-applicative text ];
+       executableHaskellDepends = [ base optparse-applicative text ];
        jailbreak = true;
        homepage = "https://github.com/danchoi/align-text";
        description = "A simple unix filter to align text on specified substrings";
@@ -18557,7 +19013,7 @@ self: {
        pname = "aligned-foreignptr";
        version = "0.1";
        sha256 = "0hmnp08k04c0ag9fyp5sajg54r4gi57vrd9krk4g8y8fri0fgc00";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "An aligned ForeignPtr type";
        license = stdenv.lib.licenses.publicDomain;
@@ -18569,7 +19025,7 @@ self: {
        pname = "allocated-processor";
        version = "0.0.2";
        sha256 = "0jhz3q0972snrgd9c7lr934ddkwllwgw6anj7ax8hj4zi0zc615m";
-       buildDepends = [ base vector-space ];
+       libraryHaskellDepends = [ base vector-space ];
        description = "Functional combinators for monadic actions that require allocation and de-allocation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18580,7 +19036,7 @@ self: {
        pname = "alloy";
        version = "1.2.1";
        sha256 = "00bndi30yhd92vwij3dwhbj79dhv9n3l45bw01mfqak45gqbfwyv";
-       buildDepends = [ base containers mtl syb vector ];
+       libraryHaskellDepends = [ base containers mtl syb vector ];
        description = "Generic programming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18591,7 +19047,7 @@ self: {
        pname = "alloy-proxy-fd";
        version = "1.0.0";
        sha256 = "1fhk5ydnf0l0n579gqg5lfg2cc9z8xbgqsqzgkpcw0046kp53rjw";
-       buildDepends = [ alloy base mtl ];
+       libraryHaskellDepends = [ alloy base mtl ];
        description = "Some add-on instances for the Alloy library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18602,7 +19058,7 @@ self: {
        pname = "almost-fix";
        version = "0.0.2";
        sha256 = "03x715jcrsxfs2d08hsg3y5f6a4bnlzfxsmhzimvpdp9bw0psn90";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Recurse while a predicate is satisfied";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18619,7 +19075,7 @@ self: {
        sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory editline fgl filepath HUnit
          incremental-sat-solver mtl network parsec pretty QuickCheck random
          stm syb template-haskell transformers tuple
@@ -18641,7 +19097,7 @@ self: {
        sha256 = "1gc2kjyk75cxggy52w49j97q4gcn74q7f582q6kjb3gsp2pdrn09";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array AvlTree base bimap bindings-posix bytestring cereal
          containers COrdering cpphs directory filepath ghc-prim mtl parsec
          transformers unix
@@ -18664,10 +19120,13 @@ self: {
        sha256 = "1sh0mrlpfak5i20wqmz23ihphim4di802h02kyxj795gq8q6v61r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing conduit containers hexpat-pickle
          MonadRandom mtl random-shuffle resourcet rosezipper utf8-string
        ];
+       executableHaskellDepends = [
+         base conduit containers MonadRandom mtl resourcet utf8-string
+       ];
        jailbreak = true;
        homepage = "http://github.com/danieldk/alpino-tools";
        description = "Alpino data manipulation tools";
@@ -18683,8 +19142,10 @@ self: {
        pname = "alsa";
        version = "0.4";
        sha256 = "0zdnhi2wm7w6182k6mccm16x453g7kvbsqx2afnhfjpr3iaj69mg";
-       buildDepends = [ array base extensible-exceptions sample-frame ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [
+         array base extensible-exceptions sample-frame
+       ];
+       librarySystemDepends = [ alsaLib ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API";
@@ -18698,8 +19159,8 @@ self: {
        pname = "alsa-core";
        version = "0.5.0.1";
        sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b";
-       buildDepends = [ base extensible-exceptions ];
-       pkgconfigDepends = [ alsaLib ];
+       libraryHaskellDepends = [ base extensible-exceptions ];
+       libraryPkgconfigDepends = [ alsaLib ];
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (Exceptions)";
        license = stdenv.lib.licenses.bsd3;
@@ -18715,7 +19176,7 @@ self: {
        sha256 = "0zcyjckdjhsj614iib3dzj9dfp8xj847jfqf4q1sk9311gscbzns";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          alsa-core alsa-seq base midi midi-alsa wx wxcore
        ];
        jailbreak = true;
@@ -18734,8 +19195,11 @@ self: {
        sha256 = "1dmc336irhw6wdny6f2za9n3gnd83i3pcfr7qfkm8fzq6kzkkjy3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base event-list midi non-negative ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [
+         array base event-list midi non-negative
+       ];
+       librarySystemDepends = [ alsaLib ];
+       executableSystemDepends = [ alsaLib ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
@@ -18749,9 +19213,9 @@ self: {
        pname = "alsa-mixer";
        version = "0.2.0.2";
        sha256 = "11sc2n879a8rb9yz54cb8vg8rplgapbymzy785p7n7638xx877hk";
-       buildDepends = [ alsa-core base unix ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [ alsa-core base unix ];
+       librarySystemDepends = [ alsaLib ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
@@ -18767,11 +19231,11 @@ self: {
        sha256 = "0rq0i17xhd0x7dnlhdf3i1fdvmyxrsbm0w0k9lrx20xpy4gw2zfs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core array base extensible-exceptions sample-frame
          storable-record
        ];
-       pkgconfigDepends = [ alsaLib ];
+       libraryPkgconfigDepends = [ alsaLib ];
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
@@ -18785,7 +19249,7 @@ self: {
        sha256 = "1bhrjf731jqs5297zcid5b6mmdh2njqx2hxssd077a4iqvm0c21k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ alsa base ];
+       executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18802,11 +19266,11 @@ self: {
        sha256 = "1ll42nlhjwgzan9h1vzyyyhilj9d41l3gavnbahhgbr8h9wb2f0j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core array base bytestring data-accessor enumset
          extensible-exceptions poll transformers utility-ht
        ];
-       pkgconfigDepends = [ alsaLib ];
+       libraryPkgconfigDepends = [ alsaLib ];
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
@@ -18820,7 +19284,7 @@ self: {
        sha256 = "0is11wdymarzm5zlilh572j1nw3akxma0czbswvgy391pj1a007s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ alsa base ];
+       executableHaskellDepends = [ alsa base ];
        jailbreak = true;
        description = "Tests for the ALSA sequencer library";
        license = stdenv.lib.licenses.bsd3;
@@ -18833,7 +19297,7 @@ self: {
        pname = "altcomposition";
        version = "0.2.2.0";
        sha256 = "0893802bwdmywl5jh5d6mdf7l4h4qyc5y53mp39xc5lx6dsiq1d9";
-       buildDepends = [ base composition ];
+       libraryHaskellDepends = [ base composition ];
        homepage = "https://github.com/jcristovao/altcomposition";
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
@@ -18846,10 +19310,10 @@ self: {
      mkDerivation {
        pname = "alternative-io";
        version = "0.0.1";
-       revision = "1";
        sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch";
+       revision = "1";
        editedCabalFile = "982094590ae1e54131d4b1285eaec6d4160717a2864858f90a3511522fc591d6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control transformers transformers-base
        ];
        description = "IO as Alternative instance (deprecated)";
@@ -18862,7 +19326,7 @@ self: {
        pname = "altfloat";
        version = "0.3.1";
        sha256 = "1n0mxgl1jzap74sglw85l0595lhaj493bz46b90cnsqr5as9mal8";
-       buildDepends = [ base ghc-prim integer-gmp ];
+       libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        homepage = "http://repo.or.cz/w/altfloat.git";
        description = "Alternative floating point support for GHC";
        license = "unknown";
@@ -18875,8 +19339,8 @@ self: {
        pname = "alure";
        version = "0.1";
        sha256 = "1nrlw8qdbgv3l99mlcql35zknyj767fgh3f53y2mjksrh0p61v8n";
-       buildDepends = [ base OpenAL ];
-       extraLibraries = [ alure ];
+       libraryHaskellDepends = [ base OpenAL ];
+       librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18893,7 +19357,7 @@ self: {
        sha256 = "0s8m16qbcz6jgxx83sx1swg2217bvv3q3pm8b7f2jsn33nihrzxx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring configurator http-conduit lifted-base mime-mail
          mime-mail-ses postgresql-simple resourcet text time
        ];
@@ -18911,12 +19375,13 @@ self: {
        pname = "amazon-emailer-client-snap";
        version = "0.1.1.1";
        sha256 = "03am5nzacq2wd9jf46fnwmwq2ghfsh3yd9s0mzrrkskd26q1askb";
-       buildDepends = [ base mtl snap snaplet-postgresql-simple text ];
+       libraryHaskellDepends = [
+         base mtl snap snaplet-postgresql-simple text
+       ];
        jailbreak = true;
        homepage = "https://github.com/dbp/amazon-emailer-client-snap";
        description = "Client library for amazon-emailer daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazon-products" = callPackage
@@ -18931,12 +19396,15 @@ self: {
        sha256 = "10y86b3bzx6yk0478pixh3hh4nkkh0qlwwr0ac2fn6sh1hd6c7sl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring conduit containers
          cryptohash http-conduit http-types mtl old-locale resourcet text
          time transformers transformers-base xml-conduit xml-picklers
          xml-types
        ];
+       executableHaskellDepends = [
+         base bytestring http-conduit text transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/AndrewRademacher/hs-amazon-products";
        description = "Connector for Amazon Products API";
@@ -18954,7 +19422,7 @@ self: {
        pname = "amazonka";
        version = "0.3.6";
        sha256 = "1snzrclzs275gks19glrrayiysvywzwpzx6y5hnwmm48z4lh4gsb";
-       buildDepends = [
+       libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra cryptohash
          cryptohash-conduit exceptions http-conduit lens mmorph
          monad-control mtl resourcet retry text time transformers
@@ -18971,7 +19439,7 @@ self: {
        pname = "amazonka-autoscaling";
        version = "0.3.6";
        sha256 = "11dkcf0arjimvdzdin690811hs9klhr4xbhmjxcvqmwjr0z0sbb9";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
        license = "unknown";
@@ -18983,7 +19451,7 @@ self: {
        pname = "amazonka-cloudformation";
        version = "0.3.6";
        sha256 = "0m64p8xgwskv5vyzkkd5cxcwg5a7qa86a8sndan7yffap5b4nzq3";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
        license = "unknown";
@@ -18995,7 +19463,7 @@ self: {
        pname = "amazonka-cloudfront";
        version = "0.3.6";
        sha256 = "09kl01agnmq24r1ip2f047ayrlf95x51nm80l3g40lx91n3mc7rp";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
        license = "unknown";
@@ -19007,7 +19475,7 @@ self: {
        pname = "amazonka-cloudhsm";
        version = "0.3.6";
        sha256 = "0m17yjilg4d7hm8d5mbs3bqsm9hlxcybk9b49bj06266jcd9rxff";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
        license = "unknown";
@@ -19019,7 +19487,7 @@ self: {
        pname = "amazonka-cloudsearch";
        version = "0.3.6";
        sha256 = "1hyapllcv5g2s8qxmyigy2k0fha9k07dd2jax69hkwi2qv88cks5";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
        license = "unknown";
@@ -19031,7 +19499,7 @@ self: {
        pname = "amazonka-cloudsearch-domains";
        version = "0.3.6";
        sha256 = "0dfi0flb77zjbjzdsfybr0hxwwdh2qd1pc5pry88l57iibjhmxym";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
        license = "unknown";
@@ -19043,7 +19511,7 @@ self: {
        pname = "amazonka-cloudtrail";
        version = "0.3.6";
        sha256 = "07b47dy9r1f7dl5zq6z1zx1xa9q4qlack49zy8y48x1im90dnc9x";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
        license = "unknown";
@@ -19055,7 +19523,7 @@ self: {
        pname = "amazonka-cloudwatch";
        version = "0.3.6";
        sha256 = "14vx5v9iicxv768637v8smzwj04nhd80dcrwrxq3yqqlq9mbk9nk";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
        license = "unknown";
@@ -19067,7 +19535,7 @@ self: {
        pname = "amazonka-cloudwatch-logs";
        version = "0.3.6";
        sha256 = "15xpyfifqm6c5s4ysak1y0sgn6h5g9bapl69s9dpacg7nfpajqvb";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
        license = "unknown";
@@ -19079,7 +19547,7 @@ self: {
        pname = "amazonka-codedeploy";
        version = "0.3.6";
        sha256 = "1cp99l1kjm0w0jb1c4brq00dy4mn53pycra5gvlvz9k210g72ndm";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
        license = "unknown";
@@ -19091,7 +19559,7 @@ self: {
        pname = "amazonka-cognito-identity";
        version = "0.3.6";
        sha256 = "1ig50w3z85y8g7hiq1hahbv529kq5pfrcpqwsrpf1zwynl50jjkz";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
        license = "unknown";
@@ -19103,7 +19571,7 @@ self: {
        pname = "amazonka-cognito-sync";
        version = "0.3.6";
        sha256 = "1m6nw80ls7rl55ci36y2xvw8a1wfqiv64wm3q4anzmyybl50s133";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
        license = "unknown";
@@ -19115,7 +19583,7 @@ self: {
        pname = "amazonka-config";
        version = "0.3.6";
        sha256 = "0aa73cmlaydayvy6vxbxdz5br8a6hsns3dn3s06r4nzxxy7zmfzg";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
        license = "unknown";
@@ -19134,7 +19602,7 @@ self: {
        pname = "amazonka-core";
        version = "0.3.6";
        sha256 = "1l60z0fcfbyrhi7r4lfy2a6b2vwc4bn1swd6ddna19qyq9fn67l2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bifunctors bytestring case-insensitive conduit conduit-extra
          cryptohash data-default-class hashable http-client http-types lens
@@ -19142,7 +19610,7 @@ self: {
          transformers transformers-compat unordered-containers vector
          xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base tasty tasty-hunit template-haskell text
        ];
        homepage = "https://github.com/brendanhay/amazonka";
@@ -19156,7 +19624,7 @@ self: {
        pname = "amazonka-datapipeline";
        version = "0.3.6";
        sha256 = "0p0k76hiif5nd4kxm1ww6p0srjfmmq8q3xln4sbkq8ss448zfymh";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
        license = "unknown";
@@ -19168,7 +19636,7 @@ self: {
        pname = "amazonka-directconnect";
        version = "0.3.6";
        sha256 = "0q258fxwklm5xwyzram3kdq3ylayk498a02xzs7v2vb2vd3pmdb6";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
        license = "unknown";
@@ -19180,7 +19648,7 @@ self: {
        pname = "amazonka-dynamodb";
        version = "0.3.6";
        sha256 = "1k6kzip69sjakcw1y7n0xjd0qjpbrk604fs4hng8n6az107vbdjq";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
        license = "unknown";
@@ -19192,7 +19660,7 @@ self: {
        pname = "amazonka-ec2";
        version = "0.3.6.1";
        sha256 = "19gyqga1qp50jsi6pykykkivfz18357p6pd6fg84bir0j9d4vawy";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
@@ -19204,7 +19672,7 @@ self: {
        pname = "amazonka-ecs";
        version = "0.3.6";
        sha256 = "1md59pdqir5prlfwlmlgd78g6c9gq0dszm2lxpa3kbv9zxs1kgfr";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
        license = "unknown";
@@ -19216,7 +19684,7 @@ self: {
        pname = "amazonka-elasticache";
        version = "0.3.6";
        sha256 = "0hapj08jj89gl934zgkfj2lg9bsc71y1mvdl5dmv4vk8qrwp912a";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
        license = "unknown";
@@ -19228,7 +19696,7 @@ self: {
        pname = "amazonka-elasticbeanstalk";
        version = "0.3.6";
        sha256 = "1bpixxvj4rdx3v07f2pdky0xbz0kz5p3afjazwv8w588sj2i6773";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
        license = "unknown";
@@ -19240,7 +19708,7 @@ self: {
        pname = "amazonka-elastictranscoder";
        version = "0.3.6";
        sha256 = "1rfnzwl6z0ym2ln5nbcx6an2iiqcwnb3rjki2jnxpqkv6hj8d1p8";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
        license = "unknown";
@@ -19252,7 +19720,7 @@ self: {
        pname = "amazonka-elb";
        version = "0.3.6";
        sha256 = "0yriv45wrxw9jns17idiqwxxvh086g3bg2hclzaanzxllir4jb59";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
@@ -19264,7 +19732,7 @@ self: {
        pname = "amazonka-emr";
        version = "0.3.6";
        sha256 = "0pv0li7823alrgl9w1fjx9i02ndk4k12fbb6z5z50krypcxp8819";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
        license = "unknown";
@@ -19276,7 +19744,7 @@ self: {
        pname = "amazonka-glacier";
        version = "0.3.6";
        sha256 = "0i3j1yha1hjj7imqn6m42329p3637v09hbjampq0c500dvy1j5dl";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
        license = "unknown";
@@ -19288,7 +19756,7 @@ self: {
        pname = "amazonka-iam";
        version = "0.3.6";
        sha256 = "0nzs9xn70f2a0n3xdnprwdk0mwnr23cgq0rwwxc83gf08i19nl8j";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
        license = "unknown";
@@ -19300,7 +19768,7 @@ self: {
        pname = "amazonka-importexport";
        version = "0.3.6";
        sha256 = "1qcqzqg9sxqaf5kb3l91n7zp5brdpyv2mhy7da08wxb16f1v1r9x";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
        license = "unknown";
@@ -19312,7 +19780,7 @@ self: {
        pname = "amazonka-kinesis";
        version = "0.3.6";
        sha256 = "0r4s5qfpirapg2gsgk9gbyp3ap4pz3cpnz4wdidlc4ys9v4vfhay";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
        license = "unknown";
@@ -19324,7 +19792,7 @@ self: {
        pname = "amazonka-kms";
        version = "0.3.6";
        sha256 = "1x68jg5m79rapwvb6nb9xmf2hwdv34r63r0aar742igpjwssxzn9";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
        license = "unknown";
@@ -19336,7 +19804,7 @@ self: {
        pname = "amazonka-lambda";
        version = "0.3.6";
        sha256 = "1g6gf64k60zanmv787rsg8zxnv6vxzdwv3dibwm5b00fzw7cshlp";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = "unknown";
@@ -19348,7 +19816,7 @@ self: {
        pname = "amazonka-ml";
        version = "0.3.6";
        sha256 = "0ma60mdn14xs3999yg98dzlx96arlwrc9wsvgf0gq6s6c0gnrc04";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
        license = "unknown";
@@ -19360,7 +19828,7 @@ self: {
        pname = "amazonka-opsworks";
        version = "0.3.6";
        sha256 = "1d9qgazp4qk6lc4isggb0rm50crp0s1qmz6m0s3wwfdwd6lvhaql";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
        license = "unknown";
@@ -19372,7 +19840,7 @@ self: {
        pname = "amazonka-rds";
        version = "0.3.6";
        sha256 = "105xj8zrjha5yvpj8m0r7asy0hys17g1gglf95kgnkwdh9zhj3yl";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
@@ -19384,7 +19852,7 @@ self: {
        pname = "amazonka-redshift";
        version = "0.3.6";
        sha256 = "195lawjhy6hmfwk05cm9wi2x8pn6f3zr8rhcvrwa0igg8xi39fpr";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
        license = "unknown";
@@ -19396,7 +19864,7 @@ self: {
        pname = "amazonka-route53";
        version = "0.3.6.1";
        sha256 = "155d4yfc96x99mw8h89n2waj7ywx4hcw8izcx1sk1x96lcd6h9mw";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
        license = "unknown";
@@ -19408,7 +19876,7 @@ self: {
        pname = "amazonka-route53-domains";
        version = "0.3.6";
        sha256 = "13dykx5w35dj3fn7nqs3znisjzqczpsxxyyghh2kfsgfhxna0kqv";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
        license = "unknown";
@@ -19420,7 +19888,7 @@ self: {
        pname = "amazonka-s3";
        version = "0.3.6";
        sha256 = "1q45d6g4wrfjmw9d65bvrin1p9vcfv5xyz47158p9zxm2cvpvcv9";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
@@ -19432,7 +19900,7 @@ self: {
        pname = "amazonka-sdb";
        version = "0.3.6";
        sha256 = "1wswsirmjq1zvhppv4bk4h9k2b94hdl1w8q18c7mh5i4j6kx41lc";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
        license = "unknown";
@@ -19444,7 +19912,7 @@ self: {
        pname = "amazonka-ses";
        version = "0.3.6";
        sha256 = "1f7k13mpf1hs27li4fdfv4wsbckyljmhwf9i6r176h6lkkb24vxx";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
        license = "unknown";
@@ -19456,7 +19924,7 @@ self: {
        pname = "amazonka-sns";
        version = "0.3.6";
        sha256 = "00bln36dmxikxgjyib009i3y56nln4i4j58nj89sclc87mdbzbma";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
        license = "unknown";
@@ -19468,7 +19936,7 @@ self: {
        pname = "amazonka-sqs";
        version = "0.3.6";
        sha256 = "04qz8d81xz5pj3ib7cpxrig61n70val2vgjjy3xc0wjki3sk7xw8";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
@@ -19480,7 +19948,7 @@ self: {
        pname = "amazonka-ssm";
        version = "0.3.6";
        sha256 = "1xzz82hxh0am6mgzgqx0w8lxm5q8d3zpny2qyyl7bjyjh8k7v370";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Management Service SDK";
        license = "unknown";
@@ -19492,7 +19960,7 @@ self: {
        pname = "amazonka-storagegateway";
        version = "0.3.6";
        sha256 = "1cjajpwf0lfvn3r62n7y4ly16496cn7qhs17grjxv3c9i8pikq2z";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
        license = "unknown";
@@ -19504,7 +19972,7 @@ self: {
        pname = "amazonka-sts";
        version = "0.3.6";
        sha256 = "096av2p79b4vnb3zzmkbjspvxkcgzx77w96mrziggfj8mxh3x5f1";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
        license = "unknown";
@@ -19516,7 +19984,7 @@ self: {
        pname = "amazonka-support";
        version = "0.3.6";
        sha256 = "0igaq8538vrbwn7pqap5500alx3lp1c37imq75gk9nx7q846gqy6";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
        license = "unknown";
@@ -19528,7 +19996,7 @@ self: {
        pname = "amazonka-swf";
        version = "0.3.6";
        sha256 = "0mijdc797ybdz7g0nkyncahspsl0dpy3g8hkhcj2jdhhdbqn7qfc";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
@@ -19540,7 +20008,7 @@ self: {
        pname = "amazonka-workspaces";
        version = "0.3.6";
        sha256 = "1hwlm2a5fn4hrqqv79iw39xrrgfhl1d1p6236lqqfdyycnq4x5wk";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
        license = "unknown";
@@ -19556,12 +20024,12 @@ self: {
      mkDerivation {
        pname = "ampersand";
        version = "3.0.3";
-       revision = "1";
        sha256 = "0xasmdcsrnvyfw3q5jkd1cpmi26yj8c5ifzgmjy6qp6wpsldswqc";
+       revision = "1";
        editedCabalFile = "42a4a0f82e5c10b76a8412ba625df82da44d7e28353a9efa5aad2b10e7cc9d2a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers csv directory filepath graphviz hashable
          HDBC HDBC-odbc HStringTemplate mtl old-locale old-time pandoc
          pandoc-types process simple-sql-parser split SpreadsheetML text
@@ -19586,12 +20054,13 @@ self: {
        sha256 = "1qnknyk8xizq5i94s9zv7prqqcpccigc92c6jqqh82y2yqz5xnjj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring clock connection containers
          data-binary-ieee754 monad-control network network-uri split stm
-         text vector xml
+         text vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers xml ];
+       testHaskellDepends = [
          base binary bytestring clock connection containers
          data-binary-ieee754 hspec hspec-expectations network network-uri
          split stm text vector
@@ -19610,11 +20079,11 @@ self: {
        pname = "amqp-conduit";
        version = "0.2.0.0";
        sha256 = "1mlapyp22bbnkz7ny2rs2da6a6nbs41j8ljsjlxv1x9cfnjzjayb";
-       buildDepends = [
+       libraryHaskellDepends = [
          amqp base conduit exceptions lifted-base monad-control mtl
          resourcet text transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          amqp base bytestring conduit hspec HUnit resourcet transformers
        ];
        jailbreak = true;
@@ -19631,7 +20100,7 @@ self: {
        sha256 = "1y0azhsjarv26lkny1wckdz45bs87wbga29hbg6w59wc2gjkbxqz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base deepseq parsec ];
+       executableHaskellDepends = [ base deepseq parsec ];
        description = "Interpreter for AM";
        license = "GPL";
      }) {};
@@ -19644,14 +20113,13 @@ self: {
        pname = "analyze-client";
        version = "0.1.0.2";
        sha256 = "12csrds628c3ff9giyc6q74jn1s2fbkdyagzbqcvnh3brnzsjvss";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-conduit MonadCatchIO-transformers mtl snap
          snap-core time
        ];
        homepage = "https://github.com/dbp/analyze-client";
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anansi" = callPackage
@@ -19664,14 +20132,17 @@ self: {
        sha256 = "1fzrry9axri0wcff0zbxq0dbq0pxyq6x6bzw426xkm3ayzfd825a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers monads-tf options parsec system-argv0
+         system-fileio system-filepath text
+       ];
+       executableHaskellDepends = [
          base bytestring containers monads-tf options parsec system-argv0
          system-fileio system-filepath text
        ];
        homepage = "https://john-millikin.com/software/anansi/";
        description = "Simple literate programming preprocessor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anansi-hscolour" = callPackage
@@ -19682,13 +20153,12 @@ self: {
        pname = "anansi-hscolour";
        version = "0.1.2";
        sha256 = "0ffk44lacm3al96cmnacyi6pnhlzhw34jgn87fsfjcl516ffmfxw";
-       buildDepends = [
+       libraryHaskellDepends = [
          anansi base bytestring containers hscolour monads-tf text
        ];
        homepage = "https://john-millikin.com/software/anansi/";
        description = "Colorized looms for Anansi";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anansi-pandoc" = callPackage
@@ -19699,7 +20169,7 @@ self: {
        pname = "anansi-pandoc";
        version = "0.1.3";
        sha256 = "13s370b35wmwvbp6a9afsbl62hswj4mdhnvcgigwjz6bcwxxxpxi";
-       buildDepends = [
+       libraryHaskellDepends = [
          anansi base bytestring containers monads-tf pandoc text
        ];
        jailbreak = true;
@@ -19720,7 +20190,12 @@ self: {
        sha256 = "0xza3xfzzbix9xf0vwwk4qz02h4iil3hglqspgdymhjbxfl68714";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         atomo base blaze-html bytestring containers directory filepath
+         hashable haskeline highlighter mtl parsec pretty pretty-show
+         tagsoup text time vector
+       ];
+       executableHaskellDepends = [
          atomo base blaze-html bytestring containers directory filepath
          hashable haskeline highlighter mtl parsec pretty pretty-show
          tagsoup text time vector
@@ -19742,11 +20217,15 @@ self: {
        sha256 = "1sk2mfxfbj6bbsff89jch1x7rhag2yv5331qhal50qf1q7fvzgx1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude data-default directory filemanip hxt lens mtl
          optparse-applicative rainbow stringable terminal-size text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base basic-prelude data-default directory filemanip mtl
+         optparse-applicative rainbow stringable terminal-size text
+       ];
+       testHaskellDepends = [
          base basic-prelude directory hspec hxt QuickCheck stringable
        ];
        homepage = "https://github.com/passy/android-lint-summary";
@@ -19767,11 +20246,11 @@ self: {
        sha256 = "0n73w8lczsncagf2041lq1963mnsmw9albwy0n5qbhqx9030pzya";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base configurator containers mtl old-locale optparse-applicative
          process stm text time transformers unix unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base configurator containers mtl old-locale process stm tasty
          tasty-hunit tasty-quickcheck text time transformers unix
          unordered-containers
@@ -19788,7 +20267,7 @@ self: {
        pname = "animalcase";
        version = "0.1.0.2";
        sha256 = "0csbs9yrl8vhlgs7zax06shqlhcjs38q91wnkz5d3f6a4588lyqi";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/ibotty/animalcase";
        description = "Convert camelCase to snake_case and vice versa";
        license = stdenv.lib.licenses.mit;
@@ -19800,7 +20279,7 @@ self: {
        pname = "annotated-wl-pprint";
        version = "0.6.0";
        sha256 = "1rwjfw4fspyi564a847sb6k679sa6psajm2jybzpa1pvjq9z2a9x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer, with annotation support";
        license = stdenv.lib.licenses.bsd3;
@@ -19814,7 +20293,8 @@ self: {
        sha256 = "0jb7s6m7dblnydrzh5nsczr0kpqwy9gr346pcrxsaywz2gfjcrhi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
@@ -19826,7 +20306,7 @@ self: {
        pname = "anonymous-sums-tests";
        version = "0.4.0.0";
        sha256 = "0a7f7d3xzn8nl9gyzr4wl7m83aszmw42nd0dj8b875khh7i01h0b";
-       buildDepends = [ anonymous-sums base QuickCheck ];
+       libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
        homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "QuickCheck functions to accompany the anonymous-sums package";
        license = stdenv.lib.licenses.bsd3;
@@ -19840,7 +20320,8 @@ self: {
        sha256 = "1xmp8wpcyvqys777qpyfx99bhlnvmr7jil7r78j5n6fx3mkkhnln";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
+       executableHaskellDepends = [ base unix ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -19854,7 +20335,8 @@ self: {
        sha256 = "0x0pv7hq4q2n103pzzxghmgzmd3b5cwpnmkdbpzry222890w8ph1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base ];
+       libraryHaskellDepends = [ ansi-terminal base ];
+       executableHaskellDepends = [ ansi-terminal base ];
        homepage = "http://github.com/batterseapower/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
        license = stdenv.lib.licenses.bsd3;
@@ -19871,7 +20353,11 @@ self: {
        sha256 = "1dkrjn07445kmdq09fwdlnk676dvjzrzkgcfwni661lr5kbrj7p9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         antisplice base chatty chatty-utils mtl shakespeare text time
+         time-locale-compat yesod yesod-auth
+       ];
+       executableHaskellDepends = [
          antisplice base chatty chatty-utils ironforge mtl shakespeare text
          time time-locale-compat yesod yesod-auth
        ];
@@ -19890,10 +20376,11 @@ self: {
        sha256 = "1s2lfd7va0nq5z0q4f37ig2spjpxigfhkhi067fz4y0n1zjc1isd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers minimorph mtl parsec text transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers minimorph mtl text ];
+       testHaskellDepends = [
          base HUnit minimorph test-framework test-framework-hunit text
          transformers
        ];
@@ -19914,7 +20401,11 @@ self: {
        sha256 = "0sxxa2kylgagbnlf7msrgfq98jaf26lvlas6afypnr15aavvlfzh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         antisplice base chatty chatty-text chatty-utils ctpl ironforge mtl
+         network plugins time transformers
+       ];
+       executableHaskellDepends = [
          antisplice base chatty chatty-text chatty-utils ctpl directory
          ironforge mtl network plugins time transformers
        ];
@@ -19933,7 +20424,7 @@ self: {
        pname = "antigate";
        version = "2.0.1";
        sha256 = "0vd2f4kq2zkngyqpnw3lcvjkn8335gs9rdfr7kb8442p8dhps139";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default deepseq exceptions failure http-client
          http-conduit resourcet safe text transformers
        ];
@@ -19951,7 +20442,8 @@ self: {
        sha256 = "0aay5fhw2r502hvdlh6svj6k88zh5wjinn8mk2a3md7zdaiji9iq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers QuickCheck ];
+       libraryHaskellDepends = [ base containers QuickCheck ];
+       executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19963,7 +20455,7 @@ self: {
        pname = "antiquoter";
        version = "0.1.1.0";
        sha256 = "1qv5iid7az7bn1jf6r7ffg5qqbcs8ypf78j4vrs5ajwp39jnbiiy";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        description = "Combinator library for quasi- and anti-quoting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -19976,7 +20468,7 @@ self: {
        pname = "antisplice";
        version = "0.17.1.0";
        sha256 = "1f4872gmw1h2xl5jy9ajck5n4qmxdwk0f3v3bk1fxc9x8y5mscny";
-       buildDepends = [
+       libraryHaskellDepends = [
          base chatty chatty-utils haskeline mtl template-haskell text time
          transformers
        ];
@@ -19995,11 +20487,12 @@ self: {
        sha256 = "1hjk2cvn6j1ijvg3gnml46ysri672jnxmfyh09y1aqsrbimkw8gd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base haskell98 ];
+       librarySystemDepends = [ antlr3c ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
          base bytestring enumerator haskell98 regex-posix
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ antlr3c ];
        homepage = "https://github.com/markwright/antlrc";
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
@@ -20014,7 +20507,8 @@ self: {
        sha256 = "1rxk36r6i065m0qiq4g5xlrk2yjsds7j896cbddbsyddbzy10d6k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers MissingH mtl ];
+       libraryHaskellDepends = [ base containers MissingH mtl ];
+       executableHaskellDepends = [ base containers MissingH mtl ];
        homepage = "http://software.complete.org/anydbm";
        description = "Interface for DBM-like database systems";
        license = "GPL";
@@ -20030,13 +20524,13 @@ self: {
        pname = "aosd";
        version = "0.2.1";
        sha256 = "0zma3ypjnqn8c9pk4zfyzzwn27l3wb6l6xnjjydn90fxsmpa1vh6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL cairo colour monad-control pango transformers X11
        ];
-       testDepends = [
+       libraryPkgconfigDepends = [ libaosd ];
+       testHaskellDepends = [
          base colour language-haskell-extract pango template-haskell
        ];
-       pkgconfigDepends = [ libaosd ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20048,7 +20542,7 @@ self: {
        pname = "ap-reflect";
        version = "0.2";
        sha256 = "1ih0in9j26v96pjqr1wbjxl881xb2xsrcvhmn50wbv4iwxv7y222";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/cmc-msu-ai/ap-reflect";
        description = "Partial evaluation reflection a la simple-reflect";
        license = stdenv.lib.licenses.bsd3;
@@ -20063,12 +20557,13 @@ self: {
        pname = "apache-md5";
        version = "0.6.1.4";
        sha256 = "1dwnn200sjp2pvriii3y4srrms0gyicd6qp6kvc74yyad8pqhky8";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
          base bytestring HUnit MonadRandom process random test-framework
          test-framework-hunit transformers
        ];
-       extraLibraries = [ openssl ];
+       testSystemDepends = [ openssl ];
        homepage = "https://github.com/trskop/apache-md5";
        description = "Apache specific MD5 digest algorighm";
        license = stdenv.lib.licenses.bsd3;
@@ -20085,7 +20580,7 @@ self: {
        sha256 = "08a747p0dyjvgn5pjfvrb1hnh7vk2km8hbbyvjmnsxl89r5m992l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers deepseq directory filepath glib
          gtk HTTP mtl network process transformers tremulous-query
          xdg-basedir
@@ -20105,11 +20600,11 @@ self: {
        pname = "api-builder";
        version = "0.10.0.0";
        sha256 = "0pzbp0grmnrc48h1cbsxsxzyjgnxzmf4d6cfi53ccq0v3yfybw9v";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring HTTP http-client http-client-tls
          http-types text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal containers hspec http-conduit text
          transformers
        ];
@@ -20124,8 +20619,10 @@ self: {
        pname = "api-opentheory-unicode";
        version = "1.2";
        sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88";
-       buildDepends = [ base bytestring opentheory-unicode ];
-       testDepends = [ base bytestring directory opentheory-unicode ];
+       libraryHaskellDepends = [ base bytestring opentheory-unicode ];
+       testHaskellDepends = [
+         base bytestring directory opentheory-unicode
+       ];
        description = "OpenTheory unicode character API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -20144,20 +20641,26 @@ self: {
        sha256 = "0pd2kaii40isbnc1rgh0zkm2abrljipmq27nlgz3zbldbm1l5xw6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring
          bytestring Cabal case-insensitive containers deepseq lens
          old-locale QuickCheck regex-compat-tdfa safe safecopy
          template-haskell text time unordered-containers vector
        ];
-       testDepends = [
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         aeson aeson-pretty array attoparsec base base64-bytestring
+         bytestring case-insensitive containers lens old-locale QuickCheck
+         regex-compat-tdfa safe safecopy template-haskell text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring
          bytestring Cabal case-insensitive containers lens old-locale
          QuickCheck regex-compat-tdfa safe safecopy tasty tasty-hunit
          tasty-quickcheck template-haskell text time unordered-containers
          vector
        ];
-       buildTools = [ alex happy ];
        jailbreak = true;
        homepage = "http://github.com/iconnect/api-tools";
        description = "DSL for generating API boilerplate and docs";
@@ -20177,10 +20680,10 @@ self: {
      mkDerivation {
        pname = "apiary";
        version = "1.4.3";
-       revision = "1";
        sha256 = "1z6fgdkn3k4sbwk5jyz6yp9qwllhv2m9vq7z25fhmj41y3spgcsc";
+       revision = "1";
        editedCabalFile = "024867d05ec04c0b83c41e948b80c56686cc170beed600daffa8d8c725e50a32";
-       buildDepends = [
+       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
@@ -20188,7 +20691,7 @@ self: {
          transformers-base types-compat unix-compat unordered-containers
          vault wai web-routing
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring http-types HUnit mtl tasty tasty-hunit
          tasty-quickcheck wai wai-extra
        ];
@@ -20206,10 +20709,10 @@ self: {
      mkDerivation {
        pname = "apiary-authenticate";
        version = "1.4.0";
-       revision = "1";
        sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0";
+       revision = "1";
        editedCabalFile = "724a8cbf0f2e57cd497b54de4401acda2877437053f13164dd23ba7b6c7d119b";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary apiary-session authenticate base blaze-builder bytestring
          cereal data-default-class http-client http-client-tls http-types
          monad-control resourcet text types-compat wai web-routing
@@ -20227,10 +20730,10 @@ self: {
      mkDerivation {
        pname = "apiary-clientsession";
        version = "1.4.0";
-       revision = "1";
        sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6";
+       revision = "1";
        editedCabalFile = "ac724d51a8bd867838bccb788a0db76f97cfe19b052d1247e38ba001561e4bfd";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary apiary-cookie apiary-session base bytestring cereal
          clientsession data-default-class time unix-compat vault
        ];
@@ -20246,10 +20749,10 @@ self: {
      mkDerivation {
        pname = "apiary-cookie";
        version = "1.4.0";
-       revision = "2";
        sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx";
+       revision = "2";
        editedCabalFile = "4edecbd2a1e6fb740815be85cc9c4836144338af88e6774348a1703e861a9771";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base blaze-builder blaze-html bytestring cookie time
          types-compat wai web-routing
        ];
@@ -20263,10 +20766,10 @@ self: {
      mkDerivation {
        pname = "apiary-eventsource";
        version = "1.4.0";
-       revision = "1";
        sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7";
+       revision = "1";
        editedCabalFile = "368e1b555b07ff026b4753cab0364d0f70a4e2536166f756bde35f8ce9fb9ae6";
-       buildDepends = [ apiary base blaze-builder wai-extra ];
+       libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        homepage = "https://github.com/philopon/apiary";
        description = "eventsource support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -20280,10 +20783,10 @@ self: {
      mkDerivation {
        pname = "apiary-helics";
        version = "1.4.0";
-       revision = "1";
        sha256 = "1qm9fnhzafdja6fr20c7qhl6dmagmnzn23ni49ln5k55kbawfk8a";
+       revision = "1";
        editedCabalFile = "80ce4b1a9dd5c7a30099392219d0077b9281b9ceeabbb01843f12754df0b0827";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base bytestring data-default-class helics helics-wai
          monad-control text transformers types-compat vault wai
        ];
@@ -20301,10 +20804,10 @@ self: {
      mkDerivation {
        pname = "apiary-logger";
        version = "1.4.0";
-       revision = "3";
        sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48";
+       revision = "3";
        editedCabalFile = "03f6b1ac0e588631c2deed8459e527f935a74a86c15455c3f509270ba5bbd5f7";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base data-default-class fast-logger lifted-base
          monad-control monad-logger transformers transformers-base
          types-compat
@@ -20321,10 +20824,10 @@ self: {
      mkDerivation {
        pname = "apiary-memcached";
        version = "1.4.0";
-       revision = "1";
        sha256 = "1rwkj7byc84yism5sxphs1s231910ay8w7lap2cdg0y9k9f24gby";
+       revision = "1";
        editedCabalFile = "7a332392add31b3f5ef9fcc2e69069de3a23bdbfdcfeececc47d2832ec767c29";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base bytestring data-default-class memcached-binary
          monad-control text transformers types-compat
        ];
@@ -20341,10 +20844,10 @@ self: {
      mkDerivation {
        pname = "apiary-mongoDB";
        version = "1.4.0";
-       revision = "1";
        sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd";
+       revision = "1";
        editedCabalFile = "e2578f19108129ed47946fa7369c86203610d5b447a6a7a8f1af5f2537d55a4b";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base bson data-default-class lifted-base monad-control
          mongoDB resource-pool text time transformers types-compat
        ];
@@ -20361,10 +20864,10 @@ self: {
      mkDerivation {
        pname = "apiary-persistent";
        version = "1.4.0";
-       revision = "2";
        sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9";
+       revision = "2";
        editedCabalFile = "7f1c18de1d41b15397df81d9a3377e109cc07f6efc07390584e0e2952d34e889";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary apiary-logger base monad-control monad-logger persistent
          resource-pool resourcet transformers transformers-base types-compat
          web-routing
@@ -20382,10 +20885,10 @@ self: {
      mkDerivation {
        pname = "apiary-purescript";
        version = "1.4.0";
-       revision = "1";
        sha256 = "0z1d2wqpa86bv6xkpiw696sn77fdq52vk2s8951v8qdffbxia3jz";
+       revision = "1";
        editedCabalFile = "9f716a5d9173c31c6472a4bf7decc34523bdc761540d440f5d0ad4f9521bf98c";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base bytestring data-default-class filepath Glob parsec
          purescript text transformers types-compat unordered-containers
        ];
@@ -20401,10 +20904,12 @@ self: {
      mkDerivation {
        pname = "apiary-session";
        version = "1.4.0";
-       revision = "1";
        sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23";
+       revision = "1";
        editedCabalFile = "8e4a0b590972ea4e1ab1252696b7339038c4d7206ae44d1f1397a67cdde077dd";
-       buildDepends = [ apiary base types-compat wai web-routing ];
+       libraryHaskellDepends = [
+         apiary base types-compat wai web-routing
+       ];
        homepage = "https://github.com/philopon/apiary";
        description = "session support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -20417,10 +20922,10 @@ self: {
      mkDerivation {
        pname = "apiary-websockets";
        version = "1.4.0";
-       revision = "1";
        sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1";
+       revision = "1";
        editedCabalFile = "5162825445fc14b48d11a0a1f63d67e8d66a8c5aaeaf1e117a1f2302474d7581";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base wai-websockets web-routing websockets
        ];
        homepage = "https://github.com/philopon/apiary";
@@ -20438,7 +20943,7 @@ self: {
        pname = "apis";
        version = "0.0.1";
        sha256 = "07jvx1bsfiqk9l4l9k9yrsmvqm7dc2lb6p7h8p2bzqc3dqcqp67q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers deepseq directory ecma262 exceptions
          filemanip filepath hslogger hxt mtl opendatatable split
          template-haskell text th-lift time transformers
@@ -20464,7 +20969,13 @@ self: {
        sha256 = "1rih1lasky5sjdf3lz2qi2qya3iwbbxs658p77h1amqpsa7lsfp7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring containers crypto-api
+         cryptohash directory http-types old-time openpgp openpgp-asciiarmor
+         openpgp-crypto-api scotty strict tar text transformers wai-extra
+         wai-middleware-static zlib
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base binary bytestring containers crypto-api
          cryptohash directory http-types old-time openpgp openpgp-asciiarmor
          openpgp-crypto-api scotty strict tar text transformers wai-extra
@@ -20482,10 +20993,10 @@ self: {
      mkDerivation {
        pname = "app-lens";
        version = "0.1.0.0";
-       revision = "2";
        sha256 = "0gizjnc7x1ggryfrm4d87xiyjz9yw6c5y3zp23x40bgmw49zl318";
+       revision = "2";
        editedCabalFile = "29d9e8cabf54f27b1ccf007530fe698c0895c0bb6a2a6da50b71fafd4c27bd6d";
-       buildDepends = [ base containers lens mtl ];
+       libraryHaskellDepends = [ base containers lens mtl ];
        jailbreak = true;
        homepage = "https://bitbucket.org/kztk/app-lens";
        description = "applicative (functional) bidirectional programming beyond composition chains";
@@ -20501,8 +21012,10 @@ self: {
        pname = "app-settings";
        version = "0.2.0.5";
        sha256 = "17918i7k1wagmqxvkhww69w8ffybshfm6y1dd9iyg9x45qdrvr6k";
-       buildDepends = [ base containers directory mtl parsec text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers directory mtl parsec text
+       ];
+       testHaskellDepends = [
          base containers directory hspec HUnit mtl parsec text
        ];
        jailbreak = true;
@@ -20517,7 +21030,7 @@ self: {
        pname = "appar";
        version = "0.1.4";
        sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "A simple applicative parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20533,15 +21046,19 @@ self: {
        sha256 = "0qns7kjp9sjrpdx6vfkci9q6xinb0gwkb1a9ssw8xfbqqhf9ljms";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers semver text uuid
+       ];
+       executableHaskellDepends = [
          aeson base bytestring containers optparse-applicative semver text
          uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base hspec hspec-smallcheck semver smallcheck text uuid
        ];
        description = "app container types and tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "applicative-extras" = callPackage
@@ -20550,7 +21067,7 @@ self: {
        pname = "applicative-extras";
        version = "0.1.8";
        sha256 = "1svsf8mvb816nksg1dh4dz3cms2zx2hjprz2z7h3zidpxmzs0pr8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/chriseidhof/applicative-extras/";
        description = "Instances for Applicative";
        license = stdenv.lib.licenses.bsd3;
@@ -20564,10 +21081,10 @@ self: {
        pname = "applicative-fail";
        version = "1.1.1";
        sha256 = "11bk0svzdys8rgx6nzb80fkxz8mp6r0238ylmb5wzsnl8nc9y041";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors dlist mtl transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers mtl QuickCheck tasty tasty-quickcheck
        ];
        homepage = "https://bitbucket.org/s9gf4ult/applicative-fail";
@@ -20581,7 +21098,7 @@ self: {
        pname = "applicative-numbers";
        version = "0.1.3";
        sha256 = "0rnjl7yz6nga4qi0jdvhf911yf1qk6gy2fm5236bsgc50d5wbaw0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/applicative-numbers";
        description = "Applicative-based numeric instances";
        license = stdenv.lib.licenses.bsd3;
@@ -20595,8 +21112,8 @@ self: {
        pname = "applicative-parsec";
        version = "0.1.0.0";
        sha256 = "12y2j9lpaqpjcr2a9fk4anlvc1cw5rimyx031b6xa5dx500phrrx";
-       buildDepends = [ base containers lens mtl text ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers lens mtl text ];
+       testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -20611,7 +21128,7 @@ self: {
        pname = "applicative-quoters";
        version = "0.1.0.8";
        sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl";
-       buildDepends = [ base haskell-src-meta template-haskell ];
+       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20629,13 +21146,16 @@ self: {
        sha256 = "17aww5sffw07wk8hlyf0qv26v0jkr5qzv45wxk4zhhyb453b9m41";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base mersenne-random-pure64 monad-mersenne-random mtl statistics
+         transformers vector
+       ];
+       executableHaskellDepends = [
          base Chart Chart-diagrams colour conduit containers data-default
          data-default-class filepath lens mersenne-random-pure64
-         monad-mersenne-random mtl statistics text transformers vector
-         vector-algorithms
+         monad-mersenne-random mtl statistics text vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit ieee754 mersenne-random-pure64 monad-mersenne-random mtl
          test-framework test-framework-hunit vector
        ];
@@ -20656,12 +21176,12 @@ self: {
        pname = "approximate";
        version = "0.2.2.1";
        sha256 = "1h09257l7rfy64fiwr4d1jyq6vcfhly3hrn314rkfp6rkzxpvh79";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq ghc-prim hashable
          hashable-extras lens log-domain pointed safecopy semigroupoids
          semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath semigroups simple-reflect
        ];
        homepage = "http://github.com/analytics/approximate/";
@@ -20675,7 +21195,7 @@ self: {
        pname = "approximate-equality";
        version = "1.1.0.2";
        sha256 = "0pxvyb5a6vh0isba81flv7wjlwfn091xrma7g6wzr08bvqmix883";
-       buildDepends = [ base type-level-natural-number ];
+       libraryHaskellDepends = [ base type-level-natural-number ];
        homepage = "http://github.com/gcross/approximate-equality";
        description = "Newtype wrappers for approximate equality";
        license = stdenv.lib.licenses.bsd3;
@@ -20689,7 +21209,8 @@ self: {
        sha256 = "1gk1z0dw7i0c3wql1zh8iri6573falmiz31s0widfz7dav45vkrz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/nh2/ar-timestamp-wiper";
        description = "Wipes time stamps from .a files (like ar -D)";
        license = stdenv.lib.licenses.mit;
@@ -20706,11 +21227,12 @@ self: {
        sha256 = "1yxhafzv71xx2gva4b9slr26iqs6p1lh578x1774bv07ifqys6dp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers criterion directory filepath primitive transformers
          vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers criterion vector ];
+       testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck vector
        ];
        jailbreak = true;
@@ -20728,10 +21250,10 @@ self: {
        pname = "arbb-vm";
        version = "0.1.1.20";
        sha256 = "0k31ardnlg925vcrrl4n9w09867dbr68sdnc3bhs9xz1r9cdlkv8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers directory mtl pretty
        ];
-       extraLibraries = [ arbb_dev ];
+       librarySystemDepends = [ arbb_dev ];
        homepage = "https://github.com/svenssonjoel/arbb-vm/wiki";
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
@@ -20751,17 +21273,17 @@ self: {
        sha256 = "02qz7qsk1kjavsdl8mq56blxzzjnnjlnyjvjnyfamq7j0rqzdq5v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson array base binary bytestring bytestring-progress containers
          deepseq directory filepath parsec pcre-light strict
          terminal-progress-bar time transformers unix utf8-string X11
        ];
-       testDepends = [
+       executableSystemDepends = [ libXScrnSaver ];
+       testHaskellDepends = [
          base binary bytestring containers deepseq directory parsec
          pcre-light process-extras tasty tasty-golden tasty-hunit time
          transformers unix utf8-string
        ];
-       extraLibraries = [ libXScrnSaver ];
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
@@ -20779,7 +21301,7 @@ self: {
        sha256 = "0rdgrdmmsn4qijbbprw4dbppb5klgn9lw3fyizzcd79gsgz4s61r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring debian debian-mirror directory Extra filepath help
          HUnit mtl network old-locale pretty process progress regex-compat
          regex-posix time unix Unixutils xhtml
@@ -20800,8 +21322,9 @@ self: {
        sha256 = "19gvja890lhn9zr2aqjshwq5qqb95nynxrsw5wk4z2a417xj70j2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers curl HTTP network process random
+       libraryHaskellDepends = [ base curl HTTP network ];
+       executableHaskellDepends = [
+         base bytestring containers process random
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
        license = stdenv.lib.licenses.bsd3;
@@ -20816,7 +21339,9 @@ self: {
        pname = "archlinux";
        version = "1.3";
        sha256 = "051pgn39f8xq80qf8g04j162n6zysvcdbj8a8m05x6vi6mbr9jx2";
-       buildDepends = [ base Cabal containers directory filepath pretty ];
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath pretty
+       ];
        homepage = "http://github.com/archhaskell/";
        description = "Support for working with Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
@@ -20834,7 +21359,12 @@ self: {
        sha256 = "1rzjkxxmf24hrmlc70s416akn6rbcly7152ly618dxgigvqnir48";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         archlinux base Cabal containers csv deepseq directory filepath HTTP
+         json old-time parallel pretty prettyclass process
+         strict-concurrency xhtml
+       ];
+       executableHaskellDepends = [
          archlinux base Cabal containers csv deepseq directory filepath HTTP
          json old-time parallel pretty prettyclass process
          strict-concurrency xhtml
@@ -20853,7 +21383,9 @@ self: {
        sha256 = "1v7b6w2cqfy69kvsr09a1qv4zyz78khygmd9l9hqjlmj7w3x8gys";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers download-curl feed tagsoup ];
+       executableHaskellDepends = [
+         base containers download-curl feed tagsoup
+       ];
        homepage = "http://archhaskell.wordpress.com/";
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
        license = stdenv.lib.licenses.bsd3;
@@ -20867,7 +21399,7 @@ self: {
        pname = "arff";
        version = "0.1.0";
        sha256 = "1mwak4kl4ksg5vqya9abz02v0zgj6lbi6bzq2bd8jpnncazsxha5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bytestring-lexing bytestring-show old-locale
          time
        ];
@@ -20884,8 +21416,8 @@ self: {
        pname = "argparser";
        version = "0.3.4";
        sha256 = "0ypdj4mcm4yk5pswzwi9jk2w25f6qhiari8gam72za6ihyjwfig6";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers HTF HUnit ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20901,7 +21433,7 @@ self: {
        sha256 = "17s6m9mjai439j8g0cd5pr2zb0224h1ckik9fg0rbd06zgxvfmq6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bimap containers glib gtk HDBC indents mtl parsec
        ];
        jailbreak = true;
@@ -20923,13 +21455,13 @@ self: {
        sha256 = "02hyn3y4h7w4l5k48kp73al67lp8vzlymblb7al72w14r01ww8p3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base bert Cabal containers data-lens data-lens-fd
          data-lens-template directory filepath haskell-names
          haskell-packages haskell-src-exts hse-cpp hslogger mtl stm tagged
          transformers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bert containers directory filepath haskell-src-exts tasty
          tasty-hunit utf8-string
        ];
@@ -20950,17 +21482,18 @@ self: {
        sha256 = "107rbbzmqg0zrgv3qb0pr8svmzh25a63dm0kn0hhyirkjzdyjgqw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filemanip fsnotify process regex-posix
          safe split system-filepath text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filemanip fsnotify hspec process
          regex-posix safe split system-filepath text time
        ];
        homepage = "http://github.com/karun012/arion";
        description = "Watcher and runner for Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arith-encode" = callPackage
@@ -20971,11 +21504,11 @@ self: {
        pname = "arith-encode";
        version = "1.0.0";
        sha256 = "1wqm2jcc2dac31gvad6pmnq0wbajpj488h93xl93vfipsbak0cm8";
-       buildDepends = [
+       libraryHaskellDepends = [
          arithmoi array base binary Cabal containers fgl hashable
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          arithmoi array base binary Cabal containers fgl hashable HUnit-Plus
          unordered-containers
        ];
@@ -20990,7 +21523,7 @@ self: {
        pname = "arithmatic";
        version = "0.1.0.1";
        sha256 = "1qa1yqi67l1cd3ggb67h9iji9ps3ma43fcddv0vmc1hin61xnzj8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Basic arithmatic in haskell";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -21003,11 +21536,11 @@ self: {
        pname = "arithmoi";
        version = "0.4.1.3";
        sha256 = "1j8k0hqg5ddglw9lpbp3qg81s1g01sil1grizlrqfgwx0wj3jqif";
-       buildDepends = [
+       configureFlags = [ "-f-llvm" ];
+       libraryHaskellDepends = [
          array base containers ghc-prim integer-gmp mtl random
        ];
-       testDepends = [ base hspec ];
-       configureFlags = [ "-f-llvm" ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
@@ -21021,7 +21554,7 @@ self: {
        sha256 = "18ym9cs0mr4pr6pdgyk14rrwsxh1fa0xvqz3jg60lnxbgjlynvc1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT mtl OpenGL stm ];
+       executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21035,7 +21568,8 @@ self: {
        sha256 = "13n878vafx1igw3q3v1c676iaidyqa4wk6z727vh7dagkkyl7653";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/sfischer13/haskell-arpa";
        description = "Library for reading ARPA n-gram models";
@@ -21048,7 +21582,7 @@ self: {
        pname = "array";
        version = "0.5.1.0";
        sha256 = "18hz1jcshdj6c10lsxq86rs6rbx77g91w4ay2s58h9j5rnkchjxq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21065,11 +21599,12 @@ self: {
        sha256 = "03kjkpygi9jc8vrvnw9i8zwbfaihsl50bi39j0liclja442j9h5m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base mcmc-synthesis modular-arithmetic MonadRandom OddWord
          split vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base split vector ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
@@ -21085,7 +21620,7 @@ self: {
        pname = "array-memoize";
        version = "0.6.0";
        sha256 = "1p05vg8mdyad03aa7s1nrgw5xqgl80f6l7v0llhmi1q4xnrqrj3n";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Memoization combinators using arrays for finite sub-domains of functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21096,7 +21631,7 @@ self: {
        pname = "array-primops";
        version = "0.1.0.0";
        sha256 = "11qwgs06ivfjhcjhihchg46hvpcrwmc7zz36630v9qyy2611q66x";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21107,7 +21642,7 @@ self: {
        pname = "array-utils";
        version = "0.3";
        sha256 = "1gh7gmbm0djr78dqkf8q3ap9yk4gm3dq48k8jad9ssp3w19wpkan";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Primitive functions for updating many elements in mutable arrays at once";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21119,7 +21654,9 @@ self: {
        pname = "arrow-improve";
        version = "0.1.0.0";
        sha256 = "0ppl8v746lj41aqb0k2724vm4n32jxmz723qa0j860jvhkh2nww7";
-       buildDepends = [ arrows base pointed profunctors semigroupoids ];
+       libraryHaskellDepends = [
+         arrows base pointed profunctors semigroupoids
+       ];
        jailbreak = true;
        homepage = "https://github.com/prophile/arrow-improve/";
        description = "Improved arrows";
@@ -21133,7 +21670,7 @@ self: {
        pname = "arrow-list";
        version = "0.7";
        sha256 = "1n6m77hdkpjd12r0b8fwxiz3jz0j86cplgsk27m2raj86vr3dy1k";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "https://github.com/silkapp/arrow-list";
        description = "List arrows for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -21145,7 +21682,7 @@ self: {
        pname = "arrowapply-utils";
        version = "0.2";
        sha256 = "02zampc6cc5a9fvdvxkz2r6i5sxf5w0qilsvsx8jxiw4kprbghii";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21159,7 +21696,7 @@ self: {
        sha256 = "0a0ss5q8ximbd6hr0agy1106jfvdm8cx50q7a9yaiqfxs20fy6lx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskell-src ];
+       executableHaskellDepends = [ array base containers haskell-src ];
        homepage = "http://www.haskell.org/arrows/";
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
@@ -21172,7 +21709,7 @@ self: {
        pname = "arrows";
        version = "0.4.4.1";
        sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v";
-       buildDepends = [ base Stream ];
+       libraryHaskellDepends = [ base Stream ];
        homepage = "http://www.haskell.org/arrows/";
        description = "Arrow classes and transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -21184,7 +21721,9 @@ self: {
        pname = "artery";
        version = "0.1.1";
        sha256 = "1fs8jap2ndcj21qgpkzy9nbnabvp4ac0xm0vdwkjjdf7i4j5kaqr";
-       buildDepends = [ base containers profunctors transformers ];
+       libraryHaskellDepends = [
+         base containers profunctors transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/fumieval/artery";
        description = "A simple, arrow-based reactive programming";
@@ -21202,7 +21741,11 @@ self: {
        sha256 = "0w29sdzhc54jjl7d0f3irq2s0kisd66amf0li0h9x7r00j72lvwx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-nums containers
+         file-embed parsec process shell-escape template-haskell
+       ];
+       executableHaskellDepends = [
          attoparsec base blaze-builder bytestring bytestring-nums containers
          file-embed parsec process shell-escape template-haskell
        ];
@@ -21217,10 +21760,10 @@ self: {
      mkDerivation {
        pname = "arxiv";
        version = "0.0.1";
-       revision = "1";
        sha256 = "1has8v40h8w4v393pgd4qk4fzgdw02y12zk2hspkic1q5bx33dxh";
+       revision = "1";
        editedCabalFile = "746311e6003440248df63acd19e428cbdbf5c95cdd3ee0993d2c89c7b2ceada7";
-       buildDepends = [ base parsec split tagsoup ];
+       libraryHaskellDepends = [ base parsec split tagsoup ];
        homepage = "http://github.com/toschoo/Haskell-Libs";
        description = "A client for the Arxiv API";
        license = "LGPL";
@@ -21232,7 +21775,7 @@ self: {
        pname = "ascetic";
        version = "0.0.0.4";
        sha256 = "1c5ip8q9b6xnvh3li03iilmqz33rrlis78zs0lh4jva67b37akqk";
-       buildDepends = [ base MissingH ];
+       libraryHaskellDepends = [ base MissingH ];
        description = "Generic markup builder";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -21245,7 +21788,7 @@ self: {
        pname = "ascii";
        version = "0.0.4.1";
        sha256 = "1xpw2n3gskndg74ilrq8zngawlvc3mbsji3nx2aprar96hdlpvpv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive hashable text
        ];
        jailbreak = true;
@@ -21265,11 +21808,14 @@ self: {
        sha256 = "0lnxph4zdhkhp2w4rvx85xdwy8lnnm81apvkrddbwfr405j4nf1w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ansi-terminal async base data-default time
+       ];
+       executableHaskellDepends = [
          ansi-terminal async base bytestring conduit data-default HTTP
          http-conduit http-types time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal async base data-default hspec QuickCheck time
        ];
        homepage = "https://github.com/yamadapc/haskell-ascii-progress";
@@ -21287,7 +21833,11 @@ self: {
        sha256 = "09m7wcq207glaz3s824vakj42vdaxc334y5k9lsh095v2xp7pwz4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring deepseq deepseq-generics HUnit
+         split zlib
+       ];
+       executableHaskellDepends = [
          attoparsec base binary bytestring deepseq deepseq-generics HUnit
          split zlib
        ];
@@ -21302,8 +21852,8 @@ self: {
        pname = "ascii85-conduit";
        version = "0.1.0.0";
        sha256 = "191qw61y3jrbwzv7nabvxr6dxxigyxflbw49f0q637psqzdblsl5";
-       buildDepends = [ base bytestring conduit ];
-       testDepends = [ base bytestring conduit hspec ];
+       libraryHaskellDepends = [ base bytestring conduit ];
+       testHaskellDepends = [ base bytestring conduit hspec ];
        jailbreak = true;
        description = "Conduit for encoding ByteString into Ascii85";
        license = stdenv.lib.licenses.bsd3;
@@ -21321,10 +21871,13 @@ self: {
        sha256 = "0nzg4m1nd41x6fyki5qva5jj80sl7jd1z1gd674v50zchkw71a9m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers directory filepath FontyFruity
-         JuicyPixels lens linear mtl optparse-applicative rasterific-svg
-         svg-tree text vector
+       libraryHaskellDepends = [
+         base bytestring containers FontyFruity JuicyPixels lens linear mtl
+         rasterific-svg svg-tree text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath FontyFruity JuicyPixels
+         optparse-applicative rasterific-svg svg-tree text
        ];
        description = "Pretty rendering of Ascii diagram into svg or png";
        license = stdenv.lib.licenses.bsd3;
@@ -21338,7 +21891,7 @@ self: {
        sha256 = "0w7pkfd0i46a6x2ivk659rx56v9nkjvlvnmiafy96y1cbfzkyffg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ asil base bytestring utf8-string ];
+       executableHaskellDepends = [ asil base bytestring utf8-string ];
        homepage = "http://www.pros.upv.es/fittest/";
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
@@ -21354,7 +21907,7 @@ self: {
        pname = "asil";
        version = "1.2";
        sha256 = "1zprddksk91wfyl1597cdgdy2r46d7vxjfxxi80rhxbfkshs4qwx";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754
          directory filepath haskell-src-exts mtl pretty utf8-string uuagc
          zip-archive zlib
@@ -21370,12 +21923,12 @@ self: {
      mkDerivation {
        pname = "asn1-data";
        version = "0.7.1";
-       revision = "1";
        sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r";
+       revision = "1";
        editedCabalFile = "6c8f01076a88b9ea0f2ce9b5fa2b09dc658332bd4dedfbc8d6e7fae25ea5ed1f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cereal mtl text ];
+       libraryHaskellDepends = [ base bytestring cereal mtl text ];
        jailbreak = true;
        homepage = "http://github.com/vincenthz/hs-asn1-data";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
@@ -21391,8 +21944,10 @@ self: {
        pname = "asn1-encoding";
        version = "0.9.0";
        sha256 = "02x3lzyl4gavl3lc2lrg8rknyvs6r2hf8kmm7xrmma5m857iks8p";
-       buildDepends = [ asn1-types base bytestring hourglass mtl ];
-       testDepends = [
+       libraryHaskellDepends = [
+         asn1-types base bytestring hourglass mtl
+       ];
+       testHaskellDepends = [
          asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
          text
        ];
@@ -21408,7 +21963,9 @@ self: {
        pname = "asn1-parse";
        version = "0.9.1";
        sha256 = "1pik647wjj1mpk2vj74kjdiblqmkk5s8yxf987maa9bjm2x8g071";
-       buildDepends = [ asn1-encoding asn1-types base bytestring mtl ];
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base bytestring mtl
+       ];
        homepage = "https://github.com/vincenthz/hs-asn1";
        description = "Simple monadic parser for ASN1 stream types";
        license = stdenv.lib.licenses.bsd3;
@@ -21420,7 +21977,7 @@ self: {
        pname = "asn1-types";
        version = "0.3.0";
        sha256 = "1am8nmfarv7ymy3rqm0js2i82v6n6qwz0lnzb1qdmy4ligcdm65r";
-       buildDepends = [ base bytestring hourglass ];
+       libraryHaskellDepends = [ base bytestring hourglass ];
        homepage = "http://github.com/vincenthz/hs-asn1-types";
        description = "ASN.1 types";
        license = stdenv.lib.licenses.bsd3;
@@ -21435,7 +21992,9 @@ self: {
        sha256 = "05kdx00bkpp3f4x1i9j8kfbdnhsivx1njcfpcxxgw93jm5ng3lj7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ asn1-encoding asn1-types base bytestring pem ];
+       executableHaskellDepends = [
+         asn1-encoding asn1-types base bytestring pem
+       ];
        homepage = "http://github.com/vincenthz/hs-asn1dump";
        description = "Dump ASN1 structure";
        license = stdenv.lib.licenses.bsd3;
@@ -21449,7 +22008,8 @@ self: {
        sha256 = "1crwfndk7qci5id132s9f57i3kslxcdcqpymsykm1460x5nd42qs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ghc-binary parsec ];
+       libraryHaskellDepends = [ base containers ghc-binary parsec ];
+       executableHaskellDepends = [ base containers ghc-binary parsec ];
        jailbreak = true;
        description = "Haskell Assembler";
        license = stdenv.lib.licenses.bsd3;
@@ -21464,8 +22024,8 @@ self: {
        pname = "assert";
        version = "0.0.1.2";
        sha256 = "0pycrpa9m8kif31jsbmb2cb4rbvm6qinmzhkdam1b5mbmmmg5q96";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base bytestring Cabal directory filepath system-posix-redirect
        ];
        homepage = "https://github.com/liyang/assert";
@@ -21479,7 +22039,7 @@ self: {
        pname = "assert-failure";
        version = "0.1.1.0";
        sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1";
-       buildDepends = [ base pretty-show text ];
+       libraryHaskellDepends = [ base pretty-show text ];
        homepage = "https://github.com/Mikolaj/assert-failure";
        description = "Syntactic sugar improving 'assert' and 'error'";
        license = stdenv.lib.licenses.bsd3;
@@ -21493,8 +22053,8 @@ self: {
        pname = "assertions";
        version = "0.1.0.4";
        sha256 = "1b2p6b6brk0b1hq264i20bpdhdaq4xdzcqp7gzvfy1s5q3zwjzj8";
-       buildDepends = [ ansi-terminal base containers ];
-       testDepends = [ base interpolate process ];
+       libraryHaskellDepends = [ ansi-terminal base containers ];
+       testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -21505,9 +22065,9 @@ self: {
        pname = "assimp";
        version = "0.1";
        sha256 = "0jhf76v08dh1bf65ln0az1b8bc8zi9gxb0bx273mi3jvprhns4zh";
-       buildDepends = [ base haskell98 vect ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ assimp ];
+       libraryHaskellDepends = [ base haskell98 vect ];
+       librarySystemDepends = [ assimp ];
+       libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21519,7 +22079,7 @@ self: {
        pname = "astar";
        version = "0.2.1";
        sha256 = "0qgymyaawk0ml929d5lgfikmqbxyz4shs66wq9ch9d6r175cs5b8";
-       buildDepends = [ base containers PSQueue ];
+       libraryHaskellDepends = [ base containers PSQueue ];
        description = "General A* search algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21534,7 +22094,7 @@ self: {
        sha256 = "1zb265z6m1py2jxhxzrq2kb3arw2riagajhh3vs0m54rkrak6szs";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory MonadRandom mtl OpenGL random SDL
          SDL-image SDL-mixer SDL-ttf unix
        ];
@@ -21555,7 +22115,7 @@ self: {
        sha256 = "0lv4wbblv4r0vwfynswsxzyrl6qp45byjdmg4cs760qq3jj749zl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          astview-utils base bytestring containers directory filepath glade
          glib Glob gtk gtksourceview2 hint mtl process syb
        ];
@@ -21570,7 +22130,7 @@ self: {
        pname = "astview-utils";
        version = "0.1";
        sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn";
-       buildDepends = [ base containers syb ];
+       libraryHaskellDepends = [ base containers syb ];
        description = "Interfacing between hint and astview";
        license = stdenv.lib.licenses.bsdOriginal;
      }) {};
@@ -21583,8 +22143,10 @@ self: {
        pname = "async";
        version = "2.0.2";
        sha256 = "0azx4qk65a9a2gvqsfmz3w89m6shzr2iz0i5lly2zvly4n2d6m6v";
-       buildDepends = [ base stm ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        homepage = "https://github.com/simonmar/async";
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
@@ -21598,7 +22160,7 @@ self: {
        pname = "async-extras";
        version = "0.1.2.0";
        sha256 = "137vpkc4xlbmghbjmgdjxaqcji19cj1vxm64df9gxb7356d0rzyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base lifted-async lifted-base monad-control SafeSemaphore stm
          transformers-base
        ];
@@ -21616,7 +22178,8 @@ self: {
        sha256 = "002w3n0ykn5ga7mwz9kjvr77izqnhklq5r3aczwjikvgkik9q6ck";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ async base stm unordered-containers ];
+       libraryHaskellDepends = [ async base stm unordered-containers ];
+       executableHaskellDepends = [ async base stm unordered-containers ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/async-manager";
        description = "A thread manager for async";
@@ -21631,11 +22194,11 @@ self: {
        pname = "async-pool";
        version = "0.9.0";
        sha256 = "10952y60ivkx78skf7ds0dv8gp6bf3v47lays928vnpb8m5cr0rh";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers fgl monad-control stm transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base containers fgl hspec monad-control stm time transformers
          transformers-base
        ];
@@ -21649,7 +22212,7 @@ self: {
        pname = "asynchronous-exceptions";
        version = "1.1.0.1";
        sha256 = "0vfx2ikw61sic35n4ayy7rng6izpafksz7lh4xgkcmbg627vkm8s";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/feuerbach/asynchronous-exceptions";
        description = "Distinguish between synchronous and asynchronous exceptions";
@@ -21662,7 +22225,7 @@ self: {
        pname = "aterm";
        version = "0.1.0.1";
        sha256 = "02aajiirz68wqyrcigfb4cym7j43cf3p0dn4awcw8simnqhfaskh";
-       buildDepends = [ array base containers ghc-prim ];
+       libraryHaskellDepends = [ array base containers ghc-prim ];
        homepage = "https://svn-agbkb.informatik.uni-bremen.de/Hets/trunk/atermlib";
        description = "serialisation for Haskell values with sharing support";
        license = stdenv.lib.licenses.gpl2;
@@ -21676,7 +22239,8 @@ self: {
        sha256 = "0yyk2mdxrla0hwh1mn50x5mgqskkaw6i086gqqmprljr2668kkj0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aterm base mtl transformers wl-pprint ];
+       libraryHaskellDepends = [ aterm base mtl transformers wl-pprint ];
+       executableHaskellDepends = [ aterm base transformers wl-pprint ];
        homepage = "https://github.com/GaloisInc/aterm-utils";
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
@@ -21689,7 +22253,7 @@ self: {
        pname = "atl";
        version = "15409.2";
        sha256 = "1by20xr3s3f0rh1h9zfpcp1i8sn1qv6292mjvav108iws0dh4wq2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Arrow Transformer Library";
        license = "LGPL";
      }) {};
@@ -21706,7 +22270,7 @@ self: {
        pname = "atlassian-connect-core";
        version = "0.7.0.1";
        sha256 = "16pf2ir84fx6x01mpp109qh9rf96fp57230qr4k4n7qms068dgpy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson atlassian-connect-descriptor base base64-bytestring
          bytestring case-insensitive cipher-aes configurator containers
          cryptohash hostname http-client http-client-tls http-media
@@ -21729,11 +22293,11 @@ self: {
        pname = "atlassian-connect-descriptor";
        version = "0.4.0.2";
        sha256 = "1pss2rkd1s4dmnym5w2sanhqgz2pv1n9zyq4n8jy8ihc4zgrcscp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal cases HUnit network network-uri
          scientific text time-units unordered-containers vector
        ];
@@ -21750,8 +22314,10 @@ self: {
        pname = "atmos";
        version = "0.2.0.0";
        sha256 = "0qx5a6dzaxjw1flybpmbf3hf7xycg4x69283njszwijw23ak6sv6";
-       buildDepends = [ base ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "1976 US Standard Atmosphere";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -21762,7 +22328,7 @@ self: {
        pname = "atmos-dimensional";
        version = "0.1.2";
        sha256 = "19rlcp1zn3k838c5ixsn6i09nclfwvd9prbirxy5fmch0yjlp39d";
-       buildDepends = [ atmos base dimensional ];
+       libraryHaskellDepends = [ atmos base dimensional ];
        description = "dimensional wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21773,7 +22339,7 @@ self: {
        pname = "atmos-dimensional-tf";
        version = "0.1.2";
        sha256 = "05g2v7ppbcvaw0dk9f0z0gb7k33c4lk2cm2ziyqahxmwsz928khm";
-       buildDepends = [ atmos base dimensional-tf ];
+       libraryHaskellDepends = [ atmos base dimensional-tf ];
        description = "dimensional-tf wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21784,11 +22350,10 @@ self: {
        pname = "atom";
        version = "1.0.13";
        sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807";
-       buildDepends = [ base bimap containers mtl process syb ];
+       libraryHaskellDepends = [ base bimap containers mtl process syb ];
        homepage = "http://tomahawkins.org";
        description = "An EDSL for embedded hard realtime applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-basic" = callPackage
@@ -21799,7 +22364,7 @@ self: {
        pname = "atom-basic";
        version = "0.2.2";
        sha256 = "1n9illmrkrd1gr3imjvclzny8kjx7d0mak9yvyc129gfb9ap52cd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring network network-uri old-locale
          text time
        ];
@@ -21819,12 +22384,12 @@ self: {
        pname = "atom-conduit";
        version = "0.1.0.0";
        sha256 = "1jhd7036ga1sf1zgclc1m5gjzj5smf84rzvy5xac70wgcaa8iajk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions lens
          mono-traversable network-uri parsers text time timerep xml-conduit
          xml-conduit-parse xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-parse data-default exceptions hlint lens
          mono-traversable network-uri parsers quickcheck-instances resourcet
          tasty tasty-hunit tasty-quickcheck text time xml-conduit
@@ -21840,7 +22405,7 @@ self: {
        pname = "atom-msp430";
        version = "0.5.3";
        sha256 = "02h1g35f3bd3cjjhr28g63vk1mnghshq9586wa922rfl79jp6jcs";
-       buildDepends = [ atom base mtl ];
+       libraryHaskellDepends = [ atom base mtl ];
        homepage = "https://github.com/eightyeight/atom-msp430";
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
        license = stdenv.lib.licenses.mit;
@@ -21853,7 +22418,7 @@ self: {
        pname = "atomic-primops";
        version = "0.8";
        sha256 = "0wb45yjflpih94i95s88hfl4mcddcjsabspnm6h20wxv0n09xqf0";
-       buildDepends = [ base ghc-prim primitive ];
+       libraryHaskellDepends = [ base ghc-prim primitive ];
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "A safe approach to CAS and other atomic ops in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -21866,11 +22431,11 @@ self: {
      mkDerivation {
        pname = "atomic-primops-foreign";
        version = "0.6.2";
-       revision = "1";
        sha256 = "1pfdbrxx4s6n53lfhxghcalm8dif2r9zj45bipibvyiczz5xkkpm";
+       revision = "1";
        editedCabalFile = "fd1067adbd96e923226347dccaa9e3e221439702fe7824c86db44eb5b7f6c318";
-       buildDepends = [ base bits-atomic ];
-       testDepends = [
+       libraryHaskellDepends = [ base bits-atomic ];
+       testHaskellDepends = [
          base bits-atomic HUnit test-framework test-framework-hunit time
        ];
        jailbreak = true;
@@ -21885,8 +22450,8 @@ self: {
        pname = "atomic-primops-vector";
        version = "0.1.0.1";
        sha256 = "0m4mlixiz7cs4hqrh7i6dzbsj55p0qh3m16nc94819wbzcgi3vq7";
-       buildDepends = [ atomic-primops base primitive vector ];
-       testDepends = [ base vector ];
+       libraryHaskellDepends = [ atomic-primops base primitive vector ];
+       testHaskellDepends = [ base vector ];
        jailbreak = true;
        description = "Atomic operations on Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
@@ -21900,10 +22465,10 @@ self: {
        pname = "atomic-write";
        version = "0.2.0.4";
        sha256 = "1y09vyxv1fdlkzz7r27snrjhi19msqj06cjdwy7mgbjb6v7z46w9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath temporary text unix-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath hspec temporary text unix-compat
        ];
        homepage = "https://github.com/stackbuilders/atomic-write";
@@ -21922,7 +22487,11 @@ self: {
        sha256 = "0hby64jd9zi518rnfk46ilipnp3x0ynkgqk2n0brf1873y88mwx8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring containers directory filepath hashable hint
+         mtl parsec pretty regex-pcre template-haskell text time vector
+       ];
+       executableHaskellDepends = [
          array base bytestring containers directory filepath hashable
          haskeline hint mtl parsec pretty regex-pcre template-haskell text
          time vector
@@ -21940,7 +22509,7 @@ self: {
        pname = "attempt";
        version = "0.4.0.1";
        sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh";
-       buildDepends = [ base failure ];
+       libraryHaskellDepends = [ base failure ];
        homepage = "http://github.com/snoyberg/attempt/tree/master";
        description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -21954,14 +22523,14 @@ self: {
      mkDerivation {
        pname = "atto-lisp";
        version = "0.2.2";
-       revision = "1";
        sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc";
+       revision = "1";
        editedCabalFile = "feb39753d89c58abac767ed3fe5644428b5d15d83c69f7b26b282f3b9969f2fa";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          deepseq text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring HUnit test-framework
          test-framework-hunit text
        ];
@@ -21980,11 +22549,11 @@ self: {
        pname = "attoparsec";
        version = "0.13.0.1";
        sha256 = "0cprkr7bl4lrr80pz8mryb4rbfwdgpsrl7g0fbcaybhl8p5hm26f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq scientific text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers deepseq QuickCheck
          quickcheck-unicode scientific test-framework
          test-framework-quickcheck2 text transformers vector
@@ -22000,7 +22569,7 @@ self: {
        pname = "attoparsec-arff";
        version = "0.0";
        sha256 = "1jf9065pqmdfshkd0cqiamhivs9an4slqx82n7yj0kkhdxw5lyq4";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "An ARFF file parser using Attoparsec";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -22011,7 +22580,7 @@ self: {
        pname = "attoparsec-binary";
        version = "0.2";
        sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Binary processing extensions to Attoparsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22022,7 +22591,7 @@ self: {
        pname = "attoparsec-conduit";
        version = "1.1.0";
        sha256 = "18xn3nzxfghcd88cana1jw85ijv0ysw3bp36fb6r5wsf6m79z01y";
-       buildDepends = [ base conduit ];
+       libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Consume attoparsec parsers via conduit. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -22034,7 +22603,7 @@ self: {
        pname = "attoparsec-csv";
        version = "0.1.0.1";
        sha256 = "0zh1g9687nrdxksniq348jc04hbgf5kxbzqs0kggmz7qqw03iq0v";
-       buildDepends = [ attoparsec base text ];
+       libraryHaskellDepends = [ attoparsec base text ];
        jailbreak = true;
        homepage = "https://github.com/robinbb/attoparsec-csv";
        description = "A parser for CSV files that uses Attoparsec";
@@ -22048,7 +22617,9 @@ self: {
        pname = "attoparsec-enumerator";
        version = "0.3.4";
        sha256 = "127mj0v6342mzxnc73qki3k197vhwsff8qkf92gm5idyxdisg5dy";
-       buildDepends = [ attoparsec base bytestring enumerator text ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring enumerator text
+       ];
        homepage = "https://john-millikin.com/software/attoparsec-enumerator/";
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
@@ -22060,7 +22631,7 @@ self: {
        pname = "attoparsec-expr";
        version = "0.1.1.2";
        sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d";
-       buildDepends = [ attoparsec base ];
+       libraryHaskellDepends = [ attoparsec base ];
        description = "Port of parsec's expression parser to attoparsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22073,7 +22644,7 @@ self: {
        pname = "attoparsec-iteratee";
        version = "0.4.0";
        sha256 = "1j57xhk34ghi1b2gnzrfbswv2nab5h0z52h3wvx9w8d97bbvqp2s";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring iteratee transformers
        ];
        jailbreak = true;
@@ -22091,8 +22662,8 @@ self: {
        pname = "attoparsec-parsec";
        version = "0.1.3";
        sha256 = "0mi3f1kwcss8m1679ymiydp1sb1xdyv1f6a0qx9d683p86qxrwzq";
-       buildDepends = [ attoparsec base parsec text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base parsec text ];
+       testHaskellDepends = [
          attoparsec base hspec markdown-unlit QuickCheck text
        ];
        description = "An Attoparsec compatibility layer for Parsec";
@@ -22105,7 +22676,7 @@ self: {
        pname = "attoparsec-text";
        version = "0.8.5.3";
        sha256 = "1qq42lp1sah80a6lnnafi6pwl61b4w4q4jk1pbb7pg5p06mmk315";
-       buildDepends = [ array attoparsec base containers text ];
+       libraryHaskellDepends = [ array attoparsec base containers text ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home";
        description = "(deprecated)";
@@ -22119,7 +22690,7 @@ self: {
        pname = "attoparsec-text-enumerator";
        version = "0.2.0.1";
        sha256 = "0cffcwji141js09r7avb15b08xl4s8cgk5vxyrqaq7zw40hhb1gz";
-       buildDepends = [ attoparsec-text base enumerator text ];
+       libraryHaskellDepends = [ attoparsec-text base enumerator text ];
        jailbreak = true;
        description = "(deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -22132,7 +22703,7 @@ self: {
        pname = "attoparsec-trans";
        version = "0.1.1.0";
        sha256 = "0lsbl7hhirr13jmn6fc4g5443j73p4rxjgxvv967n5dsp7xrjaa7";
-       buildDepends = [ attoparsec base transformers ];
+       libraryHaskellDepends = [ attoparsec base transformers ];
        homepage = "https://github.com/srijs/haskell-attoparsec-trans";
        description = "Interleaved effects for attoparsec parsers";
        license = stdenv.lib.licenses.mit;
@@ -22144,7 +22715,7 @@ self: {
        pname = "attosplit";
        version = "0.1.0.0";
        sha256 = "01sh8k9n9040xqx1lbn74rcf59j54n5861d9db1y5cdy7qssxyg4";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/attosplit";
        description = "Split a lazy bytestring at boundaries defined by an attoparsec parser";
@@ -22159,7 +22730,9 @@ self: {
        sha256 = "1wmfnvl39amyfzkvpd3gysshyf10fjjb91zibalkqbq9pbsnfzjk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base Cabal directory epic haskell98 ];
+       executableHaskellDepends = [
+         array base Cabal directory epic haskell98
+       ];
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
        license = stdenv.lib.licenses.bsd3;
@@ -22174,7 +22747,7 @@ self: {
        sha256 = "1vfp5x5b6z7lwjiv8jla5bdwbcbafdm31zs9kr555idzz1n8wmqz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base deepseq utility-ht ];
+       libraryHaskellDepends = [ base deepseq utility-ht ];
        homepage = "http://code.haskell.org/~thielema/audacity";
        description = "Interchange with the Audacity sound signal editor";
        license = stdenv.lib.licenses.bsd3;
@@ -22190,7 +22763,7 @@ self: {
        pname = "audiovisual";
        version = "0.0";
        sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base boundingboxes colors deepseq directory filepath free freetype2
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
          random template-haskell transformers vector void WAVE
@@ -22209,9 +22782,11 @@ self: {
        sha256 = "08z6l97hi6clv3b34mz9zjc5rns02jx1zx9iqdsmjl2p7hcn7rs5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring directory HUnit unix ];
-       extraLibraries = [ augeas ];
-       pkgconfigDepends = [ augeas ];
+       libraryHaskellDepends = [ base bytestring directory unix ];
+       libraryPkgconfigDepends = [ augeas ];
+       executableHaskellDepends = [ HUnit ];
+       executableSystemDepends = [ augeas ];
+       executablePkgconfigDepends = [ augeas ];
        homepage = "http://trac.haskell.org/augeas";
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
@@ -22228,7 +22803,7 @@ self: {
        sha256 = "1jvbf3z9z6m40hprykxcc5xwbmwm6p5hwlyab0dimd8h2ar50xfr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring classify containers directory filepath HaXml mtl
          process
        ];
@@ -22246,7 +22821,7 @@ self: {
        pname = "aur";
        version = "3.0.0";
        sha256 = "1sf76lysp8xchym78ha4glrw11hxic5g684mm8h6w0n05x1ywxcn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base filepath lens lens-aeson mtl text vector
          wreq
        ];
@@ -22265,7 +22840,7 @@ self: {
        pname = "authenticate";
        version = "1.3.2.11";
        sha256 = "1xkzaw9a338yclbm10cfa9cnjdjpmzif2qj4hprig45z5szqi4q4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring case-insensitive
          conduit containers http-conduit http-types monad-control
          network-uri resourcet tagstream-conduit text transformers
@@ -22282,7 +22857,7 @@ self: {
        pname = "authenticate-kerberos";
        version = "1.0.0";
        sha256 = "06k8xi9n44xq63dpmcv4l0vg35y19dk5x1ibyay05w58k4kv4fdq";
-       buildDepends = [ base process text ];
+       libraryHaskellDepends = [ base process text ];
        homepage = "http://github.com/yesodweb/authenticate";
        description = "Authentication methods for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
@@ -22294,7 +22869,7 @@ self: {
        pname = "authenticate-ldap";
        version = "0.0.3";
        sha256 = "1wsx43l7jl40jpzhiv2fjc1mnpsaaryrjpqaiyqsn3ahacsy4ly5";
-       buildDepends = [ base LDAP text transformers ];
+       libraryHaskellDepends = [ base LDAP text transformers ];
        jailbreak = true;
        homepage = "http://github.com:mlitchard/authenticate-ldap";
        description = "LDAP authentication for Haskell web applications";
@@ -22310,7 +22885,7 @@ self: {
        pname = "authenticate-oauth";
        version = "1.5.1.1";
        sha256 = "02y35yd4zmpy36yba2nzbvijhfw0wvijkiqmh7h9qjpbqvmib7zb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring crypto-pubkey-types
          data-default http-client http-types random RSA SHA time
          transformers
@@ -22326,7 +22901,7 @@ self: {
        pname = "authinfo-hs";
        version = "0.1.0.0";
        sha256 = "1jv0y4y2ig8dx95xw3zbxc1h9mv3wi3r8xqx00llmf2qs6wgdlp5";
-       buildDepends = [ attoparsec base network text ];
+       libraryHaskellDepends = [ attoparsec base network text ];
        homepage = "http://github.com/robgssp/authinfo-hs";
        description = "Password querying for .authinfo";
        license = stdenv.lib.licenses.mit;
@@ -22341,7 +22916,7 @@ self: {
        pname = "authoring";
        version = "0.3.4";
        sha256 = "0jfxgrbkcqpfcvg1jk7ysd74bq7xjlvzqamnr3qg4ib9zg6yw0k4";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base citation-resolve containers data-default
          haskell-src-meta HaTeX lens mtl parsers safe template-haskell text
          transformers trifecta
@@ -22361,7 +22936,7 @@ self: {
        pname = "auto";
        version = "0.4.3.0";
        sha256 = "13ic0sh45ixxg456yg3y47f6b3avqn2l5ds0jc933ldk0z0wsdn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans bytestring cereal containers deepseq MonadRandom
          profunctors random semigroups transformers
        ];
@@ -22376,7 +22951,7 @@ self: {
        pname = "auto-update";
        version = "0.1.2.2";
        sha256 = "1ns4c5mqhnm7hsiqxf1ivjs5fflyq92b16ldzrcl0p85631h0c3v";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/yesodweb/wai";
        description = "Efficiently run periodic, on-demand actions";
        license = stdenv.lib.licenses.mit;
@@ -22392,7 +22967,7 @@ self: {
        pname = "autonix-deps";
        version = "0.3.0.0";
        sha256 = "0mp2v6wdm4nlagg3z9xmxd9dfkchazgvbgdphm1nfqzkg8w7ralv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring conduit containers errors
          filepath lens libarchive-conduit mtl optparse-applicative process
          regex-tdfa resourcet semigroups text transformers xml
@@ -22411,10 +22986,13 @@ self: {
        sha256 = "0njmgx2x6018ca1r2xvbi3pq0rigqm4fjkk33q5kzacvmv5ni461";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          autonix-deps base bytestring conduit containers filepath lens mtl
          text transformers
        ];
+       executableHaskellDepends = [
+         autonix-deps base containers lens mtl
+       ];
        description = "Generate dependencies for KDE 5 Nix expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22427,7 +23005,7 @@ self: {
        sha256 = "0yrlaq2jr89ncla3cpj6ir8bamwdchxnr39vsvkm7qpan61f2x65";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory mtl process unix ];
+       libraryHaskellDepends = [ base directory mtl process unix ];
        homepage = "http://code.haskell.org/autoproc";
        description = "EDSL for Procmail scripts";
        license = stdenv.lib.licenses.bsd3;
@@ -22440,7 +23018,7 @@ self: {
        pname = "avahi";
        version = "0.1.1";
        sha256 = "0b2bw0rp33g8s1y6hyqji3ycv26a4ixgjmkph93isnjxglfl6ah0";
-       buildDepends = [ base dbus-core text ];
+       libraryHaskellDepends = [ base dbus-core text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22451,10 +23029,10 @@ self: {
      mkDerivation {
        pname = "average";
        version = "0.6.1";
-       revision = "1";
        sha256 = "13qkgkwdcb09s69wzhd3b6dl1nm66lv2hqb51gmr4s64ylgf0a9h";
+       revision = "1";
        editedCabalFile = "90c8c1d4ece76a1f1b43f1a6bef7ba15340a2bec8e2efbb465884d6b50b5d174";
-       buildDepends = [ base semigroups vector-space ];
+       libraryHaskellDepends = [ base semigroups vector-space ];
        description = "An average (arithmetic mean) monoid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22470,13 +23048,13 @@ self: {
        pname = "avers";
        version = "0.0.9";
        sha256 = "0zcgq4b20vvg2mqm9yqm4gvakafn9r8mghki8bn87xhk0w7h99km";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring clock containers
          cryptohash filepath inflections MonadRandom mtl network network-uri
          resource-pool rethinkdb-client-driver safe scrypt stm
          template-haskell text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring containers
          cryptohash hspec inflections MonadRandom mtl resource-pool
          rethinkdb-client-driver scrypt stm text time unordered-containers
@@ -22495,8 +23073,8 @@ self: {
        pname = "avl-static";
        version = "0.1.0.0";
        sha256 = "13rl5wrpmbb4c0zsaymivi4d9qg2wl4lfw4nvkd81naqm3vskc10";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -22510,7 +23088,7 @@ self: {
        pname = "avr-shake";
        version = "0.0.1.1";
        sha256 = "0avj9idsk70c7gzkm18kcsvh3xhg57r8aifhdpyihzyvp87k61pn";
-       buildDepends = [ base dependent-sum mtl process shake ];
+       libraryHaskellDepends = [ base dependent-sum mtl process shake ];
        homepage = "https://github.com/mokus0/avr-shake";
        description = "AVR Crosspack actions for shake build systems";
        license = stdenv.lib.licenses.publicDomain;
@@ -22524,7 +23102,7 @@ self: {
        pname = "awesomium";
        version = "0.1.0.0";
        sha256 = "0qd89nlw4rqdl8iya49rldyn5a36d64slcnw5pfh5c5aajh27aq2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec awesomium-raw base containers text vector
        ];
        description = "High-level Awesomium bindings";
@@ -22538,7 +23116,7 @@ self: {
        pname = "awesomium-glut";
        version = "0.1.0.0";
        sha256 = "175hgqix2j26579g0rrryl86w7qvla95nvf4lwfxsxxwqgcq3zpd";
-       buildDepends = [ awesomium awesomium-raw base GLUT ];
+       libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22550,9 +23128,9 @@ self: {
        pname = "awesomium-raw";
        version = "0.1.0.0";
        sha256 = "0djilsrgb8y84ssslwawhw6lky7bqspz31qwjy9lkxywi5hwxnyb";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ awesomium ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ awesomium ];
+       libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22575,7 +23153,7 @@ self: {
        sha256 = "0aykch71qakmxn47i6h23h52dp41x7kwcibv527xg57ab71vm1bc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
          conduit-extra containers cryptohash data-default directory filepath
@@ -22583,7 +23161,7 @@ self: {
          old-locale resourcet safe scientific tagged text time transformers
          unordered-containers utf8-string vector xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring errors http-client lifted-base monad-control
          mtl QuickCheck quickcheck-instances resourcet tagged tasty
          tasty-quickcheck text time transformers transformers-base
@@ -22601,7 +23179,7 @@ self: {
        pname = "aws-cloudfront-signer";
        version = "1.1.0.2";
        sha256 = "0cxh0b0g4lms2zpgw6q4k7bk2a7px8kafdr6qrbrcf7p3dkmzwd9";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-bytestring bytestring
          crypto-pubkey-types old-locale RSA time
        ];
@@ -22620,10 +23198,10 @@ self: {
      mkDerivation {
        pname = "aws-configuration-tools";
        version = "0.1.0.0";
-       revision = "2";
        sha256 = "0xqwhd15ijwf6h26hb1nl16813b1rfh1nx6qipslz6pw857vv53b";
+       revision = "2";
        editedCabalFile = "536eacac6f54fbeb3e823d5b751eaa8cf1bb45a69f1d0bf54bdbff6245eb93e9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws aws-general aws-kinesis base base-unicode-symbols bytestring
          configuration-tools mtl text transformers
        ];
@@ -22640,7 +23218,7 @@ self: {
        pname = "aws-dynamodb-conduit";
        version = "0.1.0.6";
        sha256 = "15svx7c8nld8bgwqwy5mwkbniz4c1ifw2rw427gwk7y2py1hq38p";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec-trans aws base bytestring conduit containers
          http-conduit http-types json-togo resourcet text transformers
        ];
@@ -22660,7 +23238,7 @@ self: {
        pname = "aws-dynamodb-streams";
        version = "0.1.0.0";
        sha256 = "0yqmijls71jyvic2saabj3kwnpaxmlj6mf4krcdli3626ra7w4r2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec aws aws-general base base-unicode-symbols
          base16-bytestring base64-bytestring byteable bytestring
          case-insensitive conduit conduit-extra containers cryptohash
@@ -22686,12 +23264,15 @@ self: {
        sha256 = "0wgg05hnzjrlhzkc5giy5gdkiy4dg6hvgdq433ifld11vrpy152d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws base base16-bytestring base64-bytestring blaze-builder
          byteable bytestring conduit-extra containers cryptohash
-         http-conduit http-types mtl optparse-applicative resourcet
-         scientific template-haskell text time unordered-containers vector
-         xml-conduit yaml
+         http-conduit http-types mtl resourcet scientific template-haskell
+         text time unordered-containers vector xml-conduit
+       ];
+       executableHaskellDepends = [
+         aeson aws base bytestring containers optparse-applicative text
+         unordered-containers vector yaml
        ];
        homepage = "https://github.com/zalora/aws-ec2";
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
@@ -22710,11 +23291,11 @@ self: {
        sha256 = "02dygqqyal6s3ibjvgxng4vspld3c6mrgrwdhig8lfri2zdpqsw9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws aws-sign4 base bytestring conduit containers http-conduit
          http-types QuickCheck regex-compat safe text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base Cabal containers QuickCheck regex-compat safe text
        ];
        homepage = "http://github.com/iconnect/aws-elastic-transcoder";
@@ -22734,12 +23315,12 @@ self: {
        pname = "aws-general";
        version = "0.2.2";
        sha256 = "08sy37w162zqd6dqi8kkg0782nv00jsp48bnrmhwhmkhnd2arfrj";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring blaze-builder byteable
          bytestring case-insensitive cryptohash deepseq hashable http-types
          parsers QuickCheck quickcheck-instances text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec aws base bytestring case-insensitive charset directory
          either errors http-types parsers QuickCheck quickcheck-instances
          tagged tasty tasty-quickcheck text time transformers
@@ -22760,13 +23341,13 @@ self: {
        pname = "aws-kinesis";
        version = "0.1.5";
        sha256 = "0npiff5zrcs552y8lq3q6fgnwffqy11dvgs3yaygy0m99mgiaaiz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws aws-general base base64-bytestring blaze-builder
          bytestring conduit conduit-extra deepseq http-conduit http-types
          parsers QuickCheck quickcheck-instances resourcet text time
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aws aws-general base bytestring errors mtl QuickCheck tagged
          tasty tasty-quickcheck text transformers
        ];
@@ -22787,18 +23368,23 @@ self: {
      mkDerivation {
        pname = "aws-kinesis-client";
        version = "0.4.0.2";
-       revision = "1";
        sha256 = "1vygs2qdnwjw8pygbsncc22cq9294hmlbzi2fysi3agva2qxzmwx";
+       revision = "1";
        editedCabalFile = "4bd055f19f3ced5d6f52eec169220d7c5159cfa521128a3118aedecc9c3ad2f3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson aws aws-kinesis base base-unicode-symbols conduit containers
+         data-carousel enclosed-exceptions http-conduit kan-extensions lens
+         lens-action lifted-async lifted-base monad-control mtl nats random
+         resourcet stm stm-chans stm-queue-extras text transformers
+         unordered-containers
+       ];
+       executableHaskellDepends = [
          aeson aws aws-configuration-tools aws-general aws-kinesis base
          base-unicode-symbols bytestring conduit configuration-tools
-         containers data-carousel enclosed-exceptions http-conduit
-         kan-extensions lens lens-action lifted-async lifted-base
-         monad-control mtl nats optparse-applicative random resourcet stm
-         stm-chans stm-queue-extras text transformers unordered-containers
+         http-conduit kan-extensions lens lifted-async lifted-base
+         monad-control mtl optparse-applicative text transformers
        ];
        jailbreak = true;
        description = "A producer & consumer client library for AWS Kinesis";
@@ -22817,9 +23403,15 @@ self: {
        sha256 = "1v7i39sd6rizrrgxpqp3pnc45sry4glkb7yi0jx8qcxf2d8bklnn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aws aws-general aws-kinesis aws-sdk base base-unicode-symbols
-         bytestring conduit either hoist-error lens lens-action lifted-async
+         bytestring conduit hoist-error lens lens-action lifted-async
+         lifted-base monad-control mtl optparse-applicative resourcet text
+         time transformers
+       ];
+       executableHaskellDepends = [
+         aws aws-general aws-kinesis aws-sdk base base-unicode-symbols
+         conduit either hoist-error lens lens-action lifted-async
          lifted-base monad-control mtl optparse-applicative resourcet text
          time transformers
        ];
@@ -22840,7 +23432,7 @@ self: {
        pname = "aws-lambda";
        version = "0.1.0.1";
        sha256 = "1dy9q86yvrydw7h1l1n4ciai400w7czc26mizzfi4r369mqyan89";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws-general base base-unicode-symbols bytestring containers
          exceptions filepath http-client http-types lens lens-action
          lens-aeson mtl old-locale text time wreq zip-archive
@@ -22864,11 +23456,14 @@ self: {
        sha256 = "1m9najkh21ww4xmddad8ksnfa3if8q955q1vf3m48f52r2dl81hw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson async aws base bytestring configuration-tools containers
-         dlist errors http-client lens lifted-base monad-control mtl
-         optparse-applicative resourcet statistics text time transformers
-         vector
+       libraryHaskellDepends = [
+         aeson aws base errors lifted-base monad-control mtl text
+         transformers
+       ];
+       executableHaskellDepends = [
+         async aws base bytestring configuration-tools containers dlist
+         errors http-client lens monad-control optparse-applicative
+         resourcet statistics text time transformers vector
        ];
        homepage = "http://github.com/alephcloud/hs-aws-performance-tests";
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
@@ -22884,7 +23479,7 @@ self: {
        pname = "aws-route53";
        version = "0.1.2";
        sha256 = "0qg0fzw5kb3xvldxc2sx7xgkwgspyscvs83sv3nrw91qjp6ypi18";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
        ];
@@ -22904,14 +23499,14 @@ self: {
        pname = "aws-sdk";
        version = "0.12.4";
        sha256 = "0zmwfkfddiyyn264kay6m295fh23gii8axln1fjykbsdgd6yy5rb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring conduit conduit-extra containers
          data-default http-conduit http-types iproute lifted-base
          monad-control mtl old-locale parallel parsec resourcet safe SHA
          simple-config strptime template-haskell text time tls transformers
          transformers-base xml-conduit xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit hspec http-conduit HUnit iproute lifted-base
          monad-control QuickCheck random resourcet text time tls
          transformers
@@ -22931,11 +23526,11 @@ self: {
        pname = "aws-sdk-text-converter";
        version = "0.3";
        sha256 = "06a9sj9k1zpnzjcz8bd952fljwdn5r3vn5cg0vvc50bnidf99nfk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring iproute old-locale safe strptime template-haskell
          text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec HUnit iproute old-locale QuickCheck safe
          strptime template-haskell text time
        ];
@@ -22954,11 +23549,11 @@ self: {
        pname = "aws-sdk-xml-unordered";
        version = "0.3.1";
        sha256 = "0f90l61npi6x59i81k2cjfklpjl5m52zj7ww04k3y5x5c7nj26nd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws-sdk-text-converter base conduit containers lifted-base mtl
          resourcet text unordered-containers xml-conduit xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit hspec mtl resourcet text xml-conduit
        ];
        homepage = "https://github.com/worksap-ate/aws-sdk-xml-unordered";
@@ -22977,11 +23572,11 @@ self: {
        pname = "aws-sign4";
        version = "1.1.0.1";
        sha256 = "1jw4dp8gg4lzski55iw5m5xihyx1cp33c334nlkd2xydrkk8rjhh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base blaze-builder byteable bytestring case-insensitive
          cryptohash http-types old-locale safe time
        ];
-       testDepends = [
+       testHaskellDepends = [
          attempt aws base blaze-builder byteable bytestring
          bytestring-lexing Cabal case-insensitive cryptohash directory
          filepath http-types old-locale safe text time
@@ -23003,12 +23598,12 @@ self: {
        pname = "aws-sns";
        version = "0.1";
        sha256 = "1v1fjldn1bx65vv84zgx7np84pl4cr1wddngchkjxzci07ydrjpm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws aws-general base blaze-builder bytestring conduit
          containers http-conduit http-types parsers QuickCheck resourcet
          text time transformers xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aws aws-general base bytestring errors mtl QuickCheck tagged
          tasty tasty-quickcheck text transformers
        ];
@@ -23027,7 +23622,7 @@ self: {
        pname = "azure-acs";
        version = "0.0.1.1";
        sha256 = "09gv4ym6nxx5854m40p06pxvxrqfhmadxlb0d72pji6hk180yg5l";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra connection
          http-conduit http-types network time
        ];
@@ -23045,7 +23640,7 @@ self: {
        pname = "azure-service-api";
        version = "0.1.0.0";
        sha256 = "09wb94k8f8wgcdx036x2fzixck7cbv739rrh299m7awbl4i3mfhg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring case-insensitive certificate
          crypto-pubkey-types http-conduit hxt hxt-xpath pretty resourcet tls
          tls-extra transformers
@@ -23066,7 +23661,7 @@ self: {
        pname = "azure-servicebus";
        version = "0.1.6.0";
        sha256 = "1ig8af14m11di9fis6s5hxmfqh7hc40c3bqyighnpi25xnv7mm13";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec azure-acs base bytestring case-insensitive
          conduit connection http-client http-conduit http-types network text
        ];
@@ -23089,7 +23684,13 @@ self: {
        sha256 = "0nqkpizqiwv7wfs1bgl8q13aaqnc9wjh8gs6fyiklplnjdcpqf9g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring case-insensitive conduit
+         data-default http-conduit http-date http-types hxt hxt-unicode
+         network old-locale SHA text time transformers unix-compat
+         utf8-string
+       ];
+       executableHaskellDepends = [
          base base64-bytestring bytestring case-insensitive cmdargs conduit
          data-default directory http-conduit http-date http-types hxt
          hxt-unicode network old-locale SHA text time transformers
@@ -23110,11 +23711,11 @@ self: {
        pname = "b-tree";
        version = "0.1.1";
        sha256 = "1c20w9rzyj2gnd18042pv41r45cv3zvd5h83igh6w2gz1z7hl821";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory errors filepath lens
          mmap mtl pipes pipes-interleave transformers vector
        ];
-       testDepends = [ base binary containers pipes QuickCheck ];
+       testHaskellDepends = [ base binary containers pipes QuickCheck ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/b-tree";
        description = "Immutable disk-based B* trees";
@@ -23135,13 +23736,16 @@ self: {
        sha256 = "0r8gjgmy9v655kza2c6ilngr4glijizgjddq0125s11pd40hzhvi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bifunctors binary bytestring conduit conduit-extra
-         ConfigFile directory filepath free mtl optparse-applicative parsec
-         pretty pretty-show process QuickCheck random semigroups syb
-         template text time transformers unordered-containers vector yaml
+         ConfigFile directory filepath free mtl parsec pretty pretty-show
+         process QuickCheck random semigroups syb template text time
+         transformers unordered-containers vector yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring optparse-applicative
+       ];
+       testHaskellDepends = [
          aeson base bytestring hspec hspec-expectations QuickCheck
          semigroups text unordered-containers vector yaml
        ];
@@ -23158,7 +23762,9 @@ self: {
        sha256 = "12cyn149dgd9wvnc7smqsfy15mzgyfg8l17y6qz0k4dyapp8fvhf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers random wx wxcore ];
+       executableHaskellDepends = [
+         array base containers random wx wxcore
+       ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
      }) {};
@@ -23173,7 +23779,7 @@ self: {
        sha256 = "1z5v0p2yfgln9sv41myr10cjq60xcaav0hfzc18bmmssl8x2yljy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory haskell98 hslogger old-time process random
        ];
        jailbreak = true;
@@ -23190,7 +23796,7 @@ self: {
        pname = "backtracking-exceptions";
        version = "0.1.0.0";
        sha256 = "1m4z4m4ncyswvbr12dsvl0gz5398jxy99zkh22xjrdmfgl8rx6p2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base either free kan-extensions mtl semigroupoids semigroups
          transformers
        ];
@@ -23206,7 +23812,7 @@ self: {
        pname = "backward-state";
        version = "0.1.0.2";
        sha256 = "1akxm0v23gnph5jxwi20wq4lk07vd2kpiqns550k499yw95vqyam";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/luqui/backward-state";
        description = "A state monad that runs the state in reverse through the computation";
@@ -23221,7 +23827,7 @@ self: {
        sha256 = "19y7p53b80lqfrs1b945l4pc73c54zivk8l6lffzznd7gmbc0mv5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gd X11 ];
+       executableHaskellDepends = [ base gd X11 ];
        homepage = "http://www.dmwit.com/bacteria";
        description = "braindead utility to compose Xinerama backgrounds";
        license = "unknown";
@@ -23233,7 +23839,7 @@ self: {
        pname = "bag";
        version = "0.1";
        sha256 = "18n7ggrfm39mn4rva661hkxj75gjx2p3jcm0hlzpcshxyk93iblr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23252,7 +23858,13 @@ self: {
        sha256 = "1xxv78i2q9hiw30vkbcx09nabqv88g3a6k872ckm9wk8isrnw2zz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring cmdargs containers deepseq direct-sqlite
+         directory disk-free-space extra filepath hashable HTTP http-types
+         old-locale random safe shake smtp-mail sqlite-simple text time
+         transformers unordered-containers wai warp
+       ];
+       executableHaskellDepends = [
          aeson base bytestring cmdargs containers deepseq direct-sqlite
          directory disk-free-space extra filepath hashable HTTP http-types
          old-locale process random safe shake smtp-mail sqlite-simple text
@@ -23273,7 +23885,7 @@ self: {
        pname = "bamboo";
        version = "2010.2.25";
        sha256 = "0v96ync9vkq7xyc5jmm7k7vfxpy4m1l2370m99wa8qlrpcffhrmi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default directory filepath gravatar
          hack hack-contrib haskell98 mps mtl network old-locale old-time
          pandoc parsec parsedate process time unix utf8-string xhtml zlib
@@ -23295,7 +23907,7 @@ self: {
        sha256 = "1xp2k33jxbkf0maj3p3grv93c9vnjg6fzy6l8gg5dhil18834vdd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          bamboo bamboo-theme-blueprint base bytestring data-default hack
          hack-contrib hack-handler-hyena haskell98 mps process
        ];
@@ -23313,7 +23925,7 @@ self: {
        pname = "bamboo-plugin-highlight";
        version = "2009.7.5";
        sha256 = "0f8hpampawv0csqsb504hg97r7mimkcs9irm9i2m2b13w5fciaqc";
-       buildDepends = [
+       libraryHaskellDepends = [
          bamboo base bytestring hack hack-contrib highlighting-kate hxt mps
          xhtml
        ];
@@ -23332,7 +23944,7 @@ self: {
        pname = "bamboo-plugin-photo";
        version = "2009.7.5";
        sha256 = "19ik80hcshmw8gpsb9gwngnwvriri10xx2v6xvrz0q25cxgwdjah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default directory filepath hack hack-contrib
          haskell98 hxt mps utf8-string xhtml
        ];
@@ -23351,7 +23963,7 @@ self: {
        pname = "bamboo-theme-blueprint";
        version = "2010.2.25.1";
        sha256 = "1wchvz2nm4klg11wjk3yb5yvqpa26c9lg6xc65k0dwxhy0cyd2zx";
-       buildDepends = [
+       libraryHaskellDepends = [
          bamboo base bytestring containers data-default gravatar hack
          hack-contrib hcheat mps network rss utf8-string xhtml
        ];
@@ -23372,7 +23984,7 @@ self: {
        pname = "bamboo-theme-mini-html5";
        version = "2009.11.27";
        sha256 = "02zh9jqq46gg3hrsfjfq2skajr4jni3cisak4nd3shl6aqapw9d6";
-       buildDepends = [
+       libraryHaskellDepends = [
          bamboo base base64-string bytestring cgi containers data-default
          directory filepath gravatar hack hack-contrib haskell98 hcheat moe
          mps mtl network old-locale old-time parsec parsedate process rss
@@ -23394,10 +24006,10 @@ self: {
        sha256 = "1nykyywrqmf5nyszfg3acm0ydr9z8q78wc7bgabfmjwrnpq1dw68";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base com directory filepath HUnit old-time pretty process
-         QuickCheck regex-compat
+       libraryHaskellDepends = [
+         base com directory filepath old-time pretty process regex-compat
        ];
+       executableHaskellDepends = [ HUnit QuickCheck ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23411,7 +24023,7 @@ self: {
        sha256 = "0z8k47h492818yvgxggqw4gcb6m91pw70kpibf9s384vxcbj6r24";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs samtools ];
+       executableHaskellDepends = [ base cmdargs samtools ];
        homepage = "http://blog.malde.org/posts/bamstats.html";
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
@@ -23423,8 +24035,8 @@ self: {
        pname = "bank-holidays-england";
        version = "0.1.0.3";
        sha256 = "12k01aa0293izblgr7kszkilnw29716hddqfs9cq18h49gp6m7s5";
-       buildDepends = [ base containers time ];
-       testDepends = [ base containers hspec QuickCheck time ];
+       libraryHaskellDepends = [ base containers time ];
+       testHaskellDepends = [ base containers hspec QuickCheck time ];
        homepage = "https://bitbucket.org/davecturner/bank-holidays-england";
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
@@ -23438,10 +24050,10 @@ self: {
        pname = "banwords";
        version = "0.2.0.1";
        sha256 = "13mnz060yi1j6gsxknn1ara34s4ymdswysypj8d94k1741jv89yn";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring data-default text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base HUnit test-framework test-framework-hunit text
          vector
        ];
@@ -23458,7 +24070,8 @@ self: {
        sha256 = "160ja5sdk0zdqc0ncsyldp4rmhc2g4zfa6xc7vbzf8gpqrcmzvgy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs csv diagrams filepath ];
+       libraryHaskellDepends = [ base csv diagrams filepath ];
+       executableHaskellDepends = [ base cmdargs csv diagrams filepath ];
        jailbreak = true;
        homepage = "http://sebfisch.github.com/haskell-barchart";
        description = "Creating Bar Charts in Haskell";
@@ -23471,7 +24084,7 @@ self: {
        pname = "barcodes-code128";
        version = "0.1.0";
        sha256 = "14blxjhapn9g7cp7374f5s2nln7wgyb7a6z50gp04lnqf1aw6kmg";
-       buildDepends = [ base bytestring HPDF ];
+       libraryHaskellDepends = [ base bytestring HPDF ];
        jailbreak = true;
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
@@ -23484,7 +24097,7 @@ self: {
        pname = "barecheck";
        version = "0.2.0.8";
        sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7";
-       buildDepends = [ base containers QuickCheck text time ];
+       libraryHaskellDepends = [ base containers QuickCheck text time ];
        jailbreak = true;
        homepage = "http://github.com/massysett/barecheck";
        description = "QuickCheck implementations for common types";
@@ -23502,7 +24115,7 @@ self: {
        sha256 = "0igz39bxlw4p0fna1wf6g791pk7r1m7hfyib5rgmsdahzkkp7v2h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath ghc ghc-prim html
          plugins snap-core snap-server text transformers unix-compat
        ];
@@ -23518,7 +24131,7 @@ self: {
        pname = "barrie";
        version = "0.4.1";
        sha256 = "10iraid6v333374mx9vinvaw6r1903ipa92xjxhl8qh4w7xmr9yv";
-       buildDepends = [ base containers filepath glib gtk ];
+       libraryHaskellDepends = [ base containers filepath glib gtk ];
        homepage = "http://thewhitelion.org/haskell/barrie";
        description = "Declarative Gtk GUI library";
        license = "GPL";
@@ -23532,16 +24145,16 @@ self: {
      mkDerivation {
        pname = "barrier";
        version = "0.1.0";
-       revision = "1";
        sha256 = "1flhgx323dnqhh6gxmfv4m8qj2yysckrr9pzw0g7jisvk6pmcz4z";
+       revision = "1";
        editedCabalFile = "2f75bd296d54424250895888d24eaec14bbdb35b355306306b6f8632052473bc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-svg bytestring template-haskell text
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring lens-family-core tasty tasty-golden
        ];
        homepage = "https://github.com/philopon/barrier";
@@ -23555,7 +24168,7 @@ self: {
        pname = "barrier-monad";
        version = "0.1.0.1";
        sha256 = "014nc21wnrklsvy5z7w4v9p9psn6bl210l7v97gj42cv6a8jk5nm";
-       buildDepends = [ base comonad mtl transformers ];
+       libraryHaskellDepends = [ base comonad mtl transformers ];
        jailbreak = true;
        description = "Implementation of barrier monad, can use custom front/back type";
        license = stdenv.lib.licenses.publicDomain;
@@ -23568,7 +24181,7 @@ self: {
        pname = "base";
        version = "4.8.1.0";
        sha256 = "0rwya445hvnnzj3x5gsrmr72kr3yspd6w9mypxkrxxg19zfazjaj";
-       buildDepends = [ ghc-prim rts ];
+       libraryHaskellDepends = [ ghc-prim rts ];
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23579,8 +24192,8 @@ self: {
        pname = "base-compat";
        version = "0.8.2";
        sha256 = "02m93hzgxg4bcnp7xcc2fdh2hrsc2h6fwl8hix5nx9k864kwf41q";
-       buildDepends = [ base unix ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base unix ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -23591,7 +24204,7 @@ self: {
        pname = "base-generics";
        version = "0.1.0.1";
        sha256 = "19k6kl66p71pza23b1n5njmj97k1pdlcm6brl1danfaxlflsmcms";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/HaskellZhangSong/base-generics";
        description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
@@ -23604,7 +24217,7 @@ self: {
        pname = "base-io-access";
        version = "0.4.0.0";
        sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/bheklilr/base-io-access";
        description = "The IO functions included in base delimited into small, composable classes";
@@ -23617,7 +24230,8 @@ self: {
        pname = "base-noprelude";
        version = "4.8.0.0";
        sha256 = "0kxpkahlwvmy86g94rawhv6x3kl761xf4s78jv1cjzglsb28q0zl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/hvr/base-noprelude";
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
@@ -23629,8 +24243,8 @@ self: {
        pname = "base-orphans";
        version = "0.4.2";
        sha256 = "1mfmhvb7zvyi3m5660755ph7xk4fdvhki6ssfd3i2ghzas8g1v7a";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
@@ -23642,7 +24256,7 @@ self: {
        pname = "base-prelude";
        version = "0.1.19";
        sha256 = "00mk7zpm3yb804h0gngvpjxhb2a6nds8qb8mwpn80s20x72083wb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed from only the \"base\" package";
        license = stdenv.lib.licenses.mit;
@@ -23654,7 +24268,7 @@ self: {
        pname = "base-unicode-symbols";
        version = "0.2.2.4";
        sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
@@ -23666,7 +24280,7 @@ self: {
        pname = "base16-bytestring";
        version = "0.1.1.6";
        sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
-       buildDepends = [ base bytestring ghc-prim ];
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
        homepage = "http://github.com/bos/base16-bytestring";
        description = "Fast base16 (hex) encoding and decoding for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -23680,8 +24294,8 @@ self: {
        pname = "base32-bytestring";
        version = "0.2.1.0";
        sha256 = "0z0q3fw3jzprgxmq9b2iz98kf4hwl3nydrzlaiwk81aplisfdgkl";
-       buildDepends = [ base bits-extras bytestring cpu ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base bits-extras bytestring cpu ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/pxqr/base32-bytestring";
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -23693,8 +24307,8 @@ self: {
        pname = "base32string";
        version = "0.9.1";
        sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy";
-       buildDepends = [ aeson base binary bytestring text ];
-       testDepends = [ base binary bytestring hspec text ];
+       libraryHaskellDepends = [ aeson base binary bytestring text ];
+       testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Fast and safe representation of a Base-32 string";
        license = stdenv.lib.licenses.mit;
@@ -23708,8 +24322,8 @@ self: {
        pname = "base58-bytestring";
        version = "0.1.0";
        sha256 = "1ls05nzswjr6aw0wwk3q7cpv1hf0lw7vk16a5khm6l21yfcgbny2";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring quickcheck-assertions quickcheck-instances tasty
          tasty-quickcheck
        ];
@@ -23726,8 +24340,10 @@ self: {
        pname = "base58address";
        version = "0.4";
        sha256 = "0z15x9wx962ywkmh5lzfg4kq2jjmyzncbpayx2lkjnpdra4xgz7a";
-       buildDepends = [ base binary bytestring containers cryptohash ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring containers cryptohash
+       ];
+       testHaskellDepends = [
          base binary bytestring containers cryptohash QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -23742,8 +24358,8 @@ self: {
        pname = "base58string";
        version = "0.10.0";
        sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv";
-       buildDepends = [ aeson base binary bytestring text ];
-       testDepends = [ base binary bytestring hspec text ];
+       libraryHaskellDepends = [ aeson base binary bytestring text ];
+       testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Fast and safe representation of a Base-58 string";
        license = stdenv.lib.licenses.mit;
@@ -23757,8 +24373,8 @@ self: {
        pname = "base64-bytestring";
        version = "1.0.0.1";
        sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -23775,8 +24391,10 @@ self: {
        pname = "base64-conduit";
        version = "1.0.0.1";
        sha256 = "07zhvn3fy60q04a5g5mzhkl17rap9jlh00vb4f6565bjha2k16g9";
-       buildDepends = [ base base64-bytestring bytestring conduit ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring conduit
+       ];
+       testHaskellDepends = [
          base base64-bytestring bytestring conduit hspec QuickCheck
          transformers
        ];
@@ -23792,7 +24410,7 @@ self: {
        pname = "base64-string";
        version = "0.2";
        sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://urchin.earth.li/~ian/cabal/base64-string/";
        description = "Base64 implementation for String's";
        license = "unknown";
@@ -23808,8 +24426,13 @@ self: {
        sha256 = "1lz9s7w5nlp4naj9jzwb73im0vbs5nlrddg18irjz64sgq3qd2nn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring mono-traversable text ];
-       testDepends = [ base bytestring mono-traversable QuickCheck text ];
+       libraryHaskellDepends = [ base mono-traversable ];
+       executableHaskellDepends = [
+         base bytestring mono-traversable text
+       ];
+       testHaskellDepends = [
+         base bytestring mono-traversable QuickCheck text
+       ];
        homepage = "https://github.com/ajg/base91";
        description = "A Generic Base91 Encoder & Decoder";
        license = stdenv.lib.licenses.mit;
@@ -23821,7 +24444,7 @@ self: {
        pname = "basex-client";
        version = "0.1.0.0";
        sha256 = "189bmv479fmljy9w7nhc5mb7546iz8vahrmxffvgny51ywklk58n";
-       buildDepends = [ base network pureMD5 utf8-string ];
+       libraryHaskellDepends = [ base network pureMD5 utf8-string ];
        description = "A BaseX client for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -23834,7 +24457,7 @@ self: {
        pname = "bash";
        version = "0.1.8";
        sha256 = "1wv7haxb4vvnh9i7y17m1d7qbpl92qjrnn022g6hyxbxzmpgsw60";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers hxt-regex-xmlschema mtl SHA
          shell-escape
        ];
@@ -23848,10 +24471,10 @@ self: {
      mkDerivation {
        pname = "basic-lens";
        version = "0.0.0";
-       revision = "1";
        sha256 = "0qgd2066vgsrzglcmw1jd7lcrpxvrzch7bnyyfxzddwxj148mvnj";
+       revision = "1";
        editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Basic lens type and functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23864,10 +24487,10 @@ self: {
      mkDerivation {
        pname = "basic-prelude";
        version = "0.5.0";
-       revision = "1";
        sha256 = "1l8hc99sxm27gd93zq6v0l0x2rzl6fd9zp7snh14m4yriqrn5xfi";
+       revision = "1";
        editedCabalFile = "2ddf5a9d3413a8e7c877c488f63451357fcde4d187f7c560f5281a0c4856fd0b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers filepath hashable lifted-base ReadArgs
          safe text transformers unordered-containers vector
        ];
@@ -23882,7 +24505,9 @@ self: {
        pname = "basic-sop";
        version = "0.1.0.5";
        sha256 = "0zmjd11jckaknkifyif4zq5833cs2kxpm98j43viqc09w63brcx3";
-       buildDepends = [ base deepseq generics-sop QuickCheck text ];
+       libraryHaskellDepends = [
+         base deepseq generics-sop QuickCheck text
+       ];
        description = "Basic examples and functions for generics-sop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23895,7 +24520,9 @@ self: {
        sha256 = "1vb74crz57i4qmjl8k3gxr2abz9rmpw7yl5sm1pggnlfy9wcm15l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec pretty unix ];
+       executableHaskellDepends = [
+         base containers mtl parsec pretty unix
+       ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "An interpreter for a small functional language";
        license = "GPL";
@@ -23908,7 +24535,9 @@ self: {
        pname = "battlenet";
        version = "0.2.0.0";
        sha256 = "1nzli8n6lpa9jahwp3awvpafzfkx4j02bwanilh30sxfyp0mlxxa";
-       buildDepends = [ aeson base containers http-conduit text ];
+       libraryHaskellDepends = [
+         aeson base containers http-conduit text
+       ];
        jailbreak = true;
        homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "API client for Battle.Net";
@@ -23921,7 +24550,9 @@ self: {
        pname = "battlenet-yesod";
        version = "0.2.0.0";
        sha256 = "056z84rha1nwjij3am16vfp4nwgp7xzqrhkvrx9s8p1vivyb80yz";
-       buildDepends = [ base battlenet http-conduit text yesod-core ];
+       libraryHaskellDepends = [
+         base battlenet http-conduit text yesod-core
+       ];
        jailbreak = true;
        homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "Yesod integration for the battlenet package";
@@ -23943,13 +24574,18 @@ self: {
        sha256 = "1rg96qikd687wndwj0pgvzg2ln4vh7x304cnyiisci2ka9763cld";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array attoparsec base base64-bytestring blaze-svg bytestring
-         cereal colour containers cookie crypto-random data-default
-         diagrams-lib diagrams-svg fast-logger filepath hamlet hjsmin
-         MonadRandom mtl shakespeare-js shakespeare-text SimpleAES
-         template-haskell text transformers wai-extra wai-handler-fastcgi
-         wai-logger word8 yaml yesod yesod-core yesod-routes yesod-static
+         cereal colour containers cookie data-default diagrams-lib
+         diagrams-svg fast-logger filepath hamlet hjsmin MonadRandom mtl
+         shakespeare-js shakespeare-text SimpleAES template-haskell text
+         transformers wai-extra wai-logger word8 yaml yesod yesod-core
+         yesod-routes yesod-static
+       ];
+       executableHaskellDepends = [
+         base blaze-svg bytestring containers crypto-random diagrams-lib
+         diagrams-svg filepath MonadRandom mtl transformers
+         wai-handler-fastcgi yesod
        ];
        jailbreak = true;
        homepage = "https://github.com/zrho/afp";
@@ -23968,7 +24604,7 @@ self: {
        pname = "bayes-stack";
        version = "0.2.0.1";
        sha256 = "1nz4lnnxdfgacnv6mjxsgq543zxmim4rxvxbpsfx8yypjp6lsx5l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal containers deepseq digamma enummapset gamma ghc-prim
          logfloat mtl mwc-random pretty random-fu random-source rvar
          statistics stm transformers vector
@@ -23985,7 +24621,7 @@ self: {
        pname = "bbdb";
        version = "0.4";
        sha256 = "18f07dg0f7z7b8qwmyrcl1c48mgmprnj97va33dahvm0p0iw2039";
-       buildDepends = [ base mtl parsec ];
+       libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.nadineloveshenry.com/haskell/database-bbdb.html";
        description = "Ability to read, write, and examine BBDB files";
        license = stdenv.lib.licenses.gpl3;
@@ -23997,7 +24633,7 @@ self: {
        pname = "bcrypt";
        version = "0.0.6";
        sha256 = "032la7v7kp0k26s3lj006hgc7a99ylqpp5qi27jxnac10yjl5bi5";
-       buildDepends = [ base bytestring entropy ];
+       libraryHaskellDepends = [ base bytestring entropy ];
        description = "Haskell bindings to the bcrypt password hash";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24010,8 +24646,8 @@ self: {
        pname = "bdd";
        version = "0.2.0.0";
        sha256 = "17hwqksqkrriqrm7sx70jzmi3r8184p485y9i7cqbakdjapb5a4q";
-       buildDepends = [ base HUnit mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base HUnit mtl transformers ];
+       testHaskellDepends = [
          base directory HUnit mtl process test-framework
          test-framework-hunit
        ];
@@ -24026,7 +24662,7 @@ self: {
        pname = "bdelta";
        version = "0.1.1.1";
        sha256 = "17zapldywid4xq0a6qdxh6hnk5igjjgplfydnr800xdpicicbrww";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/joeyadams/haskell-bytestring-delta";
        description = "Simple, fast binary diff/patch";
        license = stdenv.lib.licenses.mit;
@@ -24040,7 +24676,8 @@ self: {
        sha256 = "1mwc7l1n2gnw8yx5zphxlkgi6bkcw56qwifpy34wpa55x2lf6n82";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base network text url ];
+       libraryHaskellDepends = [ aeson base network text url ];
+       executableHaskellDepends = [ aeson base network text url ];
        description = "Update CSS in the browser without reloading the page";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24054,10 +24691,10 @@ self: {
        pname = "beamable";
        version = "0.1.1.1";
        sha256 = "068d70ylk5b6jlg6j1c1nayb4a3mmf7r92blcgmdbjrz3ipqwg27";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp murmur-hash
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp murmur-hash
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -24075,7 +24712,7 @@ self: {
        sha256 = "15k41z1p8h0b677wba4mqkfszwggkrfcp3n5hbdvdjfiqyx2hbzi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base haskell98 mtl ];
+       executableHaskellDepends = [ array base haskell98 mtl ];
        homepage = "http://www.cs.indiana.edu/~lepike/pub_pages/holpp.html";
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
@@ -24089,11 +24726,13 @@ self: {
      mkDerivation {
        pname = "bed-and-breakfast";
        version = "0.4.3";
-       revision = "1";
        sha256 = "0183770vkb5r9srxqr3fa4s601g10bx07b05hjr3b3nvc0ab9f6z";
+       revision = "1";
        editedCabalFile = "3efbed0b49112bb9addddcd87fdb8ffe58f14497c16a2aba9deb39e10dae0d4f";
-       buildDepends = [ array base binary deepseq template-haskell ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [
+         array base binary deepseq template-haskell
+       ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://hackage.haskell.org/package/bed-and-breakfast";
        description = "Efficient Matrix operations in 100% Haskell";
@@ -24113,7 +24752,7 @@ self: {
        sha256 = "1sq6z2a9bddqh0kys10g495bfj7pcyibsvhfxfl279z53va7d6ch";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers convertible Crypto directory filepath
          happstack-server happstack-util hdaemonize HDBC HDBC-postgresql
          hsyslog mtl network old-locale parsec process random stm time unix
@@ -24130,7 +24769,7 @@ self: {
        pname = "benchmark-function";
        version = "0.1.0.0";
        sha256 = "1cdbaf001m79xbpfdf3gg2z8jgyf25xqwrkg6y7da2mvk3127c5b";
-       buildDepends = [ base process random time ];
+       libraryHaskellDepends = [ base process random time ];
        homepage = "xy30.com";
        description = "Test the time it takes to run a haskell function";
        license = stdenv.lib.licenses.gpl3;
@@ -24142,7 +24781,7 @@ self: {
        pname = "benchpress";
        version = "0.2.2.6";
        sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
-       buildDepends = [ base mtl time ];
+       libraryHaskellDepends = [ base mtl time ];
        jailbreak = true;
        homepage = "http://github.com/tibbe/benchpress";
        description = "Micro-benchmarking with detailed statistics";
@@ -24155,7 +24794,9 @@ self: {
        pname = "bencode";
        version = "0.6.0.0";
        sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv";
-       buildDepends = [ base binary bytestring containers parsec ];
+       libraryHaskellDepends = [
+         base binary bytestring containers parsec
+       ];
        description = "Parser and printer for bencoded data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24168,10 +24809,10 @@ self: {
        pname = "bencoding";
        version = "0.4.3.0";
        sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring deepseq ghc-prim mtl pretty text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers ghc-prim hspec QuickCheck
        ];
        jailbreak = true;
@@ -24186,8 +24827,8 @@ self: {
        pname = "berkeleydb";
        version = "2008.10.31";
        sha256 = "1qqzxi011xmb4b09r1j5x1b7slgrazh19csfilk4a9f91zvq6l3p";
-       buildDepends = [ base binary bytestring ];
-       extraLibraries = [ db ];
+       libraryHaskellDepends = [ base binary bytestring ];
+       librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24205,10 +24846,14 @@ self: {
        sha256 = "066m1nyfwi1nivjmcnykjdypqzkm2zqfzb07zf6f9hiz9m4g6x09";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base containers directory extensible-exceptions filepath ghc
-         ghc-paths ghc-prim haskeline haskell-src-exts language-python
-         monads-tf parseargs process template-haskell transformers
+       libraryHaskellDepends = [
+         array base containers ghc-prim monads-tf template-haskell
+         transformers
+       ];
+       executableHaskellDepends = [
+         base containers directory extensible-exceptions filepath ghc
+         ghc-paths haskeline haskell-src-exts language-python monads-tf
+         parseargs process transformers
        ];
        jailbreak = true;
        homepage = "http://wiki.github.com/bjpop/berp/";
@@ -24227,11 +24872,11 @@ self: {
        pname = "bert";
        version = "1.2.2.4";
        sha256 = "1vcbylvci91rqq5dxsa2gxc709klr0xkcflpdhcng69s6pihgsg4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          containers mtl network parsec time unix void
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base binary bytestring containers network smallcheck tasty
          tasty-hunit tasty-smallcheck
        ];
@@ -24246,7 +24891,7 @@ self: {
        pname = "besout";
        version = "0.2.0.1";
        sha256 = "0bv68nn6ijf1wv57kwp4yj6s75g960pds0n9wihxwkr4hh5azls1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Extended GCD of polynomials over F_p[x]";
        license = stdenv.lib.licenses.bsd3;
@@ -24265,12 +24910,12 @@ self: {
        sha256 = "0gy12m81bc6vgzq4m0v134jbq5lw1210dxsq4s28c0www0kxj658";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors binary bytestring containers exceptions
          HsOpenSSL http-client http-client-openssl lens mtl semigroupoids
          semigroups text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base lens QuickCheck semigroups test-framework
          test-framework-quickcheck2 test-framework-th
        ];
@@ -24287,8 +24932,10 @@ self: {
        pname = "betacode";
        version = "0.1.0.0";
        sha256 = "0ry42sp40234c83iw7di37j3jfjfbszxcv4mzgqc54b1693mjq7b";
-       buildDepends = [ attoparsec base errors hashable text text-icu ];
-       testDepends = [ base hspec QuickCheck smallcheck ];
+       libraryHaskellDepends = [
+         attoparsec base errors hashable text text-icu
+       ];
+       testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        jailbreak = true;
        description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
        license = stdenv.lib.licenses.asl20;
@@ -24300,7 +24947,7 @@ self: {
        pname = "between";
        version = "0.10.0.0";
        sha256 = "10bj4v2451c9dri3r9c825xnr4lb8jhihr05nhc6m8fdvqnyqvsi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/trskop/between";
        description = "Function combinator \"between\" and derived combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -24312,7 +24959,7 @@ self: {
        pname = "bf-cata";
        version = "1.1";
        sha256 = "0f8pyd2j24x574xs73zhadsd058ib217vd12snkqzg6vg9l7vgzw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
      }) {};
@@ -24327,7 +24974,7 @@ self: {
        sha256 = "1i5y7pki3hyhq2vyshzi40n7yx354p7wiflfig8qxc4h31nbwi2x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bimap category-extras containers derive haskell98 mtl
          template-haskell unix
        ];
@@ -24343,7 +24990,7 @@ self: {
        pname = "bff-mono";
        version = "0.2.3";
        sha256 = "1qswfjrij01g7g85iiyxpvk1k5hgnf6ll7jcf6b33k6dawi3a4qr";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "https://bitbucket.org/kztk/bff-mono/";
        description = "\"Bidirectionalization for Free\" for Monomorphic Transformations";
        license = stdenv.lib.licenses.bsd3;
@@ -24355,7 +25002,7 @@ self: {
        pname = "bgmax";
        version = "0.1.0.1";
        sha256 = "0wg2dh3i50c4f1bc0csi3ppbz28scjfhcr0hqfd0cpfiaf79fs5s";
-       buildDepends = [ attoparsec base bytestring time ];
+       libraryHaskellDepends = [ attoparsec base bytestring time ];
        jailbreak = true;
        homepage = "http://github.com/jonpetterbergman/bgmax";
        description = "Parse BgMax-files";
@@ -24370,7 +25017,7 @@ self: {
        pname = "bgzf";
        version = "0.1.0.0";
        sha256 = "1lmwb65ads6ip5v0h8z03nyzxr9556p13j1y34lhgsyk2lxwdkrv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl parallel pipes streaming-commons
        ];
        description = "Blocked GZip";
@@ -24386,7 +25033,7 @@ self: {
        sha256 = "0y6jf52361d225a1jynq7ysnwihid3qivsjqv2hbf0f8sayi8ic0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base latex parsec utility-ht ];
+       libraryHaskellDepends = [ base latex parsec utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/BibTeX";
        description = "Parse, format and processing BibTeX files";
        license = stdenv.lib.licenses.bsd3;
@@ -24402,7 +25049,7 @@ self: {
        sha256 = "0bclazwhg3ra7zv19xfx5rw2z3p8h8scw5r4m281524qzrkm9j6m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cgi containers directory hint mtl parsec pretty
          template-haskell unix utf8-string xhtml
        ];
@@ -24418,7 +25065,7 @@ self: {
        pname = "bidispec";
        version = "0.1.3";
        sha256 = "0y9hskhp1vcl92wrh3l7b1g6i7y9v4b06pl2qa9hhp9ladnvw7g4";
-       buildDepends = [ base bytestring mtl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24430,7 +25077,7 @@ self: {
        pname = "bidispec-extras";
        version = "0.1";
        sha256 = "0insqi63q6gvz39l0k584w583cw9m85vdx5dhpyx9qbb5zxyb0rm";
-       buildDepends = [ base bytestring dataenc mtl ];
+       libraryHaskellDepends = [ base bytestring dataenc mtl ];
        jailbreak = true;
        description = "Extra helper functions for bidirectional specifications";
        license = "LGPL";
@@ -24442,7 +25089,7 @@ self: {
        pname = "bifunctors";
        version = "5";
        sha256 = "13990xdgx0n23qgi18ghhmsywj5zkr0a5bim0g8a4nzi0cx95ps1";
-       buildDepends = [ base semigroups tagged ];
+       libraryHaskellDepends = [ base semigroups tagged ];
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -24458,7 +25105,11 @@ self: {
        sha256 = "1jhiq5w4z7axlqqm6pyl1d3g1vh7ykyy2z69d9ma8qzgm6v72l05";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath HarmTrace-Base HUnit ListLike mtl
+         uu-parsinglib
+       ];
+       executableHaskellDepends = [
          base directory filepath HarmTrace-Base HUnit ListLike mtl parseargs
          uu-parsinglib
        ];
@@ -24478,7 +25129,7 @@ self: {
        pname = "billeksah-forms";
        version = "1.0.0";
        sha256 = "094sq2kn0xfvy146i7r89vf1by90nqaj4ki1fk3i2rw9glrv25ms";
-       buildDepends = [
+       libraryHaskellDepends = [
          base billeksah-pane billeksah-services Cabal containers directory
          filepath glib gtk mtl parsec pretty transformers
        ];
@@ -24499,7 +25150,7 @@ self: {
        sha256 = "1dyg6qfvhzxh2d90gvb8j7djqa04c3aci7rfk3s1wdqz5rkxmnlx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base billeksah-services containers directory filepath mtl parsec
          plugins pretty transformers
        ];
@@ -24522,7 +25173,7 @@ self: {
        sha256 = "1g4zldnza6s2xvkqar4rgqirs4p8j2j4ssacg9x0zzc4njzklj7y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base billeksah-forms billeksah-pane billeksah-services containers
          directory filepath leksah-dummy leksah-main leksah-plugin-pane mtl
          parsec pretty transformers
@@ -24543,7 +25194,7 @@ self: {
        pname = "billeksah-pane";
        version = "1.0.0";
        sha256 = "1ckzjbdfi3y09qvq951xki3h7q3sah41j29mgpqk45rayzqmiavg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base billeksah-services containers directory filepath glib gtk mtl
          parsec pretty time transformers
        ];
@@ -24562,7 +25213,7 @@ self: {
        pname = "billeksah-services";
        version = "1.0.0";
        sha256 = "00bsbrsnclwnayqzs24c5fdz9r6ankbhnnkbkzyd1fxsl7lrziwn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl parsec pretty transformers
        ];
        jailbreak = true;
@@ -24578,7 +25229,7 @@ self: {
        pname = "bimap";
        version = "0.3.0";
        sha256 = "1j9rrxzzggvajz8laf58nda9hgf5lqsqxxc556690yyliln0gii1";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/joelwilliamson/bimap";
        description = "Bidirectional mapping between two key types";
        license = stdenv.lib.licenses.bsd3;
@@ -24592,7 +25243,7 @@ self: {
        pname = "bimap-server";
        version = "0.1.0.1";
        sha256 = "0dgmiv1pzzrq22778a2l46knxfk5rh2vw331gcqhxx0jb23d3pq9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bimap binary directory http-types unix wai warp
        ];
        description = "Two-column database server";
@@ -24609,7 +25260,7 @@ self: {
        pname = "bimaps";
        version = "0.0.0.2";
        sha256 = "1wipia9lil9r7lhsf9rk82k8ydy5c97qsixg0fia0ms5chmdr7qw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary cereal containers deepseq hashable primitive
          QuickCheck storable-tuple unordered-containers vector
          vector-binary-instances vector-th-unbox
@@ -24628,8 +25279,8 @@ self: {
        pname = "binary";
        version = "0.7.6.1";
        sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg";
-       buildDepends = [ array base bytestring containers ];
-       testDepends = [
+       libraryHaskellDepends = [ array base bytestring containers ];
+       testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
          QuickCheck random test-framework test-framework-quickcheck2
        ];
@@ -24646,8 +25297,8 @@ self: {
        pname = "binary-bits";
        version = "0.5";
        sha256 = "1577bd5q4lhw024v4hfil10iyx7v4cf72ldhxb8xhm27i80lllqn";
-       buildDepends = [ base binary bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       testHaskellDepends = [
          base binary bytestring QuickCheck random test-framework
          test-framework-quickcheck2
        ];
@@ -24661,7 +25312,7 @@ self: {
        pname = "binary-communicator";
        version = "1.0.2.1";
        sha256 = "02w5ybp5fdqwz1ffvfs3pfrpx67bzh75njgzr6iai1vrdyjisfkl";
-       buildDepends = [ base binary bytestring mtl ];
+       libraryHaskellDepends = [ base binary bytestring mtl ];
        jailbreak = true;
        description = "Flexible way to ease transmission of binary data";
        license = stdenv.lib.licenses.bsd3;
@@ -24674,11 +25325,13 @@ self: {
      mkDerivation {
        pname = "binary-conduit";
        version = "1.2.3";
-       revision = "1";
        sha256 = "0ymhxyf754j1pki7ap2vay8f9j49rzsjzp5yr253sn5wpw3qg8fr";
+       revision = "1";
        editedCabalFile = "9cb1c58171575429a65947d1ef7e22c1501b4ca9becc07904c7b4a5066345e29";
-       buildDepends = [ base binary bytestring conduit resourcet vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring conduit resourcet vector
+       ];
+       testHaskellDepends = [
          base binary bytestring conduit hspec QuickCheck
          quickcheck-assertions resourcet
        ];
@@ -24693,7 +25346,7 @@ self: {
        pname = "binary-derive";
        version = "0.1.0";
        sha256 = "1rb4fpx5hlq661md7nrpgpmi7jjdq3r1ky6q9vxl6f72h085acvl";
-       buildDepends = [ base binary ghc-prim ];
+       libraryHaskellDepends = [ base binary ghc-prim ];
        jailbreak = true;
        description = "Automatic deriving of Binary using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
@@ -24708,7 +25361,7 @@ self: {
        pname = "binary-file";
        version = "0.15.24";
        sha256 = "134iigqjwlkj85pdp95xl6ia6fxr9l516j9b0dpg3r0zqi1kzp7i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring monads-tf peggy template-haskell
        ];
        homepage = "https://skami.iocikun.jp/haskell/packages/binary-file";
@@ -24725,7 +25378,7 @@ self: {
        pname = "binary-generic";
        version = "0.2.1";
        sha256 = "0c6gfa1wvrcw4frrqzrfnc5ydqlbs56jq7hnxgzg89mr510mfsgz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 syb text
        ];
        homepage = "http://github.com/lpeterse/binary-generic";
@@ -24739,7 +25392,7 @@ self: {
        pname = "binary-indexed-tree";
        version = "0.1";
        sha256 = "1csbmkwrcfcfydyl2ab6s5bz1fy4fgl14m63zdyi0vy3d17zbl4d";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24753,7 +25406,7 @@ self: {
        pname = "binary-list";
        version = "1.1.1.0";
        sha256 = "03fh5ipmmjzdyywm28m2kkbxn11yb4ygrs1q2igll1mbmpm2km6x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq phantom-state transformers
        ];
        description = "Lists of length a power of two";
@@ -24766,7 +25419,7 @@ self: {
        pname = "binary-literal-qq";
        version = "1.0";
        sha256 = "0kbxd2ryls1zhmfg831ls219fn58xa7dq1bca48v7n7075nmh1jm";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Extends Haskell with binary literals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24777,7 +25430,7 @@ self: {
        pname = "binary-protocol";
        version = "1.0";
        sha256 = "1hn6jc4j20z8ni7rpcyamam898yl6jy7zinrhy2rdjvx0p5br13h";
-       buildDepends = [ base binary bytestring mtl ];
+       libraryHaskellDepends = [ base binary bytestring mtl ];
        jailbreak = true;
        homepage = "http://github.com/gcross/binary-protocol";
        description = "Monad to ease implementing a binary network protocol";
@@ -24792,7 +25445,9 @@ self: {
        sha256 = "14jap6kc1jbr3i010qg2z8d0li09d3a88fwzwrlb750pn67x7amy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring mtl zeromq-haskell ];
+       libraryHaskellDepends = [
+         base binary bytestring mtl zeromq-haskell
+       ];
        homepage = "http://github.com/NicolasT/binary-protocol-zmq";
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
@@ -24807,8 +25462,10 @@ self: {
        pname = "binary-search";
        version = "0.1";
        sha256 = "02s81jpysgqnnk8c45y9xc2fhy59mm1k2wskrl4hzhdjlp4c65f3";
-       buildDepends = [ base containers ];
-       testDepends = [ base directory doctest filepath hspec QuickCheck ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec QuickCheck
+       ];
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24819,7 +25476,7 @@ self: {
        pname = "binary-shared";
        version = "0.8.3";
        sha256 = "1clqq0rqjw1v7y6glkjnfyga5gxh768flyw617g47z0qa181c0c3";
-       buildDepends = [ base binary bytestring containers mtl ];
+       libraryHaskellDepends = [ base binary bytestring containers mtl ];
        homepage = "http://www.leksah.org";
        description = "Sharing for the binary package";
        license = "GPL";
@@ -24831,7 +25488,7 @@ self: {
        pname = "binary-state";
        version = "0.1.1";
        sha256 = "06v3qxyl2mvwi3y29rxxf91b2vxvlh5gfznwlnzb4mxzd00aakgl";
-       buildDepends = [ base binary bytestring containers mtl ];
+       libraryHaskellDepends = [ base binary bytestring containers mtl ];
        description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24845,11 +25502,11 @@ self: {
        pname = "binary-store";
        version = "0.1.0.1";
        sha256 = "1wjhc18zj6p5gy15y1b7gz0vlqdbwhmfyv82l55ggmzjv1qyv7rl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-list binary-transform bytestring bzlib deepseq
          reinterpret-cast
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary-list QuickCheck tasty tasty-quickcheck
        ];
        jailbreak = true;
@@ -24866,8 +25523,8 @@ self: {
        pname = "binary-streams";
        version = "0.1.0.1";
        sha256 = "1kjf5ks9l7fs0fsmwk5bcyhxlrz22hi4315bqqx2jzyq6pnwf4mv";
-       buildDepends = [ base binary bytestring io-streams ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring io-streams ];
+       testHaskellDepends = [
          base binary bytestring Cabal cabal-test-quickcheck io-streams
          QuickCheck
        ];
@@ -24883,7 +25540,7 @@ self: {
        pname = "binary-strict";
        version = "0.4.8.2";
        sha256 = "0cyrr45wpq5h4gg6qms54nmvhqpyj59d5bhlk316g4yjsf3484b7";
-       buildDepends = [ array base bytestring containers mtl ];
+       libraryHaskellDepends = [ array base bytestring containers mtl ];
        jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/binary-low-level";
        description = "Binary deserialisation using strict ByteStrings";
@@ -24899,8 +25556,8 @@ self: {
        pname = "binary-typed";
        version = "0.3";
        sha256 = "12yzgcrj528pss4jk753xmcrzv2qm70dacqjnx7460bcdsmyd6zy";
-       buildDepends = [ base binary bytestring murmur-hash ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring murmur-hash ];
+       testHaskellDepends = [
          base binary bytestring tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/quchen/binary-typed";
@@ -24914,7 +25571,7 @@ self: {
        pname = "binarydefer";
        version = "1.2.2";
        sha256 = "06q255kip3j31bmj01fqkikvjxbklvcaa1kv3al8v04nkqx6rg3p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Binary serialization with deferred loading";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24928,7 +25585,7 @@ self: {
        pname = "bind-marshal";
        version = "0.1";
        sha256 = "13riawcdzwr97vmixvg2wf8aysxblzik2mvkrp2gqf9ywda9ksr6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim monads-tf mtl
          numeric-prelude random stm strict transformers type-level-tf unix
        ];
@@ -24944,11 +25601,11 @@ self: {
      mkDerivation {
        pname = "binding-core";
        version = "0.2.2";
-       revision = "1";
        sha256 = "0qr7nr9cksy2cx2h8g2d485797hvv67197c654va0xwadkj5iviz";
+       revision = "1";
        editedCabalFile = "1aeacdf0ebf89a2f515ab0ef767ed86f44b4b22f740ac23d1afd76df391955c6";
-       buildDepends = [ base stm ];
-       testDepends = [ base HTF HUnit QuickCheck random ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [ base HTF HUnit QuickCheck random ];
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding";
        license = stdenv.lib.licenses.bsd3;
@@ -24959,11 +25616,11 @@ self: {
      mkDerivation {
        pname = "binding-gtk";
        version = "0.2.1";
-       revision = "1";
        sha256 = "0l68n13w1khfqkc791l9mcnk3cb0565a9ysfn7b3hh5cjx8zi7vr";
+       revision = "1";
        editedCabalFile = "9e435774bd5d6a7d9dd1e96dd9293d6a739f7ecde23838571d30866ac4628cb5";
-       buildDepends = [ base binding-core gtk mtl ];
-       testDepends = [ base binding-core directory gtk ];
+       libraryHaskellDepends = [ base binding-core gtk mtl ];
+       testHaskellDepends = [ base binding-core directory gtk ];
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
@@ -24975,11 +25632,11 @@ self: {
      mkDerivation {
        pname = "binding-wx";
        version = "0.2.1";
-       revision = "1";
        sha256 = "07nbb6a0fmyhmx2dakkw4msxnv273hfcw3swdk3aczpfqlxd1r4i";
+       revision = "1";
        editedCabalFile = "0307431866ac8b7f34ece32a684a3c70aa1b36ce74c05d815f249d1effe2efb2";
-       buildDepends = [ base binding-core stm wx wxcore ];
-       testDepends = [ base binding-core directory wx ];
+       libraryHaskellDepends = [ base binding-core stm wx wxcore ];
+       testHaskellDepends = [ base binding-core directory wx ];
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -24991,7 +25648,7 @@ self: {
        pname = "bindings";
        version = "0.1.2";
        sha256 = "0zczf1yfjnfzdzv33j33vcc71zsf88a5qxsdmswxrpzika3rs6i0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Deprecated package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25002,7 +25659,7 @@ self: {
        pname = "bindings-DSL";
        version = "1.0.22";
        sha256 = "0xkr1x3klpfwbh1yimah1dqmqcilifyblnf3kr6ay4gsvw74zkwr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
        description = "FFI domain specific language, on top of hsc2hs";
        license = stdenv.lib.licenses.bsd3;
@@ -25014,8 +25671,8 @@ self: {
        pname = "bindings-EsounD";
        version = "0.1.0.1";
        sha256 = "0fl7gdh60k7wj3bnn5hpgsi0kkji857xb47spii7mrip5p4m8pff";
-       buildDepends = [ base bindings-audiofile bindings-DSL ];
-       pkgconfigDepends = [ esound ];
+       libraryHaskellDepends = [ base bindings-audiofile bindings-DSL ];
+       libraryPkgconfigDepends = [ esound ];
        homepage = "http://cielonegro.org/Bindings-EsounD.html";
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
@@ -25031,12 +25688,14 @@ self: {
        pname = "bindings-GLFW";
        version = "3.1.1.3";
        sha256 = "0pzhlzx8h5g3cs7wr06zydabprlrf5sgdvdqmr2wg10azikxc12z";
-       buildDepends = [ base bindings-DSL ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [
          libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr
          libXxf86vm mesa
        ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXcursor;
@@ -25051,8 +25710,8 @@ self: {
        pname = "bindings-K8055";
        version = "0.1.2";
        sha256 = "0daga3vh9x9gih25qgcsl0hafi4hw8h5x64ba6wbmywa9z3hrr20";
-       buildDepends = [ base ];
-       extraLibraries = [ K8055D ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ K8055D ];
        homepage = "https://github.com/jputcu/bindings-K8055";
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
@@ -25065,8 +25724,8 @@ self: {
        pname = "bindings-apr";
        version = "0.1";
        sha256 = "0fw71z74pv8dxw301iss66kmarhlgwj2lpsy0skmlqfkg98zc96k";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ apr-1 ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ apr-1 ];
        jailbreak = true;
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime (APR)";
@@ -25080,8 +25739,8 @@ self: {
        pname = "bindings-apr-util";
        version = "0.1";
        sha256 = "0sr041vpakklpf2mmy78wl5wl8yzfbwvsy07wlplmlh5rgjdm4wx";
-       buildDepends = [ base bindings-apr bindings-DSL ];
-       pkgconfigDepends = [ apr-util-1 ];
+       libraryHaskellDepends = [ base bindings-apr bindings-DSL ];
+       libraryPkgconfigDepends = [ apr-util-1 ];
        jailbreak = true;
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
@@ -25095,8 +25754,8 @@ self: {
        pname = "bindings-audiofile";
        version = "0.1.0.2";
        sha256 = "0ls0iy33i0b86fg7hx23s1d8ypa16bdiw3l8nmsni3zgnn67w6mj";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ audiofile ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ audiofile ];
        homepage = "http://cielonegro.org/Bindings-AudioFile.html";
        description = "Low level bindings to audiofile";
        license = stdenv.lib.licenses.publicDomain;
@@ -25110,9 +25769,9 @@ self: {
        pname = "bindings-bfd";
        version = "1.2.0.0";
        sha256 = "0c05zr3k0az2hfyfync8z2sgdxx6gskqdb1n548fjc986cx298q4";
-       buildDepends = [ array base containers unix ];
-       buildTools = [ alex happy ];
-       extraLibraries = [ bfd opcodes ];
+       libraryHaskellDepends = [ array base containers unix ];
+       librarySystemDepends = [ bfd opcodes ];
+       libraryToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/bindings-bfd/";
        description = "Bindings for libbfd, a library of the GNU `binutils'";
@@ -25126,8 +25785,8 @@ self: {
        pname = "bindings-cctools";
        version = "3.6.1.0.1.0.0.1";
        sha256 = "1k0p0m09ndk6c42h3yy230q86fnm0hzr1zjr3871f9hapvnvzqr8";
-       buildDepends = [ bindings-DSL ];
-       extraLibraries = [ dttools ];
+       libraryHaskellDepends = [ bindings-DSL ];
+       librarySystemDepends = [ dttools ];
        homepage = "http://bitbucket.org/badi/bindings-cctools";
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
@@ -25141,13 +25800,14 @@ self: {
      mkDerivation {
        pname = "bindings-codec2";
        version = "0.1.1.0";
-       revision = "1";
        sha256 = "0mpb79djfqi0had6rx20jsgahdfv23bnp0i25lbxv8vg72m3wdnn";
+       revision = "1";
        editedCabalFile = "48e69a5b497247c96ab7a6ed3ff818bef596c712249819e63a84c4667ef5d0b1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bindings-DSL bytestring split ];
-       extraLibraries = [ codec2 ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ codec2 ];
+       executableHaskellDepends = [ base binary bytestring split ];
        homepage = "https://github.com/relrod/bindings-codec2";
        description = "Very low-level FFI bindings for Codec2";
        license = stdenv.lib.licenses.gpl2;
@@ -25160,7 +25820,7 @@ self: {
        pname = "bindings-common";
        version = "1.3.4";
        sha256 = "1zbm8v5xp4pay6h0y24ngf8nw96ab0zr754b9n2zczadiarccmcb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "This package is obsolete. Look for bindings-DSL instead.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25172,9 +25832,9 @@ self: {
        pname = "bindings-dc1394";
        version = "0.2.1";
        sha256 = "06xg2amlcqldb7h0xaw8dvzq65npirsibbgmbr5n8s59rwa6hfwq";
-       buildDepends = [ base bindings-DSL ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ dc1394 ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ dc1394 ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/aleator/bindings-dc1394";
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
@@ -25187,8 +25847,8 @@ self: {
        pname = "bindings-directfb";
        version = "0.1";
        sha256 = "0mmba1h9in9xh590nmr1vb5ccqng3nwdc4q0b9d67v22cmc7fhpp";
-       buildDepends = [ base bindings-DSL bindings-posix ];
-       pkgconfigDepends = [ directfb ];
+       libraryHaskellDepends = [ base bindings-DSL bindings-posix ];
+       libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) directfb;};
@@ -25199,9 +25859,9 @@ self: {
        pname = "bindings-eskit";
        version = "0.0.1";
        sha256 = "0j0fi74ky1qdvkgbapyq8fag2linawz3ndgzgi8lcci8lsby0n72";
-       buildDepends = [ array base bindings-DSL ];
-       extraLibraries = [ eskit ];
-       pkgconfigDepends = [ eskit ];
+       libraryHaskellDepends = [ array base bindings-DSL ];
+       librarySystemDepends = [ eskit ];
+       libraryPkgconfigDepends = [ eskit ];
        jailbreak = true;
        homepage = "http://github.com/a1kmm/bindings-eskit";
        description = "Bindings to ESKit";
@@ -25215,8 +25875,8 @@ self: {
        pname = "bindings-fann";
        version = "0.0.2";
        sha256 = "1hryjj9aabaxrcgmr3i6sklbyb58djzsrlssidgll3vb0wwcgbq7";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ fann ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25228,8 +25888,8 @@ self: {
        pname = "bindings-fluidsynth";
        version = "0.1.1";
        sha256 = "04q5zxv4iyjb7zf7bhx19cfc8nhnqxmxnl1q63qszjysmlpy39g5";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ fluidsynth ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ fluidsynth ];
        homepage = "http://github.com/bgamari/bindings-fluidsynth";
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
@@ -25241,8 +25901,8 @@ self: {
        pname = "bindings-friso";
        version = "0.1.0.0";
        sha256 = "0wg120qrqqf2g38ifjkwj5cc42sdcdn2lrs93wrdq9dd7kldn79c";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ friso ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25254,8 +25914,8 @@ self: {
        pname = "bindings-glib";
        version = "0.1.5";
        sha256 = "0jhifzbwbphlzz9ffv3pyjv27phvcvky1gczmi9kvfz761b9qgyx";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ glib ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings to GLib";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) glib;};
@@ -25266,8 +25926,8 @@ self: {
        pname = "bindings-gobject";
        version = "0.4";
        sha256 = "1r2cg06r068nfyppjs2kwfmam7vk5x0l4f865arrrgrqam3bs1av";
-       buildDepends = [ base bindings-DSL bindings-glib ];
-       pkgconfigDepends = [ glib ];
+       libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
+       libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings supporting GObject and derived libraries";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) glib;};
@@ -25278,8 +25938,8 @@ self: {
        pname = "bindings-gpgme";
        version = "0.1.6";
        sha256 = "0mwlb1fk852pk6an3ay9mgxmxqf6f6bzm965agm80yhr2ab3iqhq";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ gpgme ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ gpgme ];
        homepage = "http://bitbucket.org/mauricio/bindings-gpgme";
        description = "Project bindings-* raw interface to gpgme";
        license = stdenv.lib.licenses.bsd3;
@@ -25291,8 +25951,8 @@ self: {
        pname = "bindings-gsl";
        version = "0.2.1";
        sha256 = "0yv0k6r2pd4bbq0qsf6wfx752qn0d2d0s3jfa633gy6sg97j2n3y";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ gsl ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) gsl;};
@@ -25303,8 +25963,8 @@ self: {
        pname = "bindings-gts";
        version = "0.1.1";
        sha256 = "1niqkxw7wxircwgvd9z4q9j3jxswifhl0h88v3j35lbxhiz6v7kh";
-       buildDepends = [ base bindings-DSL bindings-glib ];
-       pkgconfigDepends = [ gts ];
+       libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
+       libraryPkgconfigDepends = [ gts ];
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25315,13 +25975,14 @@ self: {
      mkDerivation {
        pname = "bindings-hamlib";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1na9v5s5lqdnnj031zmqg3xfpsvy80gzr7qg0f3gsyyniww72xlz";
+       revision = "1";
        editedCabalFile = "1eea9735be1dd9f54d91406fbf56da41b8d68a3760ada5e4fc4caf0658c997c9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ hamlib ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ hamlib ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/relrod/hamlib-haskell";
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
@@ -25333,7 +25994,7 @@ self: {
        pname = "bindings-hdf5";
        version = "0.1";
        sha256 = "0x6p1mwwnpcd5bd6iy4di11n7b45c4zp9d6l957mmhsyg24h2n79";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25345,12 +26006,11 @@ self: {
        pname = "bindings-levmar";
        version = "1.1.0.3";
        sha256 = "1da9n88wwjpm3ph7q73niv3cslpa0h8r0lsyfl35arymxfqpb4c0";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ blas lapack ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ blas lapack ];
        homepage = "https://github.com/basvandijk/bindings-levmar";
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) blas;  lapack = null;};
 
   "bindings-libcddb" = callPackage
@@ -25359,8 +26019,8 @@ self: {
        pname = "bindings-libcddb";
        version = "0.3";
        sha256 = "1hygdr4w27igwc513vs7rc9i2xcmr1ndvbiwhkrdw2x0wsmz6yyy";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libcddb ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libcddb ];
        homepage = "http://bitbucket.org/mauricio/bindings-libcddb";
        description = "Low level binding to libcddb";
        license = stdenv.lib.licenses.bsd3;
@@ -25372,8 +26032,8 @@ self: {
        pname = "bindings-libffi";
        version = "0.3";
        sha256 = "1321hr92nsa7fljxxir8waj7i42m8dvz76h693vp4n3lqll9hcf9";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libffi ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libffi ];
        description = "Low level bindings to libffi";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) libffi;};
@@ -25384,8 +26044,8 @@ self: {
        pname = "bindings-libftdi";
        version = "0.1";
        sha256 = "07kabkvdjiskika9vddrf9vhknld1x9s4m3b89d9m6l4gb2ln76i";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libftdi libusb ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25397,8 +26057,8 @@ self: {
        pname = "bindings-librrd";
        version = "0.2.0.1";
        sha256 = "1dyhq06rs91g77c67lfnscn7l9fgbzikiqnv2d494jd60y1q8n8y";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ librrd ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ librrd ];
        homepage = "http://cielonegro.org/Bindings-librrd.html";
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
@@ -25413,8 +26073,10 @@ self: {
        pname = "bindings-libstemmer";
        version = "0.1.0.0";
        sha256 = "03plarpy0fpv9anqnaqwcji3vij2qrxd4qmli77jb5npmax20r92";
-       buildDepends = [ base bindings-DSL resourcet transformers ];
-       extraLibraries = [ stemmer ];
+       libraryHaskellDepends = [
+         base bindings-DSL resourcet transformers
+       ];
+       librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25426,8 +26088,8 @@ self: {
        pname = "bindings-libusb";
        version = "1.4.5.0";
        sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libusb ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libusb ];
        homepage = "https://github.com/basvandijk/bindings-libusb";
        description = "Low level bindings to libusb";
        license = stdenv.lib.licenses.bsd3;
@@ -25439,8 +26101,8 @@ self: {
        pname = "bindings-libv4l2";
        version = "0.1";
        sha256 = "0s31dh5g26nldb6aq6q4i6ypgajincw7n3d3vm838x3w320qvg2g";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ v4l2 ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ v4l2 ];
        homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
@@ -25453,8 +26115,8 @@ self: {
        pname = "bindings-libzip";
        version = "0.11";
        sha256 = "0hqkp4hvav67xqjfwbik3i06vq8f78jjzf37ncl6wwcw5w65hhrj";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libzip ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libzip ];
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Low level bindings to libzip";
        license = stdenv.lib.licenses.bsd3;
@@ -25466,7 +26128,7 @@ self: {
        pname = "bindings-linux-videodev2";
        version = "0.1";
        sha256 = "1pqi8ks441m1s1md6nhjr7zhal5fv6s71xq4881zijd539qhq9dq";
-       buildDepends = [ base bindings-DSL ioctl ];
+       libraryHaskellDepends = [ base bindings-DSL ioctl ];
        homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
        license = stdenv.lib.licenses.bsd3;
@@ -25479,8 +26141,8 @@ self: {
        pname = "bindings-lxc";
        version = "0.2.0.1";
        sha256 = "0w61xzx8krr1pfa9ys7akpra2r0njziysm3ri08fb98g75hp9942";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ lxc ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ lxc ];
        jailbreak = true;
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
@@ -25493,7 +26155,7 @@ self: {
        pname = "bindings-mmap";
        version = "1.0";
        sha256 = "19qdf5z6mf8j8inlnax0nv1wiv4va27z4a303hpkbgda459093nd";
-       buildDepends = [ bindings-posix ];
+       libraryHaskellDepends = [ bindings-posix ];
        description = "(deprecated) see bindings-posix instead";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25504,7 +26166,7 @@ self: {
        pname = "bindings-mpdecimal";
        version = "0.8.0.0";
        sha256 = "18i68ivsrdndjpfnyq6dlmmkkx22v3rp619nm26af8ka3qai12j5";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/bindings-mpdecimal";
        description = "bindings to mpdecimal library";
@@ -25520,15 +26182,14 @@ self: {
        pname = "bindings-nettle";
        version = "0.4";
        sha256 = "11fnyjxb6gvl2mfnsahzadd5xj0y1p25n98qbhrkzziaihsf01ph";
-       buildDepends = [ base bindings-DSL ];
-       testDepends = [
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ nettle ];
+       testHaskellDepends = [
          base bytestring hspec HUnit QuickCheck quickcheck-io
        ];
-       pkgconfigDepends = [ nettle ];
        homepage = "http://floss.scru.org/bindings-nettle";
        description = "bindings to nettle crypto library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) nettle;};
 
   "bindings-parport" = callPackage
@@ -25537,7 +26198,7 @@ self: {
        pname = "bindings-parport";
        version = "0.0.4";
        sha256 = "1q404clpqzv0gik80ycipl94hvj27397z5cw1cs7b0yxlypllg3j";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        description = "parport bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25548,8 +26209,8 @@ self: {
        pname = "bindings-portaudio";
        version = "0.1";
        sha256 = "0wcxq300ijfkf4zc7p4xwsd9wzhnlss0kxjf04fka01mf9bh3ai2";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ portaudio ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) portaudio;};
@@ -25560,7 +26221,7 @@ self: {
        pname = "bindings-posix";
        version = "1.2.6";
        sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low level bindings to posix";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25571,8 +26232,8 @@ self: {
        pname = "bindings-potrace";
        version = "0.1";
        sha256 = "0vb889f49li0lwy3zsji0f1cwzriizh9x6kg3r8676q5j08p7znd";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ potrace ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ potrace ];
        homepage = "https://github.com/rwbarton/bindings-potrace";
        description = "Low-level bindings to the potrace bitmap tracing library";
        license = stdenv.lib.licenses.gpl2;
@@ -25584,7 +26245,7 @@ self: {
        pname = "bindings-ppdev";
        version = "0.0.3";
        sha256 = "18px429hplpabfhapwasbdgw8ynfm3vr5rf81pp173j1z0bv4ygq";
-       buildDepends = [ base bindings-DSL ioctl ];
+       libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25599,7 +26260,10 @@ self: {
        sha256 = "11k56zsz1fg0hb0pqamq2hh3gczzqgj105qss5xrk0cgmsphhbmy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory filepath process unix
+       ];
+       executableHaskellDepends = [
          base cmdargs containers directory filepath process text unix
        ];
        homepage = "https://github.com/michelk/bindings-saga-cmd.hs";
@@ -25613,8 +26277,8 @@ self: {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ saneBackends ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ saneBackends ];
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
@@ -25626,8 +26290,8 @@ self: {
        pname = "bindings-sc3";
        version = "0.4.1";
        sha256 = "07vp6hzjjrbh3j152mq8f1i6xh9m2r20a555y03p9fzdfrb5kixd";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ scsynth ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ scsynth ];
        homepage = "https://github.com/kaoskorobase/bindings-sc3/";
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
@@ -25642,8 +26306,9 @@ self: {
        sha256 = "1r2akdkhw054k6vg9a7jpm9ck280lsfkizz7y6cqbn1hy463grkd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       extraLibraries = [ sipc ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ sipc ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/justinethier/hs-bindings-sipc";
        description = "Low level bindings to SIPC";
        license = "LGPL";
@@ -25656,7 +26321,7 @@ self: {
        pname = "bindings-sophia";
        version = "0.2.0.2";
        sha256 = "0fiibm7nrsx9pzi2lvhhbw71bah6s22h3jvn417ng3lj6ghhzii6";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low-level bindings to sophia library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25667,8 +26332,8 @@ self: {
        pname = "bindings-sqlite3";
        version = "1.0.3";
        sha256 = "0f30a7xdx50gs7hdv16b3m2055f0ar5c2cani318iwympnrpgww1";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ sqlite ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ sqlite ];
        description = "Low level bindings to sqlite3";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) sqlite;};
@@ -25679,7 +26344,7 @@ self: {
        pname = "bindings-svm";
        version = "0.2.1";
        sha256 = "1nnmyxn28qdfy2sclnxv2mf2d426vrzgs7f0vvqri6fkjnvmk11b";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        homepage = "http://github.com/tanimoto/bindings-svm";
        description = "Low level bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
@@ -25691,7 +26356,7 @@ self: {
        pname = "bindings-uname";
        version = "0.1";
        sha256 = "1lsw4dh5vgmfvrx62ns5kmngzlmjzbxkx43x5i2k5qlmzp1pa3hk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Low-level binding to POSIX uname(3)";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -25702,8 +26367,8 @@ self: {
        pname = "bindings-yices";
        version = "0.2";
        sha256 = "13yfhx6krj59qij9yvcl4fr6znd28nbldbv0qfhf83h3h18araf9";
-       buildDepends = [ base ];
-       extraLibraries = [ gmp yices ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ gmp yices ];
        description = "Bindings to the Yices theorem prover";
        license = stdenv.lib.licenses.publicDomain;
      }) { inherit (pkgs) gmp;  inherit (pkgs) yices;};
@@ -25718,8 +26383,9 @@ self: {
        sha256 = "163cs2qfj68dvbsyfg37hzb29jp0ylfpqlnhzjswm4j8mrcfsl3r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring Cabal containers directory dlist filepath
+       libraryHaskellDepends = [ base bytestring Cabal ];
+       executableHaskellDepends = [
+         base containers directory dlist filepath
        ];
        homepage = "http://code.mathr.co.uk/binembed";
        description = "Embed data into object files";
@@ -25735,7 +26401,9 @@ self: {
        sha256 = "06lw6jvg382k3wj8ybld05bj3nchb8dqk363a69mak3r5zxg43iy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binembed bytestring containers filepath ];
+       executableHaskellDepends = [
+         base binembed bytestring containers filepath
+       ];
        homepage = "http://code.mathr.co.uk/binembed";
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
@@ -25752,9 +26420,12 @@ self: {
        sha256 = "1vby3nbqbwza65jg5d0bmzh22i5s20cjbqdgaq9zasza7ywgkj22";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary bytestring containers directory mtl old-time
-         parallel parsec process QuickCheck random tagsoup
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory mtl parallel
+         parsec QuickCheck tagsoup
+       ];
+       executableHaskellDepends = [
+         base bytestring containers old-time process QuickCheck random
        ];
        jailbreak = true;
        homepage = "http://biohaskell.org/Libraries/Bio";
@@ -25769,7 +26440,9 @@ self: {
        pname = "bioace";
        version = "0.0.1";
        sha256 = "08k2w66gpysjk038pi50lc21gbn2dyp5z8ls0qhcmjqc59dn8hvg";
-       buildDepends = [ base bioalign biocore bytestring parsec ];
+       libraryHaskellDepends = [
+         base bioalign biocore bytestring parsec
+       ];
        homepage = "https://patch-tag.com/r/dfornika/bioace/home";
        description = "Library for reading ace assembly files";
        license = "GPL";
@@ -25781,7 +26454,7 @@ self: {
        pname = "bioalign";
        version = "0.0.5";
        sha256 = "006gg8ds6klrl9rc1csi247rf8gzlgn9mdi0jl4pjz5xmf0jw5dr";
-       buildDepends = [ base biocore bytestring ];
+       libraryHaskellDepends = [ base biocore bytestring ];
        homepage = "https://patch-tag.com/r/dfornika/biophd/home";
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
@@ -25793,7 +26466,7 @@ self: {
        pname = "biocore";
        version = "0.3.1";
        sha256 = "06ml9p144bv0c9hv6pkcvhdgc0vw0jxzbqb834ilr38kjmrpsar1";
-       buildDepends = [ base bytestring stringable ];
+       libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
      }) {};
@@ -25804,7 +26477,7 @@ self: {
        pname = "biofasta";
        version = "0.0.3";
        sha256 = "1l770sg2gcg7wl5yfrrk9nr7hgd5m0q158ad5nd8z7i5vsfah8b2";
-       buildDepends = [ base biocore bytestring ];
+       libraryHaskellDepends = [ base biocore bytestring ];
        homepage = "https://patch-tag.com/r/dfornika/biofasta/home";
        description = "Library for reading fasta sequence files";
        license = "GPL";
@@ -25816,7 +26489,7 @@ self: {
        pname = "biofastq";
        version = "0.1";
        sha256 = "0453cb2sw6x9hx3z7w3fvymwi0l0s86wlvi6vvsh0jcwas3iirbl";
-       buildDepends = [ base biocore bytestring ];
+       libraryHaskellDepends = [ base biocore bytestring ];
        homepage = "http://biohaskell.org/";
        description = "A library for reading FASTQ files";
        license = "LGPL";
@@ -25830,7 +26503,7 @@ self: {
        pname = "biophd";
        version = "0.0.8";
        sha256 = "0p3xfv61xzz29qg660pcsgns7r5q1cybk3hdvdnwf0cqdc9fhxbl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary biocore bytestring parsec text time time-locale-compat
        ];
        homepage = "https://github.com/dfornika/biophd/wiki";
@@ -25849,9 +26522,8 @@ self: {
        sha256 = "1v9vg9gnrf606raqlzcd15irg60v3cf5m0yy5qsdyxm24102bgmj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base biocore bytestring cmdargs unordered-containers
-       ];
+       libraryHaskellDepends = [ base biocore bytestring ];
+       executableHaskellDepends = [ cmdargs unordered-containers ];
        homepage = "http://biohaskell.org/";
        description = "Library and executables for working with PSL files";
        license = "LGPL";
@@ -25867,9 +26539,8 @@ self: {
        sha256 = "1mxsqxcf5sh37gpfqil499i9n8wi3sk5sl2cx6x6agbc0n726bwq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary biocore bytestring cmdargs mtl
-       ];
+       libraryHaskellDepends = [ array base binary biocore bytestring ];
+       executableHaskellDepends = [ array base cmdargs mtl ];
        homepage = "http://biohaskell.org/";
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
@@ -25886,11 +26557,11 @@ self: {
        pname = "biostockholm";
        version = "0.3.4";
        sha256 = "04k7cl8fjsi2mv60p2qg2nmy86z2adw9gzjnkxffqsc1q85y4lz7";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base biocore blaze-builder
          blaze-builder-conduit bytestring conduit containers deepseq
        ];
-       testDepends = [
+       testHaskellDepends = [
          base biocore bytestring conduit containers hspec HUnit QuickCheck
          transformers zlib-conduit
        ];
@@ -25911,7 +26582,7 @@ self: {
        sha256 = "0w380dcpk8gp5cx24nh6xlnibd6pw93wmxcajl26p4kd5cxbgfqz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default hack hack-handler-happstack
          haskell98 MissingH mtl parsec process rallod
        ];
@@ -25929,8 +26600,8 @@ self: {
        pname = "bit-array";
        version = "0.1.0";
        sha256 = "0v04drr3m3096shp70l4iwqzva45szjhfl1yzaqblvn49hky8kns";
-       buildDepends = [ base loch-th numeric-qq placeholders ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base loch-th numeric-qq placeholders ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/bit-array";
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
@@ -25946,8 +26617,8 @@ self: {
        pname = "bit-vector";
        version = "0.2.0";
        sha256 = "1h3hm1akbj2qzl3df877hfgz3fanhvrj6czxvjbpcalpf3d6h5z1";
-       buildDepends = [ base vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        homepage = "https://github.com/acfoltzer/bit-vector";
@@ -25961,7 +26632,7 @@ self: {
        pname = "bitarray";
        version = "0.0.1.1";
        sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Mutable and immutable bit arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -25977,12 +26648,12 @@ self: {
        pname = "bitcoin-api";
        version = "0.12.1";
        sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base58string binary bitcoin-block bitcoin-script
          bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
          unordered-containers wreq
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base58string bitcoin-script bitcoin-tx bytestring hspec
          http-client lens text wreq
        ];
@@ -26000,11 +26671,11 @@ self: {
        pname = "bitcoin-api-extra";
        version = "0.9.1";
        sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit
          lens stm stm-chans stm-conduit text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bitcoin-api bitcoin-tx bytestring conduit hspec http-client
          lens text wreq
        ];
@@ -26021,11 +26692,11 @@ self: {
        pname = "bitcoin-block";
        version = "0.13.1";
        sha256 = "0nkx86fwv65x9vz6ni6qgz61afnvcifw2g92bnwdli8hww7prxfp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bitcoin-tx bitcoin-types bytestring cryptohash
          hexstring largeword lens
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bitcoin-tx bitcoin-types bytestring hexstring hspec
        ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -26043,11 +26714,11 @@ self: {
        pname = "bitcoin-rpc";
        version = "0.5.0.1";
        sha256 = "0bx54033w0yjb2isd7cvnd46qz3nqs7z6flw0mb1nkd81sdxbhp2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal containers ghc-prim HTTP
          mtl network text unix unordered-containers watchdog
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring cereal containers ghc-prim HTTP
          HUnit mtl network QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text unix unordered-containers watchdog
@@ -26066,8 +26737,10 @@ self: {
        pname = "bitcoin-script";
        version = "0.11.1";
        sha256 = "0k3v35p6qpgh88gc5rqpcmh202xrn2rind9641dinwqqx631v31r";
-       buildDepends = [ base base16-bytestring binary bytestring text ];
-       testDepends = [ base bytestring hspec ];
+       libraryHaskellDepends = [
+         base base16-bytestring binary bytestring text
+       ];
+       testHaskellDepends = [ base bytestring hspec ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Compilation, manipulation and decompilation of Bitcoin scripts";
        license = stdenv.lib.licenses.mit;
@@ -26081,11 +26754,13 @@ self: {
        pname = "bitcoin-tx";
        version = "0.13.1";
        sha256 = "006c55l6q6cknxw0k0kzr8vkv8azapfb4mkax6ac6rih6mjq5f1v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bitcoin-script bitcoin-types bytestring cryptohash
          hexstring lens
        ];
-       testDepends = [ base bitcoin-script bytestring hexstring hspec ];
+       testHaskellDepends = [
+         base bitcoin-script bytestring hexstring hspec
+       ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Utility functions for manipulating bitcoin transactions";
        license = stdenv.lib.licenses.mit;
@@ -26099,10 +26774,12 @@ self: {
        pname = "bitcoin-types";
        version = "0.9.2";
        sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base58string binary bytestring hexstring text
        ];
-       testDepends = [ base base58string bytestring hexstring hspec ];
+       testHaskellDepends = [
+         base base58string bytestring hexstring hspec
+       ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Provides consistent low-level types used commonly among Bitcoin implementations";
        license = stdenv.lib.licenses.mit;
@@ -26116,7 +26793,9 @@ self: {
        sha256 = "0g63lg3599clbn4xcg9kcak6hs4877dwj00607c5gyh5x4d2c21d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Bitly directory filepath regexpr ];
+       executableHaskellDepends = [
+         base Bitly directory filepath regexpr
+       ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
        description = "A command line tool to access bit.ly URL shortener.";
@@ -26130,11 +26809,10 @@ self: {
        pname = "bitmap";
        version = "0.0.2";
        sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitmap-opengl" = callPackage
@@ -26143,11 +26821,10 @@ self: {
        pname = "bitmap-opengl";
        version = "0.0.1.5";
        sha256 = "1wq1p0vvif750gpyh2kq3agzwga3hx0fq28irbw5dgrz462dd9pv";
-       buildDepends = [ base bitmap OpenGL ];
+       libraryHaskellDepends = [ base bitmap OpenGL ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for Data.Bitmap.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitmaps" = callPackage
@@ -26158,14 +26835,13 @@ self: {
        pname = "bitmaps";
        version = "0.2.6.3";
        sha256 = "1cbfbbyvmdlfwn6pjhxkd8f4ajkp9cm18apzmrqffrj58gmzr1p0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bitmap bytestring cereal containers monad-state
          stb-image string-class tagged zlib
        ];
        homepage = "https://github.com/bairyn/bitmaps";
        description = "Bitmap library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bits" = callPackage
@@ -26176,8 +26852,8 @@ self: {
        pname = "bits";
        version = "0.4";
        sha256 = "12s5yk47y0zqzqiyaw9jchyl3crf1id9dk67m638b070d46k29p6";
-       buildDepends = [ base bytes mtl transformers ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base bytes mtl transformers ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/analytics/bits";
        description = "Various bit twiddling and bitwise serialization primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -26191,7 +26867,7 @@ self: {
        sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -26202,8 +26878,8 @@ self: {
        pname = "bits-conduit";
        version = "0.2.0.0";
        sha256 = "08hgl1pvwadnrgqcs1yl7lvqgh955swbscpay4chb097pqqggdrj";
-       buildDepends = [ base bytestring conduit mtl ];
-       testDepends = [ base bytestring conduit hspec HUnit mtl ];
+       libraryHaskellDepends = [ base bytestring conduit mtl ];
+       testHaskellDepends = [ base bytestring conduit hspec HUnit mtl ];
        jailbreak = true;
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
@@ -26211,18 +26887,18 @@ self: {
      }) {};
 
   "bits-extras" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, gcc_s }:
      mkDerivation {
        pname = "bits-extras";
        version = "0.1.3";
        sha256 = "0sy9dksmdx0773bsn8yi5hw4qpgn16g8aqqj888w1x75cbsxr997";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       configureFlags = [ "--ghc-option=-lgcc_s" ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) { gcc_s = null;};
 
   "bitset" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, gmp, integer-gmp
@@ -26232,9 +26908,9 @@ self: {
        pname = "bitset";
        version = "1.4.8";
        sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988";
-       buildDepends = [ base deepseq ghc-prim integer-gmp ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck ];
-       extraLibraries = [ gmp ];
+       libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
+       librarySystemDepends = [ gmp ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        jailbreak = true;
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
@@ -26251,10 +26927,10 @@ self: {
        sha256 = "02dyi59lp6blrvsc10ahjnra1vaz3kzb8h0jpk74k7n6flia8z1k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bindings-DSL bindings-glib bindings-gobject
        ];
-       pkgconfigDepends = [ gtk pango ];
+       executablePkgconfigDepends = [ gtk pango ];
        jailbreak = true;
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
@@ -26269,8 +26945,10 @@ self: {
        pname = "bitstream";
        version = "0.2.0.4";
        sha256 = "1j00r6jv9yp0h476gz7yalrlnxhkrdrl1w73d3zl98kyf207q2sy";
-       buildDepends = [ base base-unicode-symbols bytestring vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base base-unicode-symbols bytestring vector
+       ];
+       testHaskellDepends = [
          base base-unicode-symbols bytestring QuickCheck vector
        ];
        homepage = "https://github.com/phonohawk/bitstream";
@@ -26284,7 +26962,7 @@ self: {
        pname = "bitstring";
        version = "0.0.0";
        sha256 = "1ix2x4v76wq5148k1aax69cf8sk14cd0z362dz1d2qmj9qxsnsw8";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Lazy bit strings";
        license = stdenv.lib.licenses.bsd3;
@@ -26305,7 +26983,7 @@ self: {
        pname = "bittorrent";
        version = "0.0.0.3";
        sha256 = "155bbqqn33mlavvcm6xfxs4dqij66jfhqxjmrjkyxvzd36yz0ann";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base16-bytestring base32-bytestring base64-bytestring
          bencoding binary binary-conduit bits-extras BoundedChan bytestring
          cereal cereal-conduit conduit containers cryptohash data-default
@@ -26314,7 +26992,7 @@ self: {
          pretty-class resourcet SafeSemaphore split stm text time
          transformers unordered-containers urlencoded vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bencoding bytestring cereal directory filepath hspec
          network QuickCheck quickcheck-instances text time
        ];
@@ -26333,8 +27011,8 @@ self: {
        pname = "bitvec";
        version = "0.1.0.1";
        sha256 = "0zgg72qpxgcgjrr2lr702abibnm79h6knb3jcwdjcxssgb6l70q4";
-       buildDepends = [ base primitive vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base primitive vector ];
+       testHaskellDepends = [
          base HUnit primitive QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
@@ -26349,8 +27027,8 @@ self: {
        pname = "bitwise";
        version = "0.1.0.2";
        sha256 = "195g09frdyyn3wsb4jyspdmz8dlmpymqdlbss6zyslkddkrs8hdf";
-       buildDepends = [ array base bytestring ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ array base bytestring ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://code.mathr.co.uk/bitwise";
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -26364,11 +27042,11 @@ self: {
        pname = "bitx-bitcoin";
        version = "0.2.0.2";
        sha256 = "0m91zh2g6ahpzwgfhj2phhghylgjp6qksca741bdffkax7xd6x17";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit network record scientific split
          text time
        ];
-       testDepends = [ aeson base bytestring hspec record time ];
+       testHaskellDepends = [ aeson base bytestring hspec record time ];
        jailbreak = true;
        homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
@@ -26382,7 +27060,7 @@ self: {
        pname = "bk-tree";
        version = "0.1.1";
        sha256 = "0av4gkh2vr9righ26hbagh8j30i8k4sp3af98lmwm5gf81vs5az4";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/bitonic/language-spelling";
        description = "BK-tree implementation";
        license = stdenv.lib.licenses.publicDomain;
@@ -26399,7 +27077,11 @@ self: {
        sha256 = "1zi429ny66qp3ywlqfg7y0xk472vxh4z572a4c8rbzpx5lgiypxs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aws base bytestring directory filepath HDBC HDBC-sqlite3 hslogger
+         http-conduit MissingH pureMD5 random strict text unix utf8-string
+       ];
+       executableHaskellDepends = [
          aws base bytestring directory filepath HDBC HDBC-sqlite3 hslogger
          http-conduit MissingH pureMD5 random strict text unix utf8-string
        ];
@@ -26416,7 +27098,7 @@ self: {
        pname = "bktrees";
        version = "0.3.1";
        sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "A set data structure with approximate searching";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -26429,7 +27111,7 @@ self: {
        sha256 = "1zb076m4673jmvzazwjjmlw3nrnw0j22hiim6r90014sqcpb6xhp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 unix ];
+       executableHaskellDepends = [ base haskell98 unix ];
        homepage = "http://github.com/nfjinjing/bla";
        description = "a stupid cron";
        license = stdenv.lib.licenses.bsd3;
@@ -26447,11 +27129,11 @@ self: {
        sha256 = "1ki6kdmc5ss0dp7jrhv9zx9a93f2p38q7i57n0y94awyv5772yla";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring directory download haskeline HTTP hxt
          network process safe tagsoup transformers zlib
        ];
-       testDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://git.kaction.name/black-jewel";
        description = "The pirate bay client";
        license = stdenv.lib.licenses.gpl3;
@@ -26467,11 +27149,11 @@ self: {
        pname = "blacktip";
        version = "0.1.0.1";
        sha256 = "12s05l348q6xlhrwhh2i5v04i9bglvb00vpy25j5axdv5k8nwn62";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitwise bytestring deepseq deepseq-generics locators
          network-info safe split system-fileio system-filepath time
        ];
-       testDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/bitemyapp/blacktip";
        description = "Decentralized, k-ordered unique ID generator";
        license = stdenv.lib.licenses.asl20;
@@ -26483,7 +27165,7 @@ self: {
        pname = "blakesum";
        version = "0.5";
        sha256 = "15k3vf9jqcw1a9gyppkhn5ibj7ld8mb2irfhbwd3plj86xyxxa0g";
-       buildDepends = [ base bytestring text vector ];
+       libraryHaskellDepends = [ base bytestring text vector ];
        jailbreak = true;
        homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
@@ -26501,7 +27183,9 @@ self: {
        sha256 = "1d07005fd670p74vkyi9gg3wawyi21s37ww69fsrrgarf3i5p4m9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base blakesum bytestring haskell98 text vector ];
+       executableHaskellDepends = [
+         base blakesum bytestring haskell98 text vector
+       ];
        jailbreak = true;
        homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
@@ -26517,10 +27201,10 @@ self: {
      mkDerivation {
        pname = "blank-canvas";
        version = "0.5";
-       revision = "1";
        sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
+       revision = "1";
        editedCabalFile = "a9d9c32056144a2e5b84e96dfb3a5334aa89dc616c759e523c538a6b950d5084";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring colour containers
          data-default-class http-types kansas-comet scotty stm text
          transformers vector wai wai-extra warp
@@ -26538,7 +27222,7 @@ self: {
        pname = "blas";
        version = "0.7.6";
        sha256 = "1q6fkw2bsppymy5wi7mgkl09caij52xplw64786548z9i95r0bli";
-       buildDepends = [ base ieee QuickCheck storable-complex ];
+       libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
        jailbreak = true;
        homepage = "http://github.com/patperry/blas";
        description = "Bindings to the BLAS library";
@@ -26552,9 +27236,9 @@ self: {
        pname = "blas-hs";
        version = "0.1.1.0";
        sha256 = "11mhjvqjnap4lj70f6lxjrjrdlkw8gnmd1lz4cfkjawq4w4npq40";
-       buildDepends = [ base storable-complex ];
-       testDepends = [ base vector ];
-       extraLibraries = [ blas ];
+       libraryHaskellDepends = [ base storable-complex ];
+       librarySystemDepends = [ blas ];
+       testHaskellDepends = [ base vector ];
        homepage = "https://github.com/Rufflewind/blas-hs";
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
@@ -26567,7 +27251,9 @@ self: {
        pname = "blastxml";
        version = "0.3.2";
        sha256 = "0slqvv8729vlniwswwipw3yss9id6xvmd416kad1ij064g28j00c";
-       buildDepends = [ base biocore bytestring parallel tagsoup ];
+       libraryHaskellDepends = [
+         base biocore bytestring parallel tagsoup
+       ];
        homepage = "http://biohaskell.org/";
        description = "Library for reading Blast XML output";
        license = "LGPL";
@@ -26590,7 +27276,7 @@ self: {
        pname = "blaze-bootstrap";
        version = "0.1.0.0";
        sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw";
-       buildDepends = [ base blaze-html text ];
+       libraryHaskellDepends = [ base blaze-html text ];
        jailbreak = true;
        homepage = "http://github.com/agrafix/blaze-bootstrap";
        description = "Blaze helper functions for bootstrap pages";
@@ -26606,8 +27292,8 @@ self: {
        pname = "blaze-builder";
        version = "0.4.0.1";
        sha256 = "1id3w33x9f7q5m3xpggmvzw03bkp94bpfyz81625bldqgf3yqdn1";
-       buildDepends = [ base bytestring deepseq text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq text ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text utf8-string
        ];
@@ -26622,7 +27308,7 @@ self: {
        pname = "blaze-builder-conduit";
        version = "1.1.0";
        sha256 = "0xxyn3lhcn1bkybhrl5dx68d0adf26ilf34gv0mxkwpfj7m7d3k3";
-       buildDepends = [ base conduit ];
+       libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Convert streams of builders to streams of bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -26635,10 +27321,10 @@ self: {
      mkDerivation {
        pname = "blaze-builder-enumerator";
        version = "0.2.1.0";
-       revision = "1";
        sha256 = "15mz4dfnngll61b1xv3hfazvzjfd8g9ym0hps1qiks1hl4c2kxah";
+       revision = "1";
        editedCabalFile = "28796d33301d22cfca6188f54699d9efd7721802bc5e9c88a394bec14c9c4fae";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring bytestring-builder enumerator
          streaming-commons transformers
        ];
@@ -26655,7 +27341,9 @@ self: {
        sha256 = "1li3zxrgwj5rgk894d9zwfxnx5dfjzkvjlcyck2g7s0awfp2kq4s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory filepath tagsoup ];
+       executableHaskellDepends = [
+         base containers directory filepath tagsoup
+       ];
        homepage = "http://jaspervdj.be/blaze";
        description = "Tool to convert HTML to BlazeHtml code";
        license = stdenv.lib.licenses.bsd3;
@@ -26670,8 +27358,10 @@ self: {
        pname = "blaze-html";
        version = "0.8.1.0";
        sha256 = "0cgddwdwjszhcd3grfxazvy6jwaxa90s8yw6ir9ji2apbdsw0vgv";
-       buildDepends = [ base blaze-builder blaze-markup bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder blaze-markup bytestring text
+       ];
+       testHaskellDepends = [
          base blaze-builder blaze-markup bytestring containers HUnit
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
@@ -26689,7 +27379,7 @@ self: {
        pname = "blaze-html-contrib";
        version = "0.2.2";
        sha256 = "0a10vzbd5l32y716nmgc49rj2gpyavl8fl1z4qs5drx9adwj50cf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html cgi data-default network safe text
        ];
        homepage = "https://github.com/egonSchiele/blaze-html-contrib";
@@ -26704,7 +27394,7 @@ self: {
        pname = "blaze-html-hexpat";
        version = "0.1.0.0";
        sha256 = "11bw5ywvi7dlz5inch3z0vlg936ch1rnp99bh4nmwskvszidd7kg";
-       buildDepends = [ base blaze-html bytestring hexpat text ];
+       libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
        jailbreak = true;
        homepage = "https://github.com/jaspervdj/blaze-html-hexpat";
        description = "A hexpat backend for blaze-html";
@@ -26720,7 +27410,7 @@ self: {
        pname = "blaze-html-truncate";
        version = "0.3.0.0";
        sha256 = "1czjqxaik1c9ialdwh8inh5iajl87lrnfa9rxnidzvfhc7ks9zbl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup bytestring html-truncate tagsoup text
        ];
        homepage = "http://github.com/mruegenberg/blaze-html-truncate";
@@ -26737,11 +27427,11 @@ self: {
        pname = "blaze-json";
        version = "0.2.1";
        sha256 = "1jqrvv485qyscjppgq2kh6cvhd2lwwqq7gd69ynmrp3qllsc8x83";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-builder containers data-default-class
          text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base doctest QuickCheck scientific tasty tasty-quickcheck
          text unordered-containers vector
        ];
@@ -26760,8 +27450,8 @@ self: {
        pname = "blaze-markup";
        version = "0.7.0.2";
        sha256 = "0p3jsl7ng3fapvbp431cm1bckdwjgc1kmijyvxlgxn1l90l8l1p4";
-       buildDepends = [ base blaze-builder bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base blaze-builder bytestring text ];
+       testHaskellDepends = [
          base blaze-builder bytestring containers HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
@@ -26776,7 +27466,7 @@ self: {
        pname = "blaze-svg";
        version = "0.3.4.1";
        sha256 = "1bfxl2jwr622kgf4gz4gqpdrvscciqpfyzy6qad8j7w633xg8vrp";
-       buildDepends = [ base blaze-markup mtl ];
+       libraryHaskellDepends = [ base blaze-markup mtl ];
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
        license = stdenv.lib.licenses.bsd3;
@@ -26791,11 +27481,11 @@ self: {
        pname = "blaze-textual";
        version = "0.2.1.0";
        sha256 = "0bbcykkrlgdb6jaz72njriq9if6bzsx52jn26k093f5sn1d7jhhh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp old-locale text
          time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring double-conversion QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -26812,7 +27502,7 @@ self: {
        pname = "blaze-textual-native";
        version = "0.2.1.1";
        sha256 = "1q3gdf4ljc5xhw8f72qkvi6insk2nwdfk28a00y1b58jmk8003sd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp old-locale text
          time vector
        ];
@@ -26829,7 +27519,7 @@ self: {
        pname = "blazeMarker";
        version = "0.1.0.0";
        sha256 = "03gx3ylxz7xa86ngi33dm347ni6a4mcq4fizlx3majpfdk5fs38c";
-       buildDepends = [ base blaze-html blaze-markup ];
+       libraryHaskellDepends = [ base blaze-html blaze-markup ];
        description = "...";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26843,7 +27533,8 @@ self: {
        sha256 = "0547wg4qk2xv5gzj1alaxk06j65dhmzhn6y48rjllyr4lc5bm2qj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
+       executableHaskellDepends = [ base unix ];
        description = "Control library for blink(1) LED from ThingM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -26858,7 +27549,7 @@ self: {
        sha256 = "0ilzdjfaq8dzfla0kxgkqbjsba0kbgkz8w5bzlhl0fw6rnaa0hn7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bliplib bytestring containers filepath language-python mtl
          old-time parseargs pretty
        ];
@@ -26876,7 +27567,7 @@ self: {
        pname = "bliplib";
        version = "0.2.1";
        sha256 = "0i5lh78yyj82g08ypyfp01kgc56p6c3nrl9fk49bp2yqpghv65qz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers mtl pretty utf8-string
        ];
        jailbreak = true;
@@ -26891,7 +27582,7 @@ self: {
        pname = "blocking-transactions";
        version = "0.1.0.5";
        sha256 = "00xlj503h6073f9sk7a1p2b66nw2lryyvxxbawwz030mjdb6hgps";
-       buildDepends = [ base containers parallel ];
+       libraryHaskellDepends = [ base containers parallel ];
        homepage = "http://www.downstairspeople.org/git/blocking-transactions.git";
        description = "Composable, blocking transactions";
        license = stdenv.lib.licenses.bsd3;
@@ -26908,11 +27599,11 @@ self: {
        sha256 = "0bdhcjiz2b4zavmixvrl5la91s9z5pra05xk52118cjk4dcfdzfg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base ConfigFile directory feed filepath haskell98 higherorder
-         highlighting-kate mtl old-locale old-time pandoc regex-compat time
-         utf8-string xhtml xml
+       libraryHaskellDepends = [
+         base directory feed filepath higherorder highlighting-kate mtl
+         old-locale pandoc regex-compat time utf8-string xhtml xml
        ];
+       executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26929,12 +27620,12 @@ self: {
        pname = "bloodhound";
        version = "0.7.0.1";
        sha256 = "1r66nb6vbq1pbh2a97wmsk9iav16ac4ppj5yjv3s5l8qc0rydmjs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers data-default-class
          exceptions http-client http-types mtl semigroups text time
          transformers uri-bytestring vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers directory doctest doctest-prop
          filepath hspec http-client http-types mtl QuickCheck
          quickcheck-properties semigroups text time unordered-containers
@@ -26953,8 +27644,8 @@ self: {
        pname = "bloomfilter";
        version = "2.0.1.0";
        sha256 = "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc";
-       buildDepends = [ array base bytestring deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ array base bytestring deepseq ];
+       testHaskellDepends = [
          base bytestring QuickCheck random test-framework
          test-framework-quickcheck2
        ];
@@ -26971,10 +27662,9 @@ self: {
        sha256 = "0cryvs5ia52dkc232cl2crhf0qq7ncir5c3zvrgsbzcc2hnmyrww";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLFW OpenGL ];
+       executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blubber" = callPackage
@@ -26987,7 +27677,7 @@ self: {
        sha256 = "0bc30pw6gvw7i6gh58hhkgx2j432zlh2wh4d41abnkjqygifsxsd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blubber-server bytestring cereal containers gloss network unix
        ];
        homepage = "https://secure.plaimi.net/games/blubber.html";
@@ -27006,7 +27696,8 @@ self: {
        sha256 = "12f594sl2c2hrxr95bpv911x0bdfpmaflp29mhw2yln2vh64nhj5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base cereal containers random ];
+       executableHaskellDepends = [
          base Cabal cereal containers data-default-class network pandoc
          process random scotty text transformers unix
        ];
@@ -27027,7 +27718,7 @@ self: {
        sha256 = "13xfnx08xgbfppr4cqmrqj82w192ll4m1x4kmv5jdpk02yb4zqa2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile containers directory filepath glade gtk mtl process
          random regex-compat unix utf8-string X11 X11-xft xmonad
          xmonad-contrib
@@ -27046,7 +27737,7 @@ self: {
        sha256 = "1qna8rr50mmd90xp7pwhcknx12dv2n7w5pdsw28kpbxykljrszgm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk ];
+       executableHaskellDepends = [ base gtk ];
        jailbreak = true;
        description = "Utilities for Bluetile";
        license = stdenv.lib.licenses.bsd3;
@@ -27063,11 +27754,12 @@ self: {
        sha256 = "1p0mwpjvrv9d0b0gp6s55zys9vcbhpjsjbi711f5x4dagdl0xkhc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring clay flow http-types jmacro lucid pointfree
          pointful text wai wai-extra wai-websockets warp websockets
          wl-pprint-text
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://blunt.herokuapp.com";
        description = "Convert between pointfree and pointful expressions";
@@ -27080,7 +27772,7 @@ self: {
        pname = "bmp";
        version = "1.2.5.2";
        sha256 = "0f88f2ynm1fpzbjijy5fa8blfrdv42h5h28hfjlpd4fp0h96in5x";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.ouroborus.net/bmp";
        description = "Read and write uncompressed BMP image files";
        license = stdenv.lib.licenses.mit;
@@ -27096,11 +27788,14 @@ self: {
        sha256 = "12b5hzazqilwwj0535wrh6i9r6lxi7lbzl727470mvzlr8p8lkyz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base cgi containers html random transformers utility-ht
+       ];
+       executableHaskellDepends = [
          array base cgi containers html httpd-shed network random
          transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers QuickCheck random transformers utility-ht
        ];
        jailbreak = true;
@@ -27120,9 +27815,10 @@ self: {
        sha256 = "0zlrm911sbszxyffz18yf64935iv8s2yk3v8v6cwjij69haryvwi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hogre hois monad-control random reactive-banana
        ];
+       executableHaskellDepends = [ base hogre hois random ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -27133,7 +27829,7 @@ self: {
        pname = "bool-extras";
        version = "0.4.0";
        sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://tom.lokhorst.eu/bool-extras";
        description = "A fold function for Bool";
        license = stdenv.lib.licenses.bsd3;
@@ -27145,7 +27841,7 @@ self: {
        pname = "boolean-list";
        version = "0.1.0.0";
        sha256 = "0yr1szkaaz90nmawzrgfljv7hcd59xs7nr2fhc2rb4582crkykvp";
-       buildDepends = [ base bytestring HUnit ];
+       libraryHaskellDepends = [ base bytestring HUnit ];
        homepage = "http://xy30.com";
        description = "convert numbers to binary coded lists";
        license = stdenv.lib.licenses.gpl3;
@@ -27159,8 +27855,8 @@ self: {
        pname = "boolean-normal-forms";
        version = "0.0.0.1";
        sha256 = "11y26whzibxkcfck83lcrmxl34j7qp374wj6nzx2k3l65sdqm2ic";
-       buildDepends = [ base cond containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base cond containers ];
+       testHaskellDepends = [
          base cond containers QuickCheck tasty tasty-quickcheck
        ];
        jailbreak = true;
@@ -27175,7 +27871,7 @@ self: {
        pname = "boolexpr";
        version = "0.1";
        sha256 = "14v894clplpcc1visqn337p7vmacj5hgx41vr60pwvflmv98d8xn";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27197,9 +27893,10 @@ self: {
        pname = "boolsimplifier";
        version = "0.1.8";
        sha256 = "13w2i7b2g9w5kzqnbjjdzf3r2dm7a4xxags02khhwlj1f8vsjvq9";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Simplification tools for simple propositional formulas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boomange" = callPackage
@@ -27212,7 +27909,7 @@ self: {
        sha256 = "1sg1ldrglhca62xiak33k5023zrpmgg3aa8xpwn8l1323kwlkqm0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers descrilo directory filepath simtreelo
        ];
        description = "A Bookmarks manager with a HTML generator";
@@ -27225,7 +27922,7 @@ self: {
        pname = "boomerang";
        version = "1.4.5";
        sha256 = "03iaasyg2idvq25wzzjk2yr9lyql7bcgmfkycy1cy4ms5dg91k6q";
-       buildDepends = [ base mtl template-haskell text ];
+       libraryHaskellDepends = [ base mtl template-haskell text ];
        description = "Library for invertible parsing and printing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27241,7 +27938,7 @@ self: {
        sha256 = "0yqqb4s5ld4fv7x17d5dp7z2dglrcmgb7fr4n8x4n2pysylxm9nh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers data-accessor data-accessor-template
          font-opengl-basic4x6 GLFW-b MonadRandom mtl OpenGL
        ];
@@ -27263,14 +27960,14 @@ self: {
        pname = "borel";
        version = "0.18.0";
        sha256 = "0daayl70l8afpf6l4822nz2cqjy2k8zbrj89apipjbynsq543453";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base bimap cassava ceilometer-common
          chevalier-common configurator containers errors hslogger lens
          marquise mtl multiset network network-uri pipes pipes-concurrency
          pipes-safe text time transformers unordered-containers
          vaultaire-common vector zeromq4-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async attoparsec base bimap cassava ceilometer-common
          chevalier-common configurator containers either errors hslogger
          hspec lens lens-properties marquise mtl multiset network
@@ -27291,7 +27988,7 @@ self: {
        pname = "bot";
        version = "0.3";
        sha256 = "0crs1c6v298zqkjzkdgicigx22gvp9xv7bjlynbyckvx0lrvfmrc";
-       buildDepends = [ arrows base Stream ];
+       libraryHaskellDepends = [ arrows base Stream ];
        homepage = "http://haskell.org/haskellwiki/Bot";
        description = "bots for functional reactive programming";
        license = stdenv.lib.licenses.bsd3;
@@ -27306,7 +28003,7 @@ self: {
        sha256 = "0ir6h4zkj05na1gyf7h97s832jkphh33c9qjk2i290d0q9y8s4fw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Build tool for Lambdabot";
        license = "GPL";
@@ -27321,11 +28018,11 @@ self: {
        pname = "bound";
        version = "1.0.6";
        sha256 = "0i1q6pv7d7vy9agb6yzj0mi8hq8154wv17qhwkf4jd87k07xv76v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad hashable
          hashable-extras prelude-extras profunctors transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath prelude-extras transformers vector
        ];
        jailbreak = true;
@@ -27340,7 +28037,7 @@ self: {
        pname = "bound-gen";
        version = "0.1.0.2";
        sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp";
-       buildDepends = [ base bound monad-gen mtl ];
+       libraryHaskellDepends = [ base bound monad-gen mtl ];
        description = "Unwrap Scope's with globally fresh values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -27351,7 +28048,7 @@ self: {
        pname = "bounded-tchan";
        version = "0.2.3";
        sha256 = "12c78dz3y1ly05hckd9pf0j4fpknk383qyb5yrhps4sc2m3i9k9w";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Bounded Transactional channels (queues)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27362,7 +28059,7 @@ self: {
        pname = "boundingboxes";
        version = "0.2.3";
        sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8";
-       buildDepends = [ base lens ];
+       libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/fumieval/boundingboxes";
        description = "A generic boundingbox for an arbitrary vector";
        license = stdenv.lib.licenses.bsd3;
@@ -27377,11 +28074,11 @@ self: {
        pname = "bower-json";
        version = "0.7.0.0";
        sha256 = "0vz9xxw2xr27lh70mqxfgvs43sr3sq88xf5vppcn2frsk1hnb7hs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-better-errors base bytestring mtl scientific text
          transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring tasty tasty-hunit text unordered-containers
        ];
        homepage = "https://github.com/hdgarrood/bower-json";
@@ -27395,8 +28092,8 @@ self: {
        pname = "boxes";
        version = "0.1.4";
        sha256 = "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf";
-       buildDepends = [ base split ];
-       testDepends = [ base QuickCheck split ];
+       libraryHaskellDepends = [ base split ];
+       testHaskellDepends = [ base QuickCheck split ];
        description = "2D text pretty-printing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27407,7 +28104,7 @@ self: {
        pname = "bpann";
        version = "0.1.1";
        sha256 = "02c8xyzs4kz9cx7ql48kq5cxf686vvd5mqrprkikynif9r4dk7w8";
-       buildDepends = [ base random split ];
+       libraryHaskellDepends = [ base random split ];
        description = "backpropagation neuronal network";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27420,7 +28117,8 @@ self: {
        sha256 = "18xp0vlmh2n37x6rhczxw115cnips7vm9f560qsr395crqk5dzz9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base mtl unix ];
+       libraryHaskellDepends = [ array base mtl ];
+       executableHaskellDepends = [ array base mtl unix ];
        description = "Brainfuck interpreter";
        license = "GPL";
      }) {};
@@ -27431,7 +28129,7 @@ self: {
        pname = "brainfuck-monad";
        version = "0.4.0";
        sha256 = "14534i070l6w886sjp91yp9bfc2is5z6y7wzm8b6w4j9l78pfgmz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "BrainFuck monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27445,7 +28143,8 @@ self: {
        sha256 = "19x8mg15mscfrj1ppm32rzk8hhm4a2v498aq7sl3kkihrhp19x6j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
+       executableHaskellDepends = [ array base ];
        jailbreak = true;
        homepage = "https://gitlab.com/cpp.cabrera/brainfuck-tut";
        description = "A simple BF interpreter";
@@ -27458,7 +28157,7 @@ self: {
        pname = "break";
        version = "1.0.0";
        sha256 = "15fqdha71i4ziv0ra8v2mfp0fviwgs27xlsvc0chb8icqf33y22m";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        description = "Break from a loop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27471,7 +28170,7 @@ self: {
        sha256 = "04qs2r944jbb2i11dqlvrav8iaanrgp15jri0mq6nf8ccjldh3wr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskgame mtl SDL ];
+       executableHaskellDepends = [ base haskgame mtl SDL ];
        homepage = "http://github.com/Peaker/breakout/tree/master";
        description = "A simple Breakout game implementation";
        license = "GPL";
@@ -27490,7 +28189,7 @@ self: {
        sha256 = "1ndzqwxj7dzff75mgjssh7sgrhxlicdwkcx8j71x52rxyav4aa0j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary blaze-html bytestring configurator cryptohash
          directory hashtables http-types mtl random Spock text transformers
          wai wai-extra wai-middleware-static warp warp-tls xdg-basedir
@@ -27508,7 +28207,7 @@ self: {
        sha256 = "0a9gzclnqb28mm5gf2iiiby30qa0pwlwz3c115sim4lxpq60qran";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base parallel random SDL ];
+       executableHaskellDepends = [ array base parallel random SDL ];
        homepage = "http://github.com/willdonnelly/brians-brain";
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
        license = stdenv.lib.licenses.bsd3;
@@ -27525,8 +28224,11 @@ self: {
        sha256 = "18gm24fd5ad6dgbqiwcs750rvq2v6lmclysd6acj2y8iybwcsg8n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary cmdargs containers directory filepath ListZipper text
+       libraryHaskellDepends = [
+         base binary containers directory filepath ListZipper text
+       ];
+       executableHaskellDepends = [
+         base binary cmdargs containers directory filepath text
        ];
        jailbreak = true;
        description = "Simple part of speech tagger";
@@ -27540,7 +28242,7 @@ self: {
        pname = "broadcast-chan";
        version = "0.1.0";
        sha256 = "1dympzv8gwh31hd0x6ap29rm83rf2klkj34as2xjrayfs9kbp87s";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/merijn/broadcast-chan";
        description = "Broadcast channel type that avoids 0 reader space leaks";
        license = stdenv.lib.licenses.bsd3;
@@ -27552,7 +28254,7 @@ self: {
        pname = "broccoli";
        version = "0.4.1.0";
        sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh";
-       buildDepends = [ base containers stm time ];
+       libraryHaskellDepends = [ base containers stm time ];
        jailbreak = true;
        description = "Small library for interactive functional programs";
        license = stdenv.lib.licenses.bsd3;
@@ -27564,7 +28266,7 @@ self: {
        pname = "bsd-sysctl";
        version = "1.0.7";
        sha256 = "18qs5s6sq6696w7y23fq6pd303j5bfh94lw86dz4z9hgdlmrx36y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Access to the BSD sysctl(3) interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27579,11 +28281,11 @@ self: {
        pname = "bson";
        version = "0.3.1";
        sha256 = "1kihsjws8sqb44gvilh1zxrqn2bml8gxq2bbanxqb7nr4ymwfkiv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cryptohash data-binary-ieee754 mtl network
          text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring cryptohash data-binary-ieee754 mtl network
          QuickCheck test-framework test-framework-quickcheck2 text time
        ];
@@ -27599,7 +28301,7 @@ self: {
        pname = "bson-generic";
        version = "0.0.8";
        sha256 = "0r1gd6jxwzqana2b3i3xm8mx66lq4zkcir11c3v78g9fjyyhy7dh";
-       buildDepends = [ base bson ghc-prim text ];
+       libraryHaskellDepends = [ base bson ghc-prim text ];
        jailbreak = true;
        description = "Generic functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
@@ -27611,7 +28313,7 @@ self: {
        pname = "bson-generics";
        version = "0.0.1";
        sha256 = "03ifgmifk0dx6fzws1qlx3c1nslrkvwman5g3c4iag842bl03gxp";
-       buildDepends = [ base bson ghc-prim ];
+       libraryHaskellDepends = [ base bson ghc-prim ];
        jailbreak = true;
        description = "Generics functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
@@ -27626,7 +28328,7 @@ self: {
        pname = "bson-mapping";
        version = "0.1.4.1";
        sha256 = "0k91rkyh7lmq2iw2kmkl3lbzx4c46yzb2fp9pkag8yd05na2k9za";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bson compact-string-fix template-haskell th-lift
        ];
        description = "Mapping between BSON and algebraic data types";
@@ -27642,8 +28344,8 @@ self: {
        pname = "bspack";
        version = "0.0.4";
        sha256 = "0nzw1cs3nxb55yj3sy5afr6kycbm7xk26xpl0gvysgrd6bs0p8pb";
-       buildDepends = [ base bytestring ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/NicolasDP/hs-bspack";
@@ -27657,7 +28359,7 @@ self: {
        pname = "bsparse";
        version = "0.0.5";
        sha256 = "12wn8jlqkb9d9vpdbwc3m288cgnr15cq4wv5fxlp7f10p3y42l2a";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/vincenthz/hs-bsparse";
        description = "A simple unassuming parser for bytestring";
        license = stdenv.lib.licenses.bsd3;
@@ -27672,11 +28374,11 @@ self: {
        pname = "btree-concurrent";
        version = "0.1.5";
        sha256 = "1xgw3ki3vypyxxiyzfjajjx1vzavyn1v9445cgbqwrr0n0wpkqm6";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base64-bytestring bytestring cereal containers directory
          filepath hashable mtl random snappy stm time
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base base64-bytestring bytestring cereal containers directory
          filepath hashable mtl QuickCheck random snappy stm time unix
        ];
@@ -27692,12 +28394,12 @@ self: {
      mkDerivation {
        pname = "btrfs";
        version = "0.1.1.1";
-       revision = "1";
        sha256 = "1k1b8x0p0q43872c4x5dma2hs9dzkvr7n2dnb3w29ha7f24k8g8z";
+       revision = "1";
        editedCabalFile = "1ef2b2d9f4768be3250cf2f971639c1a0e410e6bb9b035e922305c62c5f00887";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring time unix ];
+       libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
@@ -27712,10 +28414,10 @@ self: {
        pname = "buffer-builder";
        version = "0.2.4.0";
        sha256 = "1krhzcd6jwfi2rclkzrvmlzr8mz1kcll481w890yi64vb65j5cn2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring criterion deepseq HUnit
          quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th
          text vector
@@ -27735,11 +28437,11 @@ self: {
        pname = "buffer-builder-aeson";
        version = "0.2.0.3";
        sha256 = "0i8jv5w016m8az6g809mf54wbkz1dci5w4c7w94rxl2xhsx7q98p";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base buffer-builder bytestring integer-gmp scientific
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base buffer-builder bytestring hashable HUnit
          QuickCheck scientific tasty tasty-hunit tasty-quickcheck tasty-th
          text unordered-containers vector
@@ -27760,16 +28462,16 @@ self: {
        sha256 = "19ayjkaniksivm99lgl7bfjabig00y0gd3w9ssabksg7rfwajc5d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring connection containers
          data-default http-conduit http-types iso8601-time resourcet text
          time transformers unordered-containers vector
        ];
+       executableHaskellDepends = [ base containers text time ];
        jailbreak = true;
        homepage = "https://github.com/sethfowler/hsbugzilla";
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buildable" = callPackage
@@ -27778,7 +28480,7 @@ self: {
        pname = "buildable";
        version = "0.1.0.3";
        sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx";
-       buildDepends = [ base bytestring containers dlist text ];
+       libraryHaskellDepends = [ base bytestring containers dlist text ];
        jailbreak = true;
        description = "Typeclass for builders of linear data structures";
        license = stdenv.lib.licenses.mit;
@@ -27792,7 +28494,7 @@ self: {
        pname = "buildbox";
        version = "2.1.6.1";
        sha256 = "15ddnbnm6wqm5dqf6f2qmxlxy5az0sxvml4rwghivcj0609lfc6i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory mtl old-locale pretty process
          random stm time
        ];
@@ -27809,7 +28511,7 @@ self: {
        sha256 = "0j1fsdmaxnl1zxgvxilznw5jfaaphij6wnhllb64f59kvhpqmy4f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base buildbox parseargs ];
+       executableHaskellDepends = [ base buildbox parseargs ];
        jailbreak = true;
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Tools for working with buildbox benchmark result files";
@@ -27831,14 +28533,20 @@ self: {
        sha256 = "1icm2vqimza6lslav01d11xq4v0p6dpymvx4md48ch8qbhdrn8r3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson async attoparsec base bytestring Cabal cmdargs conduit
-         conduit-extra containers cpphs deepseq directory dynamic-cabal
-         filepath ghc ghc-paths ghc-pkg-lib haskell-src-exts mtl old-time
-         process regex-tdfa syb text time transformers unordered-containers
+       libraryHaskellDepends = [
+         aeson async attoparsec base bytestring Cabal conduit conduit-extra
+         containers cpphs deepseq directory dynamic-cabal filepath ghc
+         ghc-paths ghc-pkg-lib haskell-src-exts mtl old-time process
+         regex-tdfa syb text time transformers unordered-containers
          utf8-string vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson async base bytestring Cabal cmdargs conduit conduit-extra
+         containers cpphs directory dynamic-cabal filepath ghc ghc-paths
+         ghc-pkg-lib haskell-src-exts mtl old-time process regex-tdfa syb
+         text time transformers vector
+       ];
+       testHaskellDepends = [
          aeson async attoparsec base bytestring Cabal conduit conduit-extra
          containers directory dynamic-cabal filepath ghc-pkg-lib HTF HUnit
          mtl old-time process text time transformers unordered-containers
@@ -27857,9 +28565,9 @@ self: {
        pname = "bullet";
        version = "0.2.4";
        sha256 = "0fksxkp6xq0q88g21b917qrg6pzzr1a00w5jjh45f4f9b3smibgn";
-       buildDepends = [ base vect ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ bullet ];
+       libraryHaskellDepends = [ base vect ];
+       libraryPkgconfigDepends = [ bullet ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://www.haskell.org/haskellwiki/Bullet";
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
@@ -27876,7 +28584,7 @@ self: {
        sha256 = "1a6sqkdzq05az6yj3zmlcbx6bmhw4zjx2aijxfi481z3ifiy7z3w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers fclabels process regex-compat split strict
        ];
        homepage = "http://github.com/silkapp/bumper";
@@ -27890,8 +28598,8 @@ self: {
        pname = "burst-detection";
        version = "1.0";
        sha256 = "1pgrqjdc4n97s7jsb9ddmjkw3qa4c28p4fp1ajyx5bfxdll44dwm";
-       buildDepends = [ base deepseq ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://parsci.com/";
        description = "Burst detection algorithms";
@@ -27906,7 +28614,7 @@ self: {
        pname = "bus-pirate";
        version = "0.6.2";
        sha256 = "1l2icqm9wm1q61nrhab9zininifwql304lgzfqbddvah6qx53iqd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring either errors serialport transformers
        ];
        homepage = "http://www.github.com/bgamari/bus-pirate";
@@ -27922,7 +28630,7 @@ self: {
        pname = "buster";
        version = "2.51";
        sha256 = "12h77sa7z5ba6n2hx5kag51lp7q7hdmsd1cb006l7i46cq5b5zzg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dataenc mtl old-locale parsec
          pretty time
        ];
@@ -27941,7 +28649,7 @@ self: {
        pname = "buster-gtk";
        version = "2.0";
        sha256 = "1ajmwdrx7cq5dh7zj0viipnhas0p910ax1yb37ina4nddrpx0gd1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary buster bytestring containers dataenc gtk mtl old-locale
          parsec pretty time
        ];
@@ -27959,7 +28667,7 @@ self: {
        pname = "buster-network";
        version = "1.2";
        sha256 = "17nzw5ycdrw3f1cgwcg1vh1jk80528nl7ksmbmxg2mgndc89kg3i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary buster bytestring containers dataenc haxr HTTP mtl
          network old-locale pretty time
        ];
@@ -27981,18 +28689,17 @@ self: {
        sha256 = "1mj8zxwjbp35pdslnssb9hz6mr3wapslfr3g265s5gk9kn8iqq06";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
          gtk3 hgettext mtl pango parsec pcap process setlocale text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gtk3
          hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
          test-framework-hunit text
        ];
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bv" = callPackage
@@ -28003,7 +28710,7 @@ self: {
        sha256 = "0r2bp39ilwq3zx38spbx5qrpccwm255ax2skab3i7jxjmf7yj025";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://bitbucket.org/iago/bv-haskell";
        description = "Bit-vector arithmetic library";
        license = stdenv.lib.licenses.bsd3;
@@ -28019,10 +28726,11 @@ self: {
        sha256 = "1194h9bhd1n9sxc224j22mir852b9c5ww2cq0sf9x8k3vlfpm1jl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
@@ -28034,7 +28742,7 @@ self: {
        pname = "bytable";
        version = "0.1.0.0";
        sha256 = "0x4yh9li0pi2r9pjih000a143iw9kaz7r4z72510kv6kzkkcr9mn";
-       buildDepends = [ base bytestring word24 ];
+       libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28046,7 +28754,7 @@ self: {
        pname = "byteable";
        version = "0.1.1";
        sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-byteable";
        description = "Type class for sequence of bytes";
        license = stdenv.lib.licenses.bsd3;
@@ -28060,7 +28768,7 @@ self: {
        sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-bytedump";
        description = "Flexible byte dump helpers for human readers";
        license = stdenv.lib.licenses.bsd3;
@@ -28072,7 +28780,7 @@ self: {
        pname = "byteorder";
        version = "1.0.4";
        sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://community.haskell.org/~aslatter/code/byteorder";
        description = "Exposes the native endianness or byte ordering of the system";
        license = stdenv.lib.licenses.bsd3;
@@ -28087,11 +28795,11 @@ self: {
        pname = "bytes";
        version = "0.15.0.1";
        sha256 = "1qlqih83bx2vh5g15wffh4v9cfb5lv6jkj6i1xncd2imw5ynfi08";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers mtl text time transformers
          transformers-compat void
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "https://github.com/ekmett/bytes";
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
@@ -28103,7 +28811,7 @@ self: {
        pname = "byteset";
        version = "0.1.1.0";
        sha256 = "18dg863wbbjh95yial4gy6vi5spwygp0l7dfx6bj00lz4xdrqj8k";
-       buildDepends = [ base binary ];
+       libraryHaskellDepends = [ base binary ];
        description = "Set of bytes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28117,8 +28825,8 @@ self: {
        pname = "bytestring";
        version = "0.10.6.0";
        sha256 = "0xw924djdbs15r4dh2zyn209b0ji94si4ywliagjbg41gdmrl6r7";
-       buildDepends = [ base deepseq ghc-prim integer-gmp ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
+       testHaskellDepends = [
          base byteorder deepseq directory dlist ghc-prim HUnit mtl
          QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -28135,8 +28843,8 @@ self: {
        pname = "bytestring-arbitrary";
        version = "0.0.3";
        sha256 = "1mxxgdak43wz7vzl2hbff9an7krqz4rhld9h173vvq6w2n8jnbi7";
-       buildDepends = [ base bytestring cryptohash QuickCheck ];
-       testDepends = [ base bytestring cryptohash QuickCheck ];
+       libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ];
+       testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
@@ -28149,7 +28857,7 @@ self: {
        pname = "bytestring-builder";
        version = "0.10.6.0.0";
        sha256 = "1mkg24zl0rapb3gqzkyj5ibp07wx3yzd72hmfczssl0is63rjhww";
-       buildDepends = [ base bytestring deepseq ];
+       libraryHaskellDepends = [ base bytestring deepseq ];
        description = "The new bytestring builder, packaged outside of GHC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28159,10 +28867,10 @@ self: {
      mkDerivation {
        pname = "bytestring-class";
        version = "0.0.0.1";
-       revision = "1";
        sha256 = "1z65br00rplhniaw9fg3phpxwf13acgycn5hnhyjfcyr962xp03x";
+       revision = "1";
        editedCabalFile = "e3aa2813d237dcd0a12bfd27293d8bf592cdf13bfdc01a4b609f34df238d0417";
-       buildDepends = [ base bytestring utf8-string ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
        jailbreak = true;
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -28177,10 +28885,10 @@ self: {
        pname = "bytestring-conversion";
        version = "0.3.1";
        sha256 = "1y2fhwz632sp7n0iw87lz2g8vks4jgxz2kw99kysgivxfd4fmdqk";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive double-conversion text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
        homepage = "https://github.com/twittner/bytestring-conversion/";
@@ -28194,7 +28902,7 @@ self: {
        pname = "bytestring-csv";
        version = "0.1.2";
        sha256 = "0x7qklb36jwxry1ih5x3jw7s861vlvd5g9h7yn7b2x64c0phyj0r";
-       buildDepends = [ array base bytestring dlist ];
+       libraryHaskellDepends = [ array base bytestring dlist ];
        homepage = "http://code.haskell.org/~dons/code/bytestring-csv";
        description = "Parse CSV formatted data efficiently";
        license = stdenv.lib.licenses.bsd3;
@@ -28207,7 +28915,7 @@ self: {
        pname = "bytestring-delta";
        version = "0.1.0.1";
        sha256 = "0iq59if3in08ssashk80wvh6yh1yr115387fi9kj952v6bzvzw1q";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/joeyadams/haskell-bytestring-delta";
        description = "Simple, fast binary diff/patch";
        license = stdenv.lib.licenses.mit;
@@ -28221,8 +28929,8 @@ self: {
        pname = "bytestring-from";
        version = "0.3";
        sha256 = "030jrpri4qmv8lr8ahgkbl3gghv2c00lfigx2wbrrv9hz74gkpn4";
-       buildDepends = [ attoparsec base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base bytestring text ];
+       testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
        description = "A type-class to convert values from ByteString";
@@ -28237,8 +28945,8 @@ self: {
        pname = "bytestring-handle";
        version = "0.1.0.3";
        sha256 = "0dakwnpymxj2nghqsnq09862czby8hy0xl8m74yzqdnd9ky22g0z";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -28253,7 +28961,7 @@ self: {
        pname = "bytestring-lexing";
        version = "0.5.0.2";
        sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Parse and produce literals efficiently from strict or lazy bytestrings";
        license = stdenv.lib.licenses.bsd2;
@@ -28265,7 +28973,7 @@ self: {
        pname = "bytestring-mmap";
        version = "0.2.2";
        sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/";
        description = "mmap support for strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -28279,7 +28987,7 @@ self: {
        sha256 = "1kg777gpqj05h5bj0637yky64bdx7x77hm7nq2rhpw4i1mh9gjmx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/solidsnack/bytestring-nums";
        description = "Parse numeric literals from ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -28291,7 +28999,9 @@ self: {
        pname = "bytestring-plain";
        version = "0.1.0.1";
        sha256 = "057f9kyvj7cf2a53f6wqah0bw9cp67s7y3b6l6y78m24ipx8c56a";
-       buildDepends = [ base bytestring deepseq ghc-prim hashable ];
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim hashable
+       ];
        jailbreak = true;
        homepage = "https://github.com/hvr/bytestring-plain";
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
@@ -28305,7 +29015,9 @@ self: {
        pname = "bytestring-progress";
        version = "1.0.5";
        sha256 = "02j9gmvncap4xzvvmj0s84bkhf4xh8plw5saakiljxf6zi7hpdwq";
-       buildDepends = [ base bytestring terminal-progress-bar time ];
+       libraryHaskellDepends = [
+         base bytestring terminal-progress-bar time
+       ];
        homepage = "http://github.com/acw/bytestring-progress";
        description = "A library for tracking the consumption of a lazy ByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -28318,11 +29030,13 @@ self: {
      mkDerivation {
        pname = "bytestring-read";
        version = "0.3.1";
-       revision = "1";
        sha256 = "0df6mb5fhfd1kgah5gv4q4ykxvl0y8hbqrdvm17nh33cxj2csj00";
+       revision = "1";
        editedCabalFile = "8a8b5f5c2f109a11df1cf47ffec170b810e02186f0406fd6c7f4155bfd2de0b6";
-       buildDepends = [ base bytestring types-compat ];
-       testDepends = [ base bytestring doctest tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base bytestring types-compat ];
+       testHaskellDepends = [
+         base bytestring doctest tasty tasty-quickcheck
+       ];
        homepage = "https://github.com/philopon/bytestring-read";
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
@@ -28334,8 +29048,8 @@ self: {
        pname = "bytestring-rematch";
        version = "0.1.0.0";
        sha256 = "01yk1pmsp6c89z4lf6p37g4jqbqz1d93g61gn4i99p8dijbg0pbh";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hspec HUnit rematch ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec HUnit rematch ];
        jailbreak = true;
        homepage = "github.com/tcrayford/rematch";
        description = "Rematch support for ByteString";
@@ -28349,8 +29063,8 @@ self: {
        pname = "bytestring-short";
        version = "0.0.1.0";
        sha256 = "034c63hw49sy4mg6xarf61d4f3shafj66v4sqky04sin460s28wv";
-       buildDepends = [ base bytestring deepseq ];
-       testDepends = [ base bytestring QuickCheck ];
+       libraryHaskellDepends = [ base bytestring deepseq ];
+       testHaskellDepends = [ base bytestring QuickCheck ];
        jailbreak = true;
        description = "Backport copy of ShortByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -28365,7 +29079,7 @@ self: {
        pname = "bytestring-show";
        version = "0.3.5.6";
        sha256 = "04h81a0bh2fvnkby1qafnydb29gzk6d4d311i2lbn7lm2vyjw919";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers integer-gmp
        ];
        homepage = "http://code.haskell.org/~dolio/";
@@ -28379,7 +29093,7 @@ self: {
        pname = "bytestring-trie";
        version = "0.2.4.1";
        sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "An efficient finite map from (byte)strings to values";
        license = stdenv.lib.licenses.bsd3;
@@ -28391,7 +29105,7 @@ self: {
        pname = "bytestringparser";
        version = "0.3";
        sha256 = "1g99vbp14ki563lb41y1fxlgvdmrmq1y0xsk0ia1m438rdpnh2qd";
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28403,7 +29117,7 @@ self: {
        pname = "bytestringparser-temporary";
        version = "0.4.1";
        sha256 = "019axq65hmgmszkc1lyyyy8rpv5xkjbf1pmgz1bz0hnc8lgv58pd";
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28414,7 +29128,7 @@ self: {
        pname = "bytestringreadp";
        version = "0.2";
        sha256 = "07hx3072zg9y3kj6h99yl8fd3n115x4z8z411c1cpx1hj292d57f";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28426,8 +29140,8 @@ self: {
        pname = "bzlib";
        version = "0.5.0.5";
        sha256 = "0zh130vw719a8d11q5qzc3ilzgv8cqyc2a7r1a131cv1fjnd1rwy";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ bzip2 ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) bzip2;};
@@ -28441,15 +29155,15 @@ self: {
        pname = "bzlib-conduit";
        version = "0.2.1.3";
        sha256 = "0jqg38zvxc0fpp74az0vm8klb88zwy076ncwzgq2zr0nrmr5cghm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL bytestring conduit conduit-extra data-default mtl
          resourcet
        ];
-       testDepends = [
+       librarySystemDepends = [ bzip2 ];
+       testHaskellDepends = [
          base bytestring conduit conduit-extra hspec QuickCheck random
          resourcet
        ];
-       extraLibraries = [ bzip2 ];
        homepage = "https://github.com/snoyberg/bzlib-conduit";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
@@ -28461,7 +29175,7 @@ self: {
        pname = "c-dsl";
        version = "0.3.1";
        sha256 = "04hj3d26rp7ibv15n48y4xkfld3nnh6dqn8shxvw1h546z1316pw";
-       buildDepends = [ base language-c ];
+       libraryHaskellDepends = [ base language-c ];
        description = "A higher level DSL on top of language-c";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -28472,7 +29186,7 @@ self: {
        pname = "c-io";
        version = "0.1.0";
        sha256 = "1za4wcrjrxqk8yqy1bddzxw8xxx0vlxyy31dj1glb5azx6qh7qp2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "C IO";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28484,7 +29198,7 @@ self: {
        pname = "c-storable-deriving";
        version = "0.1.2";
        sha256 = "0cdy3fy8lpz5layc0qzixfpbx2jksl9smrf012l5rpl994dwc9x1";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/maurer/c-storable-deriving";
        description = "Generate C-like storable instances from datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -28498,7 +29212,7 @@ self: {
        sha256 = "0alzv8cdv5q6inhgp5zpms24460iqbgmwbc3l1fmf31p6jj802im";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base c0parser ];
+       executableHaskellDepends = [ base c0parser ];
        description = "Simple C0 Syntax Check";
        license = "GPL";
      }) {};
@@ -28509,7 +29223,7 @@ self: {
        pname = "c0parser";
        version = "0.2";
        sha256 = "0i6bsi30dkz51044r92gcgqr07bzbjfzgbr1z7p078j4016zb7cw";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
      }) {};
@@ -28520,14 +29234,14 @@ self: {
        pname = "c10k";
        version = "0.5.0";
        sha256 = "1i62ilk95p1vjyk7gl1fv7lwq6yk3ysfn3v1bbyfpabf97gzr0d9";
-       buildDepends = [ base network unix ];
+       libraryHaskellDepends = [ base network unix ];
        homepage = "http://github.com/kazu-yamamoto/c10k";
        description = "C10k server library using prefork";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "c2hs" = callPackage
-    ({ mkDerivation, array, base, containers, directory, dlist
+    ({ mkDerivation, array, base, c2hs, containers, directory, dlist
      , filepath, HUnit, language-c, pretty, process, shelly
      , test-framework, test-framework-hunit, text, transformers
      }:
@@ -28537,18 +29251,19 @@ self: {
        sha256 = "0d1rgcwvz49v3h511dibiv6m06v8s179pg4sw386z17pz3a2hghm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory dlist filepath language-c pretty
          process
        ];
-       testDepends = [
+       testHaskellDepends = [
          base filepath HUnit shelly test-framework test-framework-hunit text
          transformers
        ];
+       testToolDepends = [ c2hs ];
        homepage = "https://github.com/haskell/c2hs";
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
-     }) {};
+     }) { c2hs = null;};
 
   "c2hsc" = callPackage
     ({ mkDerivation, base, cmdargs, containers, directory, filepath
@@ -28560,7 +29275,7 @@ self: {
        sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers directory filepath HStringTemplate
          language-c mtl pretty split transformers
        ];
@@ -28580,10 +29295,14 @@ self: {
        sha256 = "0g2z9ypnkxbva2h96ihf0slwg2wz389pxr974vn69v2sblkzl9c9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring Cabal conduit conduit-extra containers
          directory filepath process resourcet
        ];
+       executableHaskellDepends = [
+         attoparsec base bytestring Cabal conduit conduit-extra containers
+         directory filepath process
+       ];
        homepage = "http://www.mew.org/~kazu/proj/cab/";
        description = "A maintenance command of Haskell cabal packages";
        license = stdenv.lib.licenses.bsd3;
@@ -28599,7 +29318,7 @@ self: {
        sha256 = "02cfwka49fd399drv6rxb3hbxflpv6s1xfa7l759ihkp19d6ph9v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal directory filepath HTTP optparse-applicative
        ];
        jailbreak = true;
@@ -28609,8 +29328,8 @@ self: {
      }) {};
 
   "cabal-bounds" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-install, cabal-lenses, cmdargs
-     , directory, either, filepath, Glob, lens, process, strict, tasty
+    ({ mkDerivation, base, Cabal, cabal-lenses, cmdargs, directory
+     , either, filepath, Glob, lens, process, strict, tasty
      , tasty-golden, transformers, unordered-containers
      }:
      mkDerivation {
@@ -28619,14 +29338,14 @@ self: {
        sha256 = "1l1nqf8878kmmdc5ssrpn52cszn9w0ym70pjjbaprpa1c7mdbziy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal cabal-lenses cmdargs either lens strict transformers
          unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base directory filepath Glob process tasty tasty-golden
        ];
-       buildTools = [ cabal-install ];
        jailbreak = true;
        description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -28643,12 +29362,13 @@ self: {
        sha256 = "08f3fpfsjj4kk5flxgpjvqffifhfkhnf7i4n23adkf7w1rdw4nlz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal cabal-lenses cmdargs directory either lens strict
          system-fileio system-filepath text transformers
          unordered-containers
        ];
-       testDepends = [ base filepath tasty tasty-golden ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base filepath tasty tasty-golden ];
        jailbreak = true;
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -28662,7 +29382,7 @@ self: {
        sha256 = "06k43il8yiwbj6x3fhw64xdwq8d8qsmvvd1ycgml7vsry6cz6pdh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal optparse-applicative ];
+       executableHaskellDepends = [ base Cabal optparse-applicative ];
        jailbreak = true;
        homepage = "https://github.com/benarmston/cabal-constraints";
        description = "Repeatable builds for cabalized Haskell projects";
@@ -28681,7 +29401,7 @@ self: {
        sha256 = "1phksjb1ahg0dbgsxsckgmqvvhrzvpn02c3w26gbiq9diindx267";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base bytestring Cabal containers directory filepath
          mtl optparse-applicative pretty process tar utf8-string
        ];
@@ -28704,14 +29424,17 @@ self: {
        sha256 = "07wv05fi9sgh8v9239c4rvwrxrmwk7awmk5hpcnpyx8yj8z9z7q5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bifunctors Cabal containers data-default debian
          deepseq Diff directory exceptions filepath hsemail HUnit lens
          memoize mtl network-uri newtype-generics optparse-applicative
          parsec pretty process pureMD5 regex-tdfa set-extra syb text unix
          Unixutils utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base Cabal debian lens mtl pretty Unixutils
+       ];
+       testHaskellDepends = [
          base Cabal containers debian Diff filepath hsemail HUnit lens
          pretty process text
        ];
@@ -28728,7 +29451,9 @@ self: {
        sha256 = "11bp5gmm0j0w5pbd26qd7w05v1mkkxi5gf28rlx44dzic55xpkld";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal containers directory filepath ];
+       executableHaskellDepends = [
+         base Cabal containers directory filepath
+       ];
        homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
@@ -28745,12 +29470,12 @@ self: {
        sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath HTTP mtl
          network pretty process setenv tar template-haskell transformers
          zlib
        ];
-       buildTools = [ cabal-install ];
+       executableToolDepends = [ cabal-install ];
        jailbreak = true;
        homepage = "http://github.com/creswick/cabal-dev";
        description = "Manage sandboxed Haskell build environments";
@@ -28766,7 +29491,7 @@ self: {
        sha256 = "0kbq549bl18f1cd2q4w7nngsvnvgc3366xr7y37x5sw80rq5w5wg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base Cabal directory filepath ];
        description = "show dist dir of 'cabal copy/install'";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28776,11 +29501,11 @@ self: {
      mkDerivation {
        pname = "cabal-file-th";
        version = "0.2.3";
-       revision = "1";
        sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8";
+       revision = "1";
        editedCabalFile = "50bc6cf5a335a2608ab1e5e59b73f184d3f48d91f49fec189701416ff3e1e37e";
-       buildDepends = [ base Cabal directory template-haskell ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base Cabal directory template-haskell ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/nkpart/cabal-file-th";
        description = "Template Haskell expressions for reading fields from a project's cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -28794,7 +29519,10 @@ self: {
        sha256 = "1x7fpvvmr2mq7l960wgsijhyrdaiq3lnnl3z6drklc5p73pms8w6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process ];
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process
+       ];
        homepage = "http://github.com/atnnn/cabal-ghci";
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -28811,7 +29539,7 @@ self: {
        sha256 = "105q051bna299pf1ka0r9bmqsbpzcg9vmbi5ynmalancgjpnm29a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory options parsec process split temporary
        ];
        homepage = "https://john-millikin.com/software/cabal-graphdeps/";
@@ -28831,11 +29559,15 @@ self: {
        sha256 = "1lq8i45wvk8rqilay7j9i9iv5irhqvdg3bp96mj2xxaxrpfi7l20";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring Cabal data-default directory filepath ghc-prim mtl
-         process template-haskell temporary transformers utf8-string
+       libraryHaskellDepends = [
+         base Cabal data-default directory filepath ghc-prim mtl process
+         transformers
        ];
-       testDepends = [ base extra unix ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath process template-haskell
+         temporary transformers utf8-string
+       ];
+       testHaskellDepends = [ base extra unix ];
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -28850,16 +29582,16 @@ self: {
      mkDerivation {
        pname = "cabal-install";
        version = "1.18.1.0";
-       revision = "1";
        sha256 = "1r1shhvnpgxf91rmbv3wa1rkd24plbgr6bpz3aj80ir0z3zbdayn";
+       revision = "1";
        editedCabalFile = "7f1c53bbf3a3906d0594e217d236e54acc015c67db88301dbadaf5008cb9ac4c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal containers directory filepath HTTP mtl
          network network-uri pretty process random stm time unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HTTP
          HUnit mtl network network-uri pretty process QuickCheck stm
          test-framework test-framework-hunit test-framework-quickcheck2 time
@@ -28888,11 +29620,11 @@ self: {
        sha256 = "1d5h7h2wjwc2s3dvsvzjgmmfrfl2312ym2h6kyjgm9wnaqw9w8wx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal containers directory filepath HTTP mtl
          network network-uri pretty process random stm time unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring Cabal containers directory
          extensible-exceptions filepath HTTP HUnit mtl network network-uri
          pretty process QuickCheck regex-posix stm test-framework
@@ -28918,11 +29650,11 @@ self: {
        sha256 = "0gsghmpn38idqivba8islfy5y1xhnhyjdyahdg7h7isc9kvq6isq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal containers directory filepath old-time
          pretty process time unix
        ];
-       extraLibraries = [ zlib ];
+       executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28939,7 +29671,7 @@ self: {
        sha256 = "1fgy79w5bzzhqpnwgfd9jis9w6ix5wwdbwr2g556rxvmqsgl7mmg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base Cabal containers directory filepath HTTP network
          old-time pretty process random time unix zlib
        ];
@@ -28961,7 +29693,7 @@ self: {
        sha256 = "1ssk5h0hlv3aivzsr0iv90g683qkqmppc7glivhwfm6q1vkv9gmd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base Cabal containers directory filepath HTTP network
          old-time pretty process random time unix zlib
        ];
@@ -28978,7 +29710,7 @@ self: {
        pname = "cabal-lenses";
        version = "0.4.5";
        sha256 = "1v09n4mah5azb1hmc14ygiqwwm2an6ff2z2f9hw2c7jddbmays5n";
-       buildDepends = [ base Cabal lens unordered-containers ];
+       libraryHaskellDepends = [ base Cabal lens unordered-containers ];
        jailbreak = true;
        description = "Lenses and traversals for the Cabal library";
        license = stdenv.lib.licenses.bsd3;
@@ -28994,7 +29726,10 @@ self: {
        sha256 = "0rvmb6lx2alr7f0v7nbv48xzg7wp4nrn03hdkjc4a4c97rai14i9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal directory fgl filepath parsec process text
+       ];
+       executableHaskellDepends = [
          base Cabal directory fgl filepath parsec process text
        ];
        jailbreak = true;
@@ -29013,8 +29748,13 @@ self: {
        sha256 = "14k8nv2kg8n9ssz6jivvin56jjazsvp4xg7zi0z6hcawfmcdmzd6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base shelly system-fileio system-filepath text ];
-       testDepends = [ base hspec shelly system-filepath text unix ];
+       libraryHaskellDepends = [ base shelly system-filepath text ];
+       executableHaskellDepends = [
+         base shelly system-fileio system-filepath text
+       ];
+       testHaskellDepends = [
+         base hspec shelly system-filepath text unix
+       ];
        homepage = "http://www.yesodweb.com/";
        description = "build multiple packages at once";
        license = stdenv.lib.licenses.bsd3;
@@ -29030,7 +29770,7 @@ self: {
        sha256 = "1wngmf73dqyyf9nfbpwyg3mvbp32rqrhhp4kf9nylhawwkv7c8v0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath process simple-get-opt vty
        ];
        description = "A monitor for cabal builds";
@@ -29047,7 +29787,7 @@ self: {
        sha256 = "1clwhlqm1k9km29i9b2c2ys59nfspsffrixr2sz824gnd415x3lk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory HTTP process tar
        ];
        homepage = "http://github.com/snoyberg/cabal-nirvana";
@@ -29063,7 +29803,7 @@ self: {
        sha256 = "0fz2hpm8fd49jhqdc9cwzvdq34b64zwn4ln8n77hxqx8rfw8zvif";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base Cabal directory filepath ];
        jailbreak = true;
        description = "Show dependencies of program being built in current directory";
        license = stdenv.lib.licenses.bsd3;
@@ -29077,7 +29817,7 @@ self: {
        pname = "cabal-query";
        version = "0.1";
        sha256 = "0j4n48ngwins8bl7g3mazwmbwgyjpp17mi77c9j1klfgx7fam6wa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal derive ghc MissingH mtl tar template-haskell
          uniplate
        ];
@@ -29098,7 +29838,9 @@ self: {
        sha256 = "07ig7lwkf9lv10kacxcydpz3z6fhpmmpwcr6kq32xgh3larsf0g5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process time unix ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process time unix
+       ];
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
@@ -29110,7 +29852,7 @@ self: {
        pname = "cabal-scripts";
        version = "0.1.1";
        sha256 = "1ajgx29hvcsdd6lwc78dyhsjm5ikx2zn0kdbwnzn1kggz2l08ls4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Shell scripts for support of Cabal maintenance";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29124,7 +29866,7 @@ self: {
        sha256 = "0k1lnixkmgdjn8d2akhj60133brs424y0cwwzwraq7awx03y72bm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal ];
        homepage = "http://www.haskell.org/cabal/";
        description = "The user interface for building and installing Cabal packages";
        license = stdenv.lib.licenses.bsd3;
@@ -29141,7 +29883,7 @@ self: {
        sha256 = "1b8yr4k0mapysgh96dxabpzxznd65v8yrcba0jk6wda3mwlm1nqk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cereal directory filepath process tar zlib
        ];
        description = "Sign and verify Cabal packages";
@@ -29159,7 +29901,7 @@ self: {
        sha256 = "1991k6p8vvagnm8wpmzy84088whkqls1q4rdgir4f2m7r0wxl414";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory explicit-exception fgl
          filepath process transformers utility-ht
        ];
@@ -29180,7 +29922,7 @@ self: {
        sha256 = "1x8fb7hly9cxhfacwrai1zam6737dgfhjs9g85826f2cp4vp0g29";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring conduit conduit-extra containers directory filepath
          http-conduit http-types network process resourcet shelly
          system-fileio system-filepath tar text transformers
@@ -29198,7 +29940,9 @@ self: {
        sha256 = "11883q7zjy3l5qla5rvbmflm19kalvzqx7n1hprmiizr1kczh6ax";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal filepath ghc pqc QuickCheck ];
+       executableHaskellDepends = [
+         base Cabal filepath ghc pqc QuickCheck
+       ];
        description = "Automated test tool for cabal projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29214,8 +29958,9 @@ self: {
        sha256 = "1qjshg9r6vh964mwsj0spsxcl3sdvll2znjd2hq4lw71va4iwm87";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath unix ];
-       testDepends = [ base hspec process regex-posix ];
+       libraryHaskellDepends = [ base directory filepath unix ];
+       executableHaskellDepends = [ base directory filepath unix ];
+       testHaskellDepends = [ base hspec process regex-posix ];
        description = "A program for finding temporary build file during cabal-test";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29226,7 +29971,7 @@ self: {
        pname = "cabal-test-compat";
        version = "0.2.0.0";
        sha256 = "15lxyrza1n9saac1awjx482gi7wq3sshqf4ich6k9xkfj464lrdq";
-       buildDepends = [ base Cabal QuickCheck ];
+       libraryHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility interface of cabal test-suite";
        license = stdenv.lib.licenses.bsd3;
@@ -29238,7 +29983,7 @@ self: {
        pname = "cabal-test-quickcheck";
        version = "0.1.6";
        sha256 = "0rffvz3khxdfbl9rfk1q47xqv013dwmd4sy8cy7y833175j2zibi";
-       buildDepends = [ base Cabal QuickCheck ];
+       libraryHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
@@ -29252,7 +29997,7 @@ self: {
        sha256 = "0ys1c8z8042vc7dzmis47w0q3qapyllmsdkpb1by22qmcnaavii2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath mtl process ];
+       executableHaskellDepends = [ base directory filepath mtl process ];
        description = "Uninstall cabal packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29265,7 +30010,7 @@ self: {
        sha256 = "05k77hdx0sbgnn454vb6rc7mmrc3zby7s44x498i4ncrkivz90bz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath HTTP network ];
+       executableHaskellDepends = [ base filepath HTTP network ];
        jailbreak = true;
        description = "Command-line tool for uploading packages to Hackage";
        license = stdenv.lib.licenses.bsd3;
@@ -29282,7 +30027,7 @@ self: {
        sha256 = "0sk10z9lj291rpidlaydp7nvgl7adbp7gyf2nvqqhrshxnlqpc8z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          archlinux base bytestring Cabal cmdargs containers directory
          filepath mtl pretty process
        ];
@@ -29300,7 +30045,9 @@ self: {
        sha256 = "1nqchq9mzq8k99agvafwa4vll7d3ahpkaifnjj2bnljqdkxlh9al";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal hsemail hxt parsec process ];
+       executableHaskellDepends = [
+         base Cabal hsemail hxt parsec process
+       ];
        jailbreak = true;
        homepage = "http://gregheartsfield.com/cabal2doap/";
        description = "Cabal to Description-of-a-Project (DOAP)";
@@ -29316,7 +30063,8 @@ self: {
        sha256 = "11fp52hmzkrgcmkxzclmq6bbzxsn0ph78ib6wzzkza5j2c48ya2l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal curl directory filepath ];
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base curl directory ];
        homepage = "yet";
        description = "make gentoo's .ebuild file from .cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -29332,7 +30080,7 @@ self: {
        sha256 = "1fg3pr25f78a6b8nqxvxki4z3fvgx4i6zkmpl992a0iarycqdrsg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal cmdargs stylish-haskell system-fileio system-filepath
          text unordered-containers yaml
        ];
@@ -29348,16 +30096,16 @@ self: {
      mkDerivation {
        pname = "cabal2nix";
        version = "1.73";
-       revision = "5";
        sha256 = "1nskcr8k5a8wm9q5is0b1kww574q2nq45f16agya8z44hgk97xiv";
+       revision = "5";
        editedCabalFile = "54866b8081ddfc72761c1f38cc96df6782682058cd09b465300562910f57e2ea";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers deepseq directory filepath hackage-db mtl
          pretty process regex-posix transformers
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "http://github.com/NixOS/cabal2nix";
        description = "Convert Cabal files into Nix build instructions";
@@ -29374,7 +30122,7 @@ self: {
        sha256 = "08y8rwj86n7f3bqfv2ximlx8qas12zspiz6ix8gg01whsry43nsj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal directory filepath haskell98 old-locale
          process tar time unix Unixutils zlib
        ];
@@ -29394,7 +30142,10 @@ self: {
        sha256 = "195wsfh813z6pmba3lz2xgfcqijcql6xwqsggqb5rmzqxbkvk0bd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal containers directory MissingH pretty ];
+       libraryHaskellDepends = [ base Cabal pretty ];
+       executableHaskellDepends = [
+         base Cabal containers directory MissingH
+       ];
        jailbreak = true;
        homepage = "http://github.com/creswick/cabal-query";
        description = "A simple tool to query cabal files";
@@ -29409,8 +30160,9 @@ self: {
        sha256 = "02brl9b1g3cyw5nmk0mih073kbszpc6g2nqgs0sh93h7y5naf5kp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
-       testDepends = [ base directory doctest filepath process ];
+       libraryHaskellDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base directory filepath process ];
+       testHaskellDepends = [ base directory doctest filepath process ];
        description = "alias for cabal install from given git repo";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -29425,7 +30177,7 @@ self: {
        sha256 = "1kgw1n22zh1ap6dfzhmh18d0wkr6ppd9b20r77f7q6m371hhbkvy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath pretty process
        ];
        homepage = "http://code.haskell.org/~dons/code/cabalgraph";
@@ -29442,7 +30194,8 @@ self: {
        sha256 = "0pgkav4ifwkqh9idj8rpbnq3rw51i94dj1zw0wf7mv72bb32a0c6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal cabalrpmdeps haskell98 ];
+       libraryHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
+       executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
        homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-cabalmdvrpm;a=shortlog;topi=0";
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
@@ -29457,7 +30210,8 @@ self: {
        sha256 = "19kzbwpb9gv9knz1dfvck8yb1kda5dg9rig5xrsd118wgq6xpkr1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal filepath haskell98 ];
+       libraryHaskellDepends = [ base Cabal filepath haskell98 ];
+       executableHaskellDepends = [ base Cabal filepath haskell98 ];
        homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-CabalRpmDeps;a=summary";
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
@@ -29472,7 +30226,7 @@ self: {
        sha256 = "1ai2yz4whbjk9qfpyzjqkdypqknnzfdr1fdp5ii7h059na0q6iq2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal ];
        description = "Verify installed package version against user-specified constraints";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29487,7 +30241,7 @@ self: {
        sha256 = "0wj1x6gsr5jlnq0l6xgwy2y64jlxna7bvx7vwk73znf572rswmxk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring directory filepath optparse-applicative
          process unix
        ];
@@ -29501,9 +30255,9 @@ self: {
        pname = "cabocha";
        version = "0.1.0.0";
        sha256 = "0siqh3dly69b1kfm5y3q0sccqxx25hflwhizw6ga70icmvscwrwf";
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base text-format ];
-       extraLibraries = [ cabocha ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ cabocha ];
+       testHaskellDepends = [ base text-format ];
        homepage = "http://github.com/pecorarista/hscabocha";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29517,7 +30271,7 @@ self: {
        pname = "cached-traversable";
        version = "0.1.0.1";
        sha256 = "05hlj6qdy0iqyi8z75h7fr9ijfhxngyr3v60q8y681acsgr54dv6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath mtl
        ];
        description = "Transparent, persistent caching of lazy, traversable structures";
@@ -29530,7 +30284,7 @@ self: {
        pname = "caf";
        version = "0.0.3";
        sha256 = "1yrl3ffkfwgs4kljx57m1ldam087s7iby2qs74c4crxkrcj0j7a8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://sites.google.com/site/cafwiki/";
        description = "A library of Concurrency Abstractions using Futures";
        license = stdenv.lib.licenses.bsd3;
@@ -29542,7 +30296,7 @@ self: {
        pname = "cafeteria-prelude";
        version = "0.1.0.0";
        sha256 = "1iyasmd8zcg98vy7ffhxyyr664f02ird5z7rks9n67ixv7n60mrl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Scott-Fleischman/cafeteria-prelude";
        description = "Prelude subsets—take only what you want!";
        license = stdenv.lib.licenses.mit;
@@ -29558,7 +30312,7 @@ self: {
        pname = "caffegraph";
        version = "0.1.0.2";
        sha256 = "1yz427ygabkycvngqw250ksl17nwi0fy52x2fy3x6apg79cw1ng2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers fgl filepath graphviz language-lua lens
          mtl optparse-applicative process protocol-buffers
          protocol-buffers-descriptor template-haskell temporary text
@@ -29576,9 +30330,11 @@ self: {
        pname = "cairo";
        version = "0.13.1.0";
        sha256 = "0vi7glzizi2nvv0p5wsdxlpkx3f1875jpij26k2j4h0h6z53z3kb";
-       buildDepends = [ array base bytestring mtl text utf8-string ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ cairo ];
+       libraryHaskellDepends = [
+         array base bytestring mtl text utf8-string
+       ];
+       libraryPkgconfigDepends = [ cairo ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Cairo library";
        license = stdenv.lib.licenses.bsd3;
@@ -29592,7 +30348,7 @@ self: {
        sha256 = "1191j2587f1sy4d6z57df21xn00qdpv27clib7cyaqdy5jnv3zw2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo glib gtk ];
+       executableHaskellDepends = [ base cairo glib gtk ];
        description = "A template for building new GUI applications using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29608,13 +30364,15 @@ self: {
        sha256 = "168szg38gq0g0mppjszcsmsdygs8qy23w6xsz8gbg7dkh7izy1ba";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary bytestring cmdargs containers derive directory
-         filepath mtl parsek process pureMD5 regex-tdfa split
+       libraryHaskellDepends = [
+         base binary bytestring containers derive directory filepath mtl
+         parsek process pureMD5 split
+       ];
+       executableHaskellDepends = [
+         array base cmdargs directory filepath process regex-tdfa
        ];
        description = "A build-system library and driver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake3" = callPackage
@@ -29629,11 +30387,15 @@ self: {
        sha256 = "0k045qqnivhmsvxas0zlmp9qgkb16917s4wk67l7mscgpi99fhdq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq directory filepath
+         haskell-src-meta language-javascript mime-types monadloc mtl parsec
+         process syb system-filepath template-haskell text text-format
+       ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers directory filepath
          haskell-src-meta language-javascript mime-types monadloc mtl
-         optparse-applicative parsec process syb system-filepath
-         template-haskell text text-format
+         optparse-applicative parsec process syb template-haskell text
        ];
        jailbreak = true;
        homepage = "https://github.com/grwlf/cake3";
@@ -29652,7 +30414,9 @@ self: {
        sha256 = "1a2ypgkpzzp2hn14x35ava0p0k781s7mhldw29ppl1an7fs91fyx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT gluturtle lojbanParser yjsvg yjtools ];
+       executableHaskellDepends = [
+         base GLUT gluturtle lojbanParser yjsvg yjtools
+       ];
        homepage = "http://homepage3.nifty.com/salamander/myblog/cakyrespa.html";
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
@@ -29665,8 +30429,8 @@ self: {
        pname = "cal3d";
        version = "0.1";
        sha256 = "1b4pajzpf879vns2kffkqgyk5sbsfrr3q2kv5ryvls8rgwcjc3q6";
-       buildDepends = [ base ];
-       extraLibraries = [ cal3d ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ cal3d ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
@@ -29681,7 +30445,7 @@ self: {
        sha256 = "1fj6v1dw1gyy6dx4ssiziahxf8j8vr4l35n3rm04g797wypswmw0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
+       executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Examples for the Cal3d animation library";
        license = "GPL";
@@ -29694,7 +30458,7 @@ self: {
        pname = "cal3d-opengl";
        version = "0.1";
        sha256 = "02na1ww5dw08n2y7v2vkgdvzw0zpiic5683jac7f2zvhcij68sf2";
-       buildDepends = [ base cal3d OpenGL ];
+       libraryHaskellDepends = [ base cal3d OpenGL ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
@@ -29709,7 +30473,7 @@ self: {
        sha256 = "1h3rqxj2df68knrb2rhp75rc92q9knsa7jp749j9h24258yr6qxw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base harpy haskell98 mtl ];
+       executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29723,8 +30487,8 @@ self: {
        sha256 = "1k21wf4gnq8h1a8nk5xx41yibc3azscxgkm8ajmjnj1a5w71wm8c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers haskeline parsec ];
-       testDepends = [ base containers parsec QuickCheck ];
+       executableHaskellDepends = [ base containers haskeline parsec ];
+       testHaskellDepends = [ base containers parsec QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/sumitsahrawat/calculator";
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
@@ -29741,7 +30505,10 @@ self: {
        sha256 = "0mlgxghah8mw0v17rywfj190kmc4jajpmjpgkpgfxdqzw8djyph0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory haskell98 mtl parsec readline
+       ];
+       executableHaskellDepends = [
          base containers directory haskell98 mtl parsec readline
        ];
        description = "Calculation tool and library supporting units";
@@ -29759,7 +30526,7 @@ self: {
        sha256 = "0mg3qn4zfsg5pvfp51zjvsy24mljkqh2f7bsjbz04zasx5852dz9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers cpphs lens mtl parsec transformers
        ];
        jailbreak = true;
@@ -29783,13 +30550,14 @@ self: {
        sha256 = "1hbzrhhx0cjgpxiq3200n38pl2m2y727zfmgfdfs45l1hqbvrldp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          audiovisual base bindings-portaudio boundingboxes colors containers
          control-bool deepseq directory filepath free freetype2 GLFW-b
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
          OpenGL OpenGLRaw random reflection template-haskell text
          transformers vector WAVE
        ];
+       executableHaskellDepends = [ base lens ];
        jailbreak = true;
        homepage = "https://github.com/fumieval/call";
        description = "The call game engine";
@@ -29806,9 +30574,10 @@ self: {
        sha256 = "0hav4kypy39lil49wrclrrajrwa5prmi7r7s6y9i3xshn1mhnjx1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring msgpack mtl template-haskell
        ];
+       executableHaskellDepends = [ base bytestring msgpack mtl ];
        jailbreak = true;
        homepage = "https://github.com/nh2/call-haskell-from-anything";
        description = "Python-to-Haskell function calls";
@@ -29824,7 +30593,7 @@ self: {
        sha256 = "0xk1rxydncwfwj9cg4jwdgi8mlgwmk5nfk462pla26dqqg44aw2p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring Imlib terminfo ];
+       executableHaskellDepends = [ base bytestring Imlib terminfo ];
        homepage = "not yet available";
        description = "Image converter to 256-colored text";
        license = stdenv.lib.licenses.bsd3;
@@ -29839,7 +30608,7 @@ self: {
        pname = "campfire";
        version = "0.2.1";
        sha256 = "06m5d7b6dqmp3x09b1nib1rxjh1gvx84bhvfnydlb26093za71b4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers filepath
          http-enumerator http-types mtl old-locale process text time
          transformers unordered-containers url
@@ -29857,7 +30626,7 @@ self: {
        pname = "canonical-filepath";
        version = "1.0.0.3";
        sha256 = "0dg9d4v08gykbjmzafpakgwc51mq5d5m6ilmhp68czpl30sqjhwf";
-       buildDepends = [ base deepseq directory filepath ];
+       libraryHaskellDepends = [ base deepseq directory filepath ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/canonical-filepath";
        description = "Abstract data type for canonical file paths";
@@ -29870,7 +30639,7 @@ self: {
        pname = "canteven-config";
        version = "1.0.0.0";
        sha256 = "1dkw0w43ajjgpczp8hmclr93v9scl75rlnsmxdjvwmv9phpj5559";
-       buildDepends = [ base unix yaml ];
+       libraryHaskellDepends = [ base unix yaml ];
        description = "A pattern for configuring programs";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -29883,7 +30652,7 @@ self: {
        pname = "canteven-log";
        version = "0.2.0.0";
        sha256 = "15gfic3yzi4wc06s9zfpxs0ygxbhasarfn92dj7h0aqfgqa0wvff";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base canteven-config directory filepath hslogger text yaml
        ];
        homepage = "https://github.com/SumAll/haskell-canteven-log";
@@ -29901,11 +30670,11 @@ self: {
        sha256 = "16dx8v29gfwrrfb2lwkjlwbbp8n6jdpdcmwh15rrfx97rz4k0qz3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath hxt hxt-xpath parsec
          split
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring Cabal containers directory filepath hspec hxt
          hxt-xpath parsec QuickCheck split
        ];
@@ -29927,11 +30696,11 @@ self: {
        sha256 = "0rmq22fiaadpszckbj5k5gi4sr1jipinyrx9hwc21k5d185vsakd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base cmdargs ConfigFile containers directory dlist filepath
          language-c mtl pretty process yices
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://haslab.uminho.pt/mbb/software/cao-domain-specific-language-cryptography";
        description = "CAO Compiler";
        license = "GPL";
@@ -29946,7 +30715,7 @@ self: {
        sha256 = "1492x5hy5ljf0h40c045jd3w26f7jwqplgncka3dnw4mx9kq4g15";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskell98 ];
+       executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29958,7 +30727,7 @@ self: {
        pname = "capped-list";
        version = "1.2";
        sha256 = "0sik7svknaam6fhlvb4p1ijwaiwrgssrdl9gmq1wmfx66g069xi9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29971,7 +30740,9 @@ self: {
        sha256 = "0hsrznygvn1b2qpc75591kzmcpqh7p5fhi1mw3ws2c75igjqbni7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process
+       ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29989,11 +30760,11 @@ self: {
        sha256 = "1cvpyad7kmkndan1bfpfaav6lara8g78x02pgascrq8n73b2jcgs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers exceptions gl lens linear mtl semigroups
          text transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit linear sdl2 test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -30012,7 +30783,7 @@ self: {
        sha256 = "1wi06n0cdqkvyqqr9ji7nyjn09qqckskrzi3djcnxgwhwwp8da3i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring filepath haskell98 IfElse MissingH
        ];
        homepage = "http://github.com/jdevelop/carboncopy";
@@ -30031,7 +30802,7 @@ self: {
        sha256 = "1vjrppsqmlxajj7dxr13ynipp0adi6xxpqic5mma04sjgi3afrj2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo directory filepath gtk hcwiid highlighting-kate mtl
          pandoc pango process time
        ];
@@ -30048,7 +30819,9 @@ self: {
        pname = "carray";
        version = "0.1.5.2";
        sha256 = "0kjqxjnamhnpjjf2bgm1gnsy6jx1fjbn5mx394pyx1vq3lkfgfb0";
-       buildDepends = [ array base binary bytestring ix-shapable syb ];
+       libraryHaskellDepends = [
+         array base binary bytestring ix-shapable syb
+       ];
        description = "A C-compatible array library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30063,8 +30836,10 @@ self: {
        sha256 = "05m4b8gi5ysx73yzlhl27fx9i8fnlihxwsyh6a0702kzwgn40icc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath time transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base directory filepath time transformers
+       ];
+       testHaskellDepends = [
          base directory filepath multiarg QuickCheck random tasty
          tasty-quickcheck tasty-th time transformers
        ];
@@ -30082,11 +30857,11 @@ self: {
        pname = "casadi-bindings";
        version = "2.3.0.1";
        sha256 = "1a1644lwzarfcjgnhzyi7lp0xhxmzm80h6nini6bcgkm4g4c9h4q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
        ];
-       pkgconfigDepends = [ casadi ];
+       libraryPkgconfigDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
@@ -30101,10 +30876,10 @@ self: {
        pname = "casadi-bindings-control";
        version = "2.0.0.1";
        sha256 = "03lpg9vp47db8wc4waajfh1z96f3nc1v29wqc9a58vrhfdnhp52w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base casadi-bindings-core casadi-bindings-internal vector
        ];
-       pkgconfigDepends = [ casadi_control ];
+       libraryPkgconfigDepends = [ casadi_control ];
        jailbreak = true;
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.gpl3;
@@ -30117,8 +30892,8 @@ self: {
        pname = "casadi-bindings-core";
        version = "2.3.0.1";
        sha256 = "0agzm3bqb3fii626m40684g7hahj2mhv60xx0smhw78z978cqw57";
-       buildDepends = [ base casadi-bindings-internal vector ];
-       pkgconfigDepends = [ casadi ];
+       libraryHaskellDepends = [ base casadi-bindings-internal vector ];
+       libraryPkgconfigDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30130,8 +30905,8 @@ self: {
        pname = "casadi-bindings-internal";
        version = "0.1.3.0";
        sha256 = "1kazy8xppydbl6gkdn1y1gv2lz38sif6i92crkxb476xz0fvmf00";
-       buildDepends = [ base vector ];
-       pkgconfigDepends = [ casadi ];
+       libraryHaskellDepends = [ base vector ];
+       libraryPkgconfigDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
@@ -30146,10 +30921,10 @@ self: {
        pname = "casadi-bindings-ipopt-interface";
        version = "1.9.0.3";
        sha256 = "1h1qpl8ch8riz614fssirlp5j3vzi39jjajwjnfqvgw7h8sdam2a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base casadi-bindings-core casadi-bindings-internal vector
        ];
-       pkgconfigDepends = [ casadi_ipopt_interface ];
+       libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30163,10 +30938,10 @@ self: {
        pname = "casadi-bindings-snopt-interface";
        version = "1.9.0.3";
        sha256 = "0sygbbvdrd1za6k9yf0yqxfd48imlhghzf6sy0dh77jmdhlb8asw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base casadi-bindings-core casadi-bindings-internal vector
        ];
-       pkgconfigDepends = [ casadi_snopt_interface ];
+       libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30180,7 +30955,7 @@ self: {
        pname = "cascading";
        version = "0.1.0";
        sha256 = "0w9zhaf4a09nl3b1sffllgf0zc10lzy38a8k4f7sbc0hr45wzj5y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring colour containers lens mtl text
          utf8-string web-routes
        ];
@@ -30196,7 +30971,7 @@ self: {
        pname = "case-conversion";
        version = "0.1";
        sha256 = "1njnhbqj1c0zxr0vkb7qh51764f3hscjqjq2yzgyy1shfrc1y1i4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "www.xy30.com";
        description = "Convert between different cases";
        license = stdenv.lib.licenses.bsd3;
@@ -30210,8 +30985,8 @@ self: {
        pname = "case-insensitive";
        version = "1.2.0.4";
        sha256 = "07nm40r9yw2p9qsfp3pjbsmyn4dabrxw34p48171zmccdd5hv0v3";
-       buildDepends = [ base bytestring deepseq hashable text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+       testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
        ];
        homepage = "https://github.com/basvandijk/case-insensitive";
@@ -30225,7 +31000,7 @@ self: {
        pname = "cased";
        version = "0.1.0.0";
        sha256 = "08xdc0mpp6b6inaxh6cr6ni08sy2ahfcbq8xbs3m4cfqbrqfd543";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/jb55/cased";
        description = "Track string casing in its type";
        license = stdenv.lib.licenses.mit;
@@ -30239,8 +31014,8 @@ self: {
        pname = "cases";
        version = "0.1.2.1";
        sha256 = "0p2dfnyj887bnp414psbmkin4ybmflvgr1q2npvcih2sxianywkd";
-       buildDepends = [ attoparsec base-prelude loch-th text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base-prelude loch-th text ];
+       testHaskellDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
        jailbreak = true;
@@ -30257,7 +31032,7 @@ self: {
        pname = "cash";
        version = "0.1.0.1";
        sha256 = "0pwn33dpv5bgs74i8x6q47hsbl0jg68xwhjjiwyjdyl6sb3rfih7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq haskell98 HaXml network parallel pretty
        ];
        jailbreak = true;
@@ -30276,7 +31051,7 @@ self: {
        pname = "cassandra-cql";
        version = "0.5.0.2";
        sha256 = "1nk0psvmzhvxls4h0p4blrm8qjn6lyh08bdxpiagpw6nrpvbda54";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers cryptohash Decimal hslogger
          MonadCatchIO-transformers mtl network resource-pool stm text time
          uuid
@@ -30291,7 +31066,7 @@ self: {
        pname = "cassandra-thrift";
        version = "0.8.5.1";
        sha256 = "0hmmi0g32nfwcny56sb4jw463jp7hiwj2hhv42bf8h9az30vjxwc";
-       buildDepends = [ base bytestring containers Thrift ];
+       libraryHaskellDepends = [ base bytestring containers Thrift ];
        homepage = "http://cassandra.apache.org/";
        description = "thrift bindings to the cassandra database";
        license = "unknown";
@@ -30308,11 +31083,11 @@ self: {
        pname = "cassava";
        version = "0.4.3.1";
        sha256 = "1b62zx6fna0nx3qvs316bwc39l8qan9fpm82f1p28ipkyq0ym2g3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring hashable HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
@@ -30330,11 +31105,11 @@ self: {
        pname = "cassava-conduit";
        version = "0.2.0";
        sha256 = "09z7i147qs292xl3hqqi1x1kigrxdh5s8gzin12fgcpbyjggv30n";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bifunctors bytestring cassava conduit conduit-extra
          containers mtl
        ];
-       testDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
@@ -30351,8 +31126,10 @@ self: {
        sha256 = "08b144jm9805wqj68cgmh5j0bq03i439cpbxvq5m2k72m9s81kl7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cassava io-streams vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring cassava io-streams vector
+       ];
+       testHaskellDepends = [
          base bytestring cassava io-streams QuickCheck tasty
          tasty-quickcheck vector
        ];
@@ -30369,7 +31146,7 @@ self: {
        pname = "cassette";
        version = "0.1.0";
        sha256 = "04qnk1s4bdj3wbbxdwzzvpnhkcgma8c4qfkg454ybg7f8kyv6h7x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30386,13 +31163,13 @@ self: {
        pname = "cassy";
        version = "0.7.1";
        sha256 = "0nm1xn7rkxqdap0k3lcl29jp7ajn5fypaqx3ag1zbyp8llc7xy0f";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base binary bytestring cassandra-thrift
          cereal conduit containers data-default errors exceptions mtl
          network resource-pool retry safecopy stm syb text Thrift time
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cassandra-thrift containers derive HUnit network
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text Thrift time
@@ -30414,7 +31191,7 @@ self: {
        sha256 = "0h6dvc8lzlxkgkqkj3zwxjdmws29g4fsw7p6ysd7i54xqb8vy5ka";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers optparse-applicative shelly system-fileio
          system-filepath text
        ];
@@ -30431,7 +31208,7 @@ self: {
        sha256 = "1vjhg9dxg23q0dqr07gbrg92h3m9r38d7jb3c4sxnw6gaj76f5gw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk haskell98 mtl parsec ];
+       executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        homepage = "http://code.atnnn.com/projects/casui";
        description = "Equation Manipulator";
        license = stdenv.lib.licenses.mit;
@@ -30444,7 +31221,7 @@ self: {
        pname = "catamorphism";
        version = "0.5.1.0";
        sha256 = "1lhqdr0l3wc59ms1i1xmwp6iy4n4xrd8pi0an0n0jgxw5j2sfbkq";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/frerich/catamorphism";
        description = "A package exposing a helper function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
@@ -30456,7 +31233,7 @@ self: {
        pname = "catch-fd";
        version = "0.2.0.2";
        sha256 = "05fvrkvqyj7xdn6vvdwhfbym7rg9fl7r7lzzcsr2cx59iqi23frx";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/sonyandy/catch-fd";
        description = "MonadThrow and MonadCatch, using functional dependencies";
@@ -30470,7 +31247,7 @@ self: {
        pname = "categorical-algebra";
        version = "0.0.0.1";
        sha256 = "1kx6195mfnw4aqmcd1m4s8z5l1s8zh69in00p9a0mxm3xj3pfvpl";
-       buildDepends = [ base newtype pointless-haskell void ];
+       libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30482,7 +31259,7 @@ self: {
        pname = "categories";
        version = "1.0.7";
        sha256 = "18ihv16g4w0s6n89c64j4998hbsgzhp5w9ph2gdkygq7f30cx7f2";
-       buildDepends = [ base void ];
+       libraryHaskellDepends = [ base void ];
        homepage = "http://github.com/ekmett/categories";
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
@@ -30501,7 +31278,7 @@ self: {
        pname = "category-extras";
        version = "1.0.2";
        sha256 = "168psp1qd80838b9945499qh99jidbl2gngcrjqk6hb0qsyhckcq";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions bifunctors categories comonad comonad-extras
          comonad-transformers comonads-fd contravariant distributive either
          free groupoids indexed indexed-extras invariant kan-extensions keys
@@ -30521,10 +31298,12 @@ self: {
      mkDerivation {
        pname = "cautious-file";
        version = "1.0.2";
-       revision = "1";
        sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
+       revision = "1";
        editedCabalFile = "c6183204fc6d4767c8b8c4b954f6908fd376054c28904866a90a66497970d893";
-       buildDepends = [ base bytestring directory filepath unix ];
+       libraryHaskellDepends = [
+         base bytestring directory filepath unix
+       ];
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30538,7 +31317,7 @@ self: {
        pname = "cayley-client";
        version = "0.1.3.0";
        sha256 = "0wzpnylzlyx0lanjqg44b134s2irb55072dz5s8ljq76acg1jmfl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
          unordered-containers vector
@@ -30560,7 +31339,7 @@ self: {
        sha256 = "0yp2z0dpw19r6av71ghlp1pzal7276wlywsmjz5xmkggy04v1xnj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson ansi-wl-pprint base bytestring Cabal containers directory
          filepath mtl optparse-applicative process safe stringsearch tar
          transformers unix Unixutils utf8-string zlib
@@ -30580,12 +31359,12 @@ self: {
        sha256 = "0pvap67fn9kmjvn2qqq3x99k3mzrrsnb6q6fhawvyxv8drihsfc7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ cci ];
+       testHaskellDepends = [
          base binary bytestring cmdargs containers filepath mtl pretty
          process random time
        ];
-       extraLibraries = [ cci ];
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30597,7 +31376,7 @@ self: {
        pname = "ccnx";
        version = "0.0.0";
        sha256 = "18gnm6skzdnh6cis7l7v3d5813zn6irw6nywg6shffrn8v2y6xh7";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "A Haskell implementation of the CCNx network protocol";
@@ -30612,10 +31391,10 @@ self: {
        pname = "cctools-workqueue";
        version = "3.6.1.0.1.0.0.1";
        sha256 = "1nqczr2f4bv107sdhqnllqcaz413r4f69f9ypshig8jyxzpcdwn3";
-       buildDepends = [
+       libraryHaskellDepends = [
          bindings-cctools bytestring lens monad-loops unix
        ];
-       extraLibraries = [ dttools ];
+       librarySystemDepends = [ dttools ];
        homepage = "http://bitbucket.org/badi/hs-cctools-workqueue";
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
@@ -30632,7 +31411,7 @@ self: {
        sha256 = "13nhwd07ly2ppgbakffr2cc2idacz0q5bahz0819jjascspm32vy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl parsec utf8-string
        ];
        jailbreak = true;
@@ -30649,8 +31428,8 @@ self: {
        pname = "cef";
        version = "0.1.2";
        sha256 = "0f5qj5xhmlys09i4vis3ricz0ym2hmdn53kgcb1qk23y0m4s94ci";
-       buildDepends = [ base bytestring text time ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base bytestring text time ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/picussecurity/haskell-cef.git";
        description = "CEF log format";
        license = stdenv.lib.licenses.bsd3;
@@ -30666,11 +31445,11 @@ self: {
        pname = "ceilometer-common";
        version = "0.2.3";
        sha256 = "1zqqh7k627yw6vfcdihl2gw8hh3l9gxj283azmmcc9pm15grblps";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bimap binary bytestring containers foldl lens pipes siphash
          template-haskell text vaultaire-common
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bimap binary bytestring containers data-ordlist foldl hspec
          lens lens-properties mtl pipes QuickCheck siphash template-haskell
          text transformers vaultaire-common
@@ -30687,8 +31466,8 @@ self: {
        pname = "cellrenderer-cairo";
        version = "1.0.0.0";
        sha256 = "05cdrq1mrrhfbsk1w1dg5qayan0h9m92r4gqgcpzfa9a073w78zw";
-       buildDepends = [ base cairo glib gtk mtl ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base cairo glib gtk mtl ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        description = "Cairo-based CellRenderer";
        license = stdenv.lib.licenses.bsd3;
@@ -30700,7 +31479,9 @@ self: {
        pname = "cereal";
        version = "0.4.1.1";
        sha256 = "15rhfn9hrjm01ksh9xpz9syxsp9vkvpp6b736iqq38wv2wb7416z";
-       buildDepends = [ array base bytestring containers ghc-prim ];
+       libraryHaskellDepends = [
+         array base bytestring containers ghc-prim
+       ];
        description = "A binary serialization library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30713,10 +31494,10 @@ self: {
        pname = "cereal-conduit";
        version = "0.7.2.3";
        sha256 = "0s1s8jm25wxj44x44vjz4kz5qblkyjaz7f8rw5i81bzam32afj9s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal conduit resourcet transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal conduit HUnit mtl resourcet transformers
        ];
        homepage = "https://github.com/snoyberg/conduit";
@@ -30730,7 +31511,7 @@ self: {
        pname = "cereal-derive";
        version = "0.1.1";
        sha256 = "04mlg1r2qvrwdzcfbf1aqs4bf9n2gc7cwv73fbhld2ji5naa6fwb";
-       buildDepends = [ base cereal ghc-prim ];
+       libraryHaskellDepends = [ base cereal ghc-prim ];
        jailbreak = true;
        description = "Automatic deriving of Serialize using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
@@ -30742,7 +31523,7 @@ self: {
        pname = "cereal-enumerator";
        version = "0.3.1";
        sha256 = "0lpsj4f7v4sgrr6lf8jl07xwj8j3i3wj23as0imswk71f7xwfnnk";
-       buildDepends = [ base bytestring cereal enumerator ];
+       libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30754,7 +31535,7 @@ self: {
        pname = "cereal-ieee754";
        version = "0.1";
        sha256 = "1gr22ziz9bj4q3y8j1vg46m648zqvbajfdks8p64xc28ci25pw2s";
-       buildDepends = [ array base cereal ];
+       libraryHaskellDepends = [ array base cereal ];
        jailbreak = true;
        homepage = "http://github.com/jystic/cereal-ieee754";
        description = "Floating point support for the 'cereal' serialization library";
@@ -30772,11 +31553,11 @@ self: {
        pname = "cereal-plus";
        version = "0.4.0";
        sha256 = "109y4ydhbl68rsi95fwck3gq1wvn9bpv0r9g9b7fm8wsgd06gipc";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers errors hashable hashtables
          mmorph mtl stm text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring cereal containers errors hashable hashtables
          HTF HUnit mmorph mtl QuickCheck quickcheck-instances stm text time
          unordered-containers vector
@@ -30794,7 +31575,7 @@ self: {
        pname = "cereal-text";
        version = "0.1.0.1";
        sha256 = "1wsp4zb6ib8fym4kaq6ixm7l2slljmz6waliab3dyb2zdl400spq";
-       buildDepends = [ base cereal text ];
+       libraryHaskellDepends = [ base cereal text ];
        homepage = "https://github.com/ulikoehler/cereal-text";
        description = "Data.Text instances for the cereal serialization library";
        license = stdenv.lib.licenses.asl20;
@@ -30806,8 +31587,8 @@ self: {
        pname = "cereal-vector";
        version = "0.2.0.1";
        sha256 = "0czrb4l1n73cfxxlzbcqfa34qa3gw0m5w5mlz0rawylyqfk8a1pz";
-       buildDepends = [ base bytestring cereal vector ];
-       testDepends = [ base cereal QuickCheck vector ];
+       libraryHaskellDepends = [ base bytestring cereal vector ];
+       testHaskellDepends = [ base cereal QuickCheck vector ];
        homepage = "https://github.com/acfoltzer/cereal-vector";
        description = "Serialize instances for Data.Vector types.";
        license = stdenv.lib.licenses.bsd3;
@@ -30824,7 +31605,7 @@ self: {
        sha256 = "18g5rq7lpxmvmlnz610537w6mix6z6kxjrfj2ylbhkc81r5pn9g6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-data base bytestring containers crypto-pubkey-types cryptohash
          directory filepath mtl pem process time
        ];
@@ -30841,11 +31622,11 @@ self: {
      mkDerivation {
        pname = "cf";
        version = "0.4.1";
-       revision = "1";
        sha256 = "1z8hqd06nrrbgmg2gpryalhnk4z0sxm7is46sgpy09x9p6xd0fqx";
+       revision = "1";
        editedCabalFile = "9fd574edfce6ea014201ccc3591638de0574f251290bcf0f44a8a00338131692";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -30865,7 +31646,7 @@ self: {
        sha256 = "1lwgqibxrs8n3czhpyg1halizsmz5jd8r2z8ham4pwi58815fzij";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers data-default dequeue mtl
        ];
        homepage = "https://github.com/bairyn/cfipu";
@@ -30883,7 +31664,7 @@ self: {
        pname = "cflp";
        version = "2009.2.1";
        sha256 = "01j4904fa8z2wmflqs3q1g3dg966dllbp2sbxxbghh0hhzwyg0vy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers control-monad-omega HUnit incremental-sat-solver
          level-monad logict MonadRandom mtl random stream-monad syb
          value-supply
@@ -30904,7 +31685,7 @@ self: {
        sha256 = "1vd1ilcdd1k081bg4nk1zazdsd9fbz7zzcz453ff0xxjp9xl1b3z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers data-default dequeue mtl
        ];
        description = "cfopu processor";
@@ -30923,7 +31704,7 @@ self: {
        sha256 = "0slsckr1xyn1b3vb2xhd2diqhr9cdbkn9g5hfsy0q6sjiy979vpl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cereal containers deepseq directory filepath
          hashable mtl parallel parsec process split text
          unordered-containers utf8-string void
@@ -30942,7 +31723,7 @@ self: {
        sha256 = "18k9na7gwmnmn5gdin1qi041cb7w49xcgdnjjpc3dhmfiqnq41q8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath mtl parsec regex-posix safe
          template-haskell
        ];
@@ -30961,7 +31742,7 @@ self: {
        pname = "cgi";
        version = "3001.2.2.2";
        sha256 = "0q1pxpa8gi42c0hsidcdkhk5xr5anfrvhqsn3iksr9c0rllhz193";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers exceptions mtl multipart network
          network-uri old-locale old-time parsec xhtml
        ];
@@ -30976,7 +31757,7 @@ self: {
        pname = "cgi-undecidable";
        version = "3000.0.0";
        sha256 = "1xh3q0s7398gd3513ycxypnj0m9jn0kdbb7459dsb459kbvzdpab";
-       buildDepends = [ base cgi mtl ];
+       libraryHaskellDepends = [ base cgi mtl ];
        description = "Undecidable instances for the cgi package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30986,10 +31767,10 @@ self: {
      mkDerivation {
        pname = "cgi-utils";
        version = "0.2.1";
-       revision = "1";
        sha256 = "0msljq31bz40hsrhhq9qhxrgmdlqq32l3ykcy4wviv8kmc3dic7p";
+       revision = "1";
        editedCabalFile = "df1cb1e658d9b79adde373fc31a1d7553a4803f8967c760abf233e75913ddd52";
-       buildDepends = [ base cgi containers mtl random ];
+       libraryHaskellDepends = [ base cgi containers mtl random ];
        homepage = "http://github.com/chrisdone/haskell-cgi-utils";
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
        license = stdenv.lib.licenses.bsd3;
@@ -31008,7 +31789,7 @@ self: {
        sha256 = "021cwllz5cljb9j0klh3xn4jpg2vxfqwqyjm631gkpzndc9711wr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal array async base bytestring cmdargs containers
          directory dlist either filepath ghc-prim mtl regex-posix safe split
          stm stringsearch unix-compat unordered-containers
@@ -31024,8 +31805,8 @@ self: {
        pname = "chain-codes";
        version = "0.3.0.0";
        sha256 = "0vw6qwgcljxgrjrsgkpkdqqnpxvibnsc0c4h5kyg5p8h4avsk8k6";
-       buildDepends = [ base containers JuicyPixels ];
-       testDepends = [ base containers hspec JuicyPixels ];
+       libraryHaskellDepends = [ base containers JuicyPixels ];
+       testHaskellDepends = [ base containers hspec JuicyPixels ];
        homepage = "http://github.com/Fuuzetsu/chain-codes";
        description = "Library decoding chain codes from images";
        license = stdenv.lib.licenses.gpl3;
@@ -31037,7 +31818,7 @@ self: {
        pname = "chalk";
        version = "0.1.0.1";
        sha256 = "0d9qp512ww5cpvv7pby4saqjxy9qyid3gf0gndqhglikcc0wayxy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/joom/chalk";
        description = "Terminal string styling";
@@ -31054,10 +31835,11 @@ self: {
        sha256 = "0786fxylzz73kgbyyy6pz5fhk7rfh4fnrbq0br7ghg74qka66sb9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Codec-Image-DevIL containers
          data-reify directory GLUT OpenGLRaw process time
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/ChalkBoard";
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
@@ -31070,7 +31852,7 @@ self: {
        pname = "chalkboard-viewer";
        version = "0.1";
        sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2";
-       buildDepends = [ array base chalkboard GLUT OpenGL time ];
+       libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
        jailbreak = true;
        homepage = "http://ittc.ku.edu/~andygill/chalkboard.php";
        description = "OpenGL based viewer for chalkboard rendered images";
@@ -31084,7 +31866,7 @@ self: {
        pname = "chalmers-lava2000";
        version = "1.5";
        sha256 = "1xrzh1mqa6d3hwr7lfazfskh6bklbj3kv9vlm40n650l2l42arga";
-       buildDepends = [ array base process random ];
+       libraryHaskellDepends = [ array base process random ];
        homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf";
        description = "Hardware description EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -31096,7 +31878,7 @@ self: {
        pname = "chan-split";
        version = "0.5.0";
        sha256 = "1mzvrxcf263gs61hj7gafra1cqvpfbzy7rza7ql0xvnmj2g2ybrc";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://brandon.si/code/module-chan-split-released/";
        description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class.";
        license = stdenv.lib.licenses.bsd3;
@@ -31110,7 +31892,8 @@ self: {
        sha256 = "071qc0nhg4431c32z4qh23fiw1bjd1jc4s0sgq5v8ymwz4rfy9a2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory process ];
+       libraryHaskellDepends = [ base process ];
+       executableHaskellDepends = [ directory ];
        description = "Parse VCS changelogs into ChangeLogs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31126,7 +31909,11 @@ self: {
        sha256 = "0vi82z2c3km5shyk3wwb07y3cqcnkvkgvbl1s36a50kbz65jrl64";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base configurator containers heist mtl QuickCheck random snap text
+         xmlhtml
+       ];
+       executableHaskellDepends = [
          base configurator containers filepath heist lens mtl QuickCheck
          random snap snap-core snap-extras snap-server text xmlhtml
        ];
@@ -31145,7 +31932,7 @@ self: {
        pname = "charset";
        version = "0.3.7.1";
        sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers semigroups unordered-containers
        ];
        homepage = "http://github.com/ekmett/charset";
@@ -31159,7 +31946,7 @@ self: {
        pname = "charsetdetect";
        version = "1.0";
        sha256 = "1w302v6pmi448k2rq2cc7wp1javsd9rgk7r7i43lxvbjhniydn7p";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://www.github.com/batterseapower/charsetdetect";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
@@ -31172,7 +31959,7 @@ self: {
        pname = "charsetdetect-ae";
        version = "1.0.1";
        sha256 = "0bvdnv608glim8yn4dvh3av7x0fxxp3z6719j0n005bygdfgjxna";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/Aelve/charsetdetect-ae";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
@@ -31184,7 +31971,7 @@ self: {
        pname = "chart-histogram";
        version = "1.0.0";
        sha256 = "130jbbbb1spkbqapxys0bqr0spq6c03x1m259alg5wxnl8xnn4w5";
-       buildDepends = [ base Chart ];
+       libraryHaskellDepends = [ base Chart ];
        jailbreak = true;
        description = "Easily render histograms with Chart";
        license = stdenv.lib.licenses.bsd3;
@@ -31199,11 +31986,11 @@ self: {
        pname = "chaselev-deque";
        version = "0.5.0.5";
        sha256 = "1x2301faqkchkzrvbnganly341jilvg1fmx6lazgbs98cbazhn2d";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque array atomic-primops base ghc-prim transformers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          abstract-deque abstract-deque-tests array atomic-primops base
          containers ghc-prim HUnit test-framework test-framework-hunit
          vector
@@ -31226,13 +32013,16 @@ self: {
        sha256 = "01594wp13kigqvr27112fmsrgz4cny4vlprqvyygp90k8mavxw8s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers deepseq directory filepath
          fullstop mbox MonadRandom parsec QuickCheck quickcheck-instances
          random-shuffle regex-tdfa regex-tdfa-text text tokenize
          transformers zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring cereal containers filepath text
+       ];
+       testHaskellDepends = [
          base cereal containers filepath HUnit parsec QuickCheck
          quickcheck-instances tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck text tokenize
@@ -31252,7 +32042,7 @@ self: {
        pname = "chatty";
        version = "0.6.4.1";
        sha256 = "02garbdwhg32f089xd18w1i5hr9cbmvzk6cjdsl48w976liwqglz";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base chatty-utils directory mtl process random setenv
          template-haskell text time transformers unix
        ];
@@ -31268,7 +32058,7 @@ self: {
        pname = "chatty-text";
        version = "0.6.2.0";
        sha256 = "0gfgzqpdjja3ddz3hkynm31p9ma3g16qxavqcwybmp3v6h1pa2l3";
-       buildDepends = [ base chatty transformers ];
+       libraryHaskellDepends = [ base chatty transformers ];
        homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
        license = stdenv.lib.licenses.agpl3;
@@ -31280,7 +32070,7 @@ self: {
        pname = "chatty-utils";
        version = "0.7.3.2";
        sha256 = "1d929y9zqj9mr99v691ymp0amy1x6nzkxjdaj3ylbgydjw1m3j8j";
-       buildDepends = [ base mtl text transformers ];
+       libraryHaskellDepends = [ base mtl text transformers ];
        homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Some utilities every serious chatty-based application may need";
        license = stdenv.lib.licenses.agpl3;
@@ -31297,9 +32087,12 @@ self: {
        sha256 = "0drx1hlqvdcrij4097q6bxhbfcqm73jsqv1wwhd3hsnjdmr46ch2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base blaze-html bytestring containers data-default http-types
-         mtl syb text uniplate wai wai-extra xss-sanitize
+       libraryHaskellDepends = [
+         base blaze-html containers data-default mtl syb text uniplate
+         xss-sanitize
+       ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring http-types text wai wai-extra
        ];
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
@@ -31312,8 +32105,8 @@ self: {
        pname = "check-email";
        version = "1.0";
        sha256 = "1drw8rspdc4a7jw2ql3fi1dcmw56ah5csf2bil6ii8ccq5vsbfyz";
-       buildDepends = [ base bytestring email-validate ];
-       extraLibraries = [ resolv ];
+       libraryHaskellDepends = [ base bytestring email-validate ];
+       librarySystemDepends = [ resolv ];
        description = "Confirm whether an email is valid and probably existant";
        license = stdenv.lib.licenses.bsd3;
      }) { resolv = null;};
@@ -31328,7 +32121,7 @@ self: {
        sha256 = "18xhm11xwvy9cz149ddm3lj4gxb514jglwhdr50mkrdd4rw8w59f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers explicit-exception filepath haskell-src-exts
          non-empty transformers utility-ht
        ];
@@ -31345,7 +32138,7 @@ self: {
        pname = "checked";
        version = "0.1.0.1";
        sha256 = "00l04qxdid2pi885ixnyh91bsigsmk5rxb0jw6dl6j1mlcq27smd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31357,7 +32150,7 @@ self: {
        pname = "checkers";
        version = "0.4.3";
        sha256 = "0ry5c9c1hcp9rgf2h3gy5ajjp96anhp2738hgzrvf9aj90hr6n60";
-       buildDepends = [ array base QuickCheck random ];
+       libraryHaskellDepends = [ array base QuickCheck random ];
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31370,7 +32163,7 @@ self: {
        pname = "chell";
        version = "0.4.0.1";
        sha256 = "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring options patience random
          template-haskell text transformers
        ];
@@ -31385,7 +32178,7 @@ self: {
        pname = "chell-hunit";
        version = "0.2.1";
        sha256 = "006l2j98gmgjrapyp00vz93hxlx9gwkdnxwh5nx293zp7vm27x00";
-       buildDepends = [ base chell HUnit ];
+       libraryHaskellDepends = [ base chell HUnit ];
        homepage = "https://john-millikin.com/software/chell/";
        description = "HUnit support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
@@ -31397,7 +32190,7 @@ self: {
        pname = "chell-quickcheck";
        version = "0.2.5";
        sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs";
-       buildDepends = [ base chell QuickCheck random ];
+       libraryHaskellDepends = [ base chell QuickCheck random ];
        homepage = "https://john-millikin.com/software/chell/";
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
@@ -31409,7 +32202,9 @@ self: {
        pname = "chesshs";
        version = "0.2.1";
        sha256 = "0dydib3rf735wljyqij2g03xi0yxfviga5ws708nhg64f4kv8cfv";
-       buildDepends = [ array attoparsec base bytestring containers ];
+       libraryHaskellDepends = [
+         array attoparsec base bytestring containers
+       ];
        homepage = "http://arnovanlumig.com/chesshs.html";
        description = "Simple library for validating chess moves and parsing PGN files";
        license = stdenv.lib.licenses.bsd3;
@@ -31424,7 +32219,7 @@ self: {
        pname = "chevalier-common";
        version = "0.6.0";
        sha256 = "0fg7cb5ds2ixk046isz6wala7azaxqlfsacb1p7l9j6din9mgzrs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring cereal locators mtl network network-uri
          protobuf text unordered-containers vaultaire-common zeromq4-haskell
        ];
@@ -31442,7 +32237,7 @@ self: {
        pname = "chp";
        version = "2.2.0.1";
        sha256 = "18z0836hxs4ix7mdjxvpb40i4s71dc1j3vpxfh0vj8mf5drpc942";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq extensible-exceptions pretty stm
        ];
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
@@ -31457,7 +32252,7 @@ self: {
        pname = "chp-mtl";
        version = "1.0.0";
        sha256 = "1x14xl9hm9n3zczj6xhffvpac09q5a13i94fhkq2kzj2s3rk1b4z";
-       buildDepends = [ base chp chp-plus mtl ];
+       libraryHaskellDepends = [ base chp chp-plus mtl ];
        jailbreak = true;
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "MTL class instances for the CHP library";
@@ -31473,7 +32268,7 @@ self: {
        pname = "chp-plus";
        version = "1.3.1.2";
        sha256 = "1875fqf24jwl5vf2cys7yc70k0c53pg74i041y1xbrczincaww0z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base chp containers deepseq extensible-exceptions HUnit pretty
          QuickCheck stm
        ];
@@ -31491,7 +32286,9 @@ self: {
        pname = "chp-spec";
        version = "1.0.0";
        sha256 = "0jil6p0cw8bbpzb0kf9lxljdnbbp0xyq7c6x7bfc7291kqkafgdi";
-       buildDepends = [ base containers deepseq mtl pretty TypeCompose ];
+       libraryHaskellDepends = [
+         base containers deepseq mtl pretty TypeCompose
+       ];
        jailbreak = true;
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "A mirror implementation of chp that generates a specification of the program";
@@ -31505,7 +32302,7 @@ self: {
        pname = "chp-transformers";
        version = "1.0.0";
        sha256 = "0d4hcqpjxmns1fhq918s6z9f4bxlbjlkxzq5xkpqwjxpzy83wq23";
-       buildDepends = [ base chp chp-plus transformers ];
+       libraryHaskellDepends = [ base chp chp-plus transformers ];
        jailbreak = true;
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "Transformers instances for the CHP library";
@@ -31519,7 +32316,9 @@ self: {
        pname = "chronograph";
        version = "0.2.0.1";
        sha256 = "0qy2ahnp324jh0ybqwsa4nc3r2x1hkbrg6sl6f8dg1xnr0gpaag2";
-       buildDepends = [ base deepseq ghc-prim thyme vector-space ];
+       libraryHaskellDepends = [
+         base deepseq ghc-prim thyme vector-space
+       ];
        jailbreak = true;
        description = "measure timings of data evaluation";
        license = stdenv.lib.licenses.bsd3;
@@ -31534,7 +32333,7 @@ self: {
        pname = "chu2";
        version = "2012.11.20";
        sha256 = "01q34kzhisb8ani3k5dfjaixa7j1vqg0nh8mbmnya52hr7p4sdiz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default hack2 hack2-handler-snap-server
          utf8-string
        ];
@@ -31551,11 +32350,11 @@ self: {
        pname = "chuchu";
        version = "0.4.5";
        sha256 = "04xyylp5gliwpps753xqn8r72708ygxcp08j0fypc64ykhv5pnqc";
-       buildDepends = [
+       libraryHaskellDepends = [
          abacate ansi-wl-pprint base cmdargs lifted-base monad-control
          parsec text transformers
        ];
-       testDepends = [ base HUnit text transformers unix ];
+       testHaskellDepends = [ base HUnit text transformers unix ];
        jailbreak = true;
        homepage = "http://github.com/marcotmarcot/chuchu";
        description = "Behaviour Driven Development like Cucumber for Haskell";
@@ -31571,7 +32370,7 @@ self: {
        pname = "chunked-data";
        version = "0.2.0";
        sha256 = "0wmjpb0vq0nqvy317gmzxqh8yqq1bx0h2r90vqfpq3cv3z4g784s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers mono-traversable
          semigroups text transformers vector
        ];
@@ -31586,7 +32385,7 @@ self: {
        pname = "chunks";
        version = "2007.4.18";
        sha256 = "0qdwilzhbnx5zgga65lcwd6kzwvsbvi8ybfw9i4d8ziz89190fkz";
-       buildDepends = [ base haskell98 parsec template-haskell ];
+       libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
        homepage = "http://www.wellquite.org/chunks/";
        description = "Simple template library with static safety";
        license = "LGPL";
@@ -31601,8 +32400,9 @@ self: {
        sha256 = "12g5hvb5qpbmfn1389wj7sfkc4qp19vg24gpn6j225yfyk8ccik7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring text ];
-       testDepends = [ base binary bytestring HUnit text ];
+       libraryHaskellDepends = [ base binary bytestring text ];
+       executableHaskellDepends = [ base binary bytestring text ];
+       testHaskellDepends = [ base binary bytestring HUnit text ];
        jailbreak = true;
        description = "Human-readable storage of text/binary objects";
        license = stdenv.lib.licenses.gpl3;
@@ -31614,7 +32414,7 @@ self: {
        pname = "church-list";
        version = "0.0.2";
        sha256 = "0xidwcn79acpg691n0xqk3q7xlprp9gibqkafn262zq24sks31xw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Removed; please see fmlist";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31626,7 +32426,7 @@ self: {
        pname = "cil";
        version = "0.1.1";
        sha256 = "0farjdyq6w33jm0qqdkfd6l7b8rr6k55dqfha643mj6nh1y904az";
-       buildDepends = [ base bytestring language-c ];
+       libraryHaskellDepends = [ base bytestring language-c ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "An interface to CIL";
@@ -31640,8 +32440,8 @@ self: {
        pname = "cinvoke";
        version = "0.1";
        sha256 = "0niz7banhrkcwdfp6w5gwy1brz1c26mylnlavi5zxgawfq4d3sl2";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ cinvoke ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ cinvoke ];
        homepage = "http://haskell.org/haskellwiki/Library/cinvoke";
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
@@ -31654,7 +32454,7 @@ self: {
        pname = "cio";
        version = "0.1.0";
        sha256 = "0518cbfyjh13ghihvnxvbhlw4060cqw5047bdrflphmigwbvpplb";
-       buildDepends = [ base monad-stm mtl parallel-io stm ];
+       libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
        homepage = "https://github.com/nikita-volkov/cio";
        description = "A monad for concurrent IO on a thread pool";
        license = stdenv.lib.licenses.mit;
@@ -31670,10 +32470,10 @@ self: {
        pname = "cipher-aes";
        version = "0.2.11";
        sha256 = "05ahz6kjq0fl1w66gpiqy0vndli5yx1pbsbw9ni3viwqas4p3cfk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -31690,7 +32490,9 @@ self: {
        sha256 = "0qknpgg7dimx2nm4bzig7vvzcq3kvbxjv5rb0s4f2ina4vwczbhq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cereal crypto-api tagged ];
+       libraryHaskellDepends = [
+         base bytestring cereal crypto-api tagged
+       ];
        homepage = "https://github.com/TomMD/cipher-aes128";
        description = "AES and common modes using AES-NI when available";
        license = stdenv.lib.licenses.bsd3;
@@ -31705,10 +32507,10 @@ self: {
        pname = "cipher-blowfish";
        version = "0.0.3";
        sha256 = "0hb67gmiyqrknynz5am8nada1b1v47rqla87dw5nvfhxhl51fhcg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -31726,10 +32528,10 @@ self: {
        pname = "cipher-camellia";
        version = "0.0.2";
        sha256 = "19z2mi1rvp8fsqjdbmrm1hdlxmx61yr55fyknmmn945qrlvx234d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -31747,10 +32549,10 @@ self: {
        pname = "cipher-des";
        version = "0.0.6";
        sha256 = "1isazxa2nr1y13y0danfk7wghy34rfpn3f43rw714nk2xk6vrwc5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -31768,8 +32570,10 @@ self: {
        pname = "cipher-rc4";
        version = "0.1.4";
        sha256 = "0k9qf0cn5yxc4qlqikcm5yyrnkkvr6g3v7306cp8iwz7r4dp6zn6";
-       buildDepends = [ base byteable bytestring crypto-cipher-types ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base byteable bytestring crypto-cipher-types
+       ];
+       testHaskellDepends = [
          base bytestring crypto-cipher-tests crypto-cipher-types QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -31784,7 +32588,7 @@ self: {
        pname = "cipher-rc5";
        version = "0.1.0.1";
        sha256 = "1ld4kdn0bd7ka448bl6df30iw3kd3mw7117qlwxyfzwbisdcsrif";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        jailbreak = true;
        homepage = "http://github.com/fegu/cipher-rc5";
        description = "Pure RC5 implementation";
@@ -31797,7 +32601,7 @@ self: {
        pname = "circ";
        version = "0.0.4";
        sha256 = "0n3m7kjyqic10dl06zic5qjb1yb1ff8jn9d1wchrarkprcw25knc";
-       buildDepends = [ base directory mtl ];
+       libraryHaskellDepends = [ base directory mtl ];
        description = "A Compiler IR Compiler";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31808,7 +32612,7 @@ self: {
        pname = "circle-packing";
        version = "0.1.0.4";
        sha256 = "1sysyzhkjb7z4mn9hgxqiq0nd7ap3rs7w22swjrpnf8l1sv09xgv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31819,7 +32623,7 @@ self: {
        pname = "cirru-parser";
        version = "0.0.2";
        sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz";
-       buildDepends = [ aeson base text vector ];
+       libraryHaskellDepends = [ aeson base text vector ];
        homepage = "https://github.com/Cirru/parser.hs";
        description = "Cirru Parser in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -31835,12 +32639,12 @@ self: {
        pname = "citation-resolve";
        version = "0.4.3";
        sha256 = "1x561l7shkz1nh43xh2nj83pb183rah1swi0ql9n0wr9ykq1mh1l";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring citeproc-hs containers curl data-default
          directory download-curl either lens mtl process safe text
          transformers yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath hspec MissingH QuickCheck
        ];
        homepage = "https://github.com/nushio3/citation-resolve";
@@ -31858,7 +32662,7 @@ self: {
        pname = "citeproc-hs";
        version = "0.3.10";
        sha256 = "1fb51v8hv8ik3a8grba2br6cfbj1b3y72lgjh4i75xh09i7xna0r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath hexpat hs-bibutils
          HTTP json mtl network network-uri old-locale pandoc-types parsec
          syb time utf8-string
@@ -31880,7 +32684,7 @@ self: {
        sha256 = "1kwsmwm0yxvqdxxr7x13hmq4nm8a9plmsfkwbvfp13bbd4mwcxnj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring citeproc-hs containers directory filepath mtl
          pandoc pandoc-types parsec tagsoup texmath utf8-string yaml
        ];
@@ -31898,8 +32702,8 @@ self: {
        pname = "cityhash";
        version = "0.3.0.1";
        sha256 = "1nr0sqrvnsjkgyhlw55mnr69s5ddxk9f0bbpwkigqc7m457vkxi6";
-       buildDepends = [ base bytestring largeword ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring largeword ];
+       testHaskellDepends = [
          base bytestring largeword QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -31916,10 +32720,10 @@ self: {
        pname = "cjk";
        version = "0.1.0.1";
        sha256 = "1r0rw33vqkhck0mfqz19plw9a71f56gdcjldrxl23178fps349vl";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers text text-icu
        ];
-       testDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/batterseapower/cjk";
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
@@ -31936,7 +32740,7 @@ self: {
        sha256 = "1ajah3ma4ms2y2kg4wkasjycsqz728n6chx1lm1r3xaiv17akya8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers dsp optparse-applicative plailude pretty-tree safe
          split
        ];
@@ -31949,7 +32753,7 @@ self: {
   "clafer" = callPackage
     ({ mkDerivation, aeson, array, base, bytestring, cmdargs
      , containers, data-stringmap, directory, doctest, executable-path
-     , filepath, ghc, HTTP, HUnit, json-builder, lens, lens-aeson, mtl
+     , filepath, HTTP, HUnit, json-builder, lens, lens-aeson, mtl
      , network, network-uri, parsec, process, QuickCheck, split
      , string-conversions, tasty, tasty-hunit, tasty-th, text
      , transformers
@@ -31960,14 +32764,17 @@ self: {
        sha256 = "1xnjvqwdp7679hr6jkl6xnsrdidw494p1xr8mlng6gybflm8v9gn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array base bytestring cmdargs containers data-stringmap
          directory executable-path filepath HTTP json-builder lens
          lens-aeson mtl network network-uri parsec process split
          string-conversions text transformers
        ];
-       testDepends = [
-         base containers data-stringmap directory doctest filepath ghc HUnit
+       executableHaskellDepends = [
+         base cmdargs containers filepath mtl process split
+       ];
+       testHaskellDepends = [
+         base containers data-stringmap directory doctest filepath HUnit
          lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th
        ];
        homepage = "http://clafer.org";
@@ -31988,12 +32795,16 @@ self: {
        sha256 = "01ilmmhz1wd142qpclk1b5nksm6cacr07pdj5cl5prfv7y04k9nw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base clafer cmdargs containers data-stringmap directory
+       libraryHaskellDepends = [
+         array base clafer containers data-stringmap directory
          executable-path filepath haskeline HaXml json-builder mtl parsec
          process string-conversions transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base clafer cmdargs containers directory executable-path filepath
+         haskeline mtl transformers
+       ];
+       testHaskellDepends = [
          array base clafer cmdargs directory filepath HUnit tasty
          tasty-hunit tasty-th transformers
        ];
@@ -32012,7 +32823,7 @@ self: {
        pname = "claferwiki";
        version = "0.4.0";
        sha256 = "1in0lzph5h7v9z9b974ibzh0rq7j343q474i9zfkylmdd1aivdyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clafer containers directory gitit MissingH mtl network
          network-uri process SHA split time transformers utf8-string
        ];
@@ -32030,7 +32841,9 @@ self: {
        sha256 = "0s94zxgcxq230y80kfqgim9yci3wqbq85byyvp0f0kqadsn4wmv1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory safe strict time ];
+       executableHaskellDepends = [
+         base bytestring directory safe strict time
+       ];
        jailbreak = true;
        description = "Command-line spaced-repetition software";
        license = stdenv.lib.licenses.mit;
@@ -32046,7 +32859,7 @@ self: {
        pname = "clash";
        version = "0.1.3.11";
        sha256 = "047dhg6y7yvp5vdarylry0q4l29a4x2dkjilk6j624lxcc17gyhx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-accessor data-accessor-template directory
          filepath ghc haskell98 pretty prettyclass template-haskell tfp
          th-lift time transformers utility-ht vhdl
@@ -32071,14 +32884,13 @@ self: {
        sha256 = "1lwc47b2iw2l7djga11gp4xdikb8gycqv4fxz1cxrf23xzkg5ggg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bifunctors bytestring clash-lib clash-prelude
          clash-systemverilog clash-verilog clash-vhdl containers directory
          filepath ghc ghc-typelits-natnormalise hashable haskeline lens mtl
          process text transformers unbound-generics unix
          unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
@@ -32096,7 +32908,7 @@ self: {
        pname = "clash-lib";
        version = "0.5.10";
        sha256 = "039j561r7kgrd5b7z55axgjniwm5yi5y1y0azps4ipmvjsvalbdl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
          pretty process template-haskell text time transformers
@@ -32116,11 +32928,11 @@ self: {
        pname = "clash-prelude";
        version = "0.9.2";
        sha256 = "1gl75mbqpv5g5dwg2c2vvqn36ydwhkcv7g6i8gjm41500dsrky0i";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base data-default ghc-prim ghc-typelits-natnormalise
          integer-gmp lens QuickCheck singletons template-haskell th-lift
        ];
-       testDepends = [ base doctest Glob ];
+       testHaskellDepends = [ base doctest Glob ];
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
@@ -32133,7 +32945,7 @@ self: {
        pname = "clash-prelude-quickcheck";
        version = "0.1.2.1";
        sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w";
-       buildDepends = [ base clash-prelude QuickCheck ];
+       libraryHaskellDepends = [ base clash-prelude QuickCheck ];
        jailbreak = true;
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
@@ -32148,7 +32960,7 @@ self: {
        pname = "clash-systemverilog";
        version = "0.5.7";
        sha256 = "0s8yqs4h5abamfrawfw95q9p0h8ni98pwyqr76nkvkrybxwykam5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
        ];
@@ -32166,7 +32978,7 @@ self: {
        pname = "clash-verilog";
        version = "0.5.7";
        sha256 = "04wa7y108hk2bn453dwrr1x71bvxx48hivdpqxsx0gyhya14143j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
        ];
@@ -32183,7 +32995,7 @@ self: {
        pname = "clash-vhdl";
        version = "0.5.8";
        sha256 = "08qplvnal8jjqy8rkivgn53n8qpzk232dslqxypx6ky6fks3bc0w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
        ];
@@ -32199,7 +33011,7 @@ self: {
        pname = "classify";
        version = "2013.11.6.1";
        sha256 = "03d4ygqhqbg4cvfjp8c5cyy0fkgf1fpzc1li45bqc555jrxwszwr";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Library for classification of media files";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -32212,7 +33024,7 @@ self: {
        pname = "classy-parallel";
        version = "0.1.0.0";
        sha256 = "0vfik37g2fwzc4p343hag5aidvi77396vfhfdx1207gahbzqf21v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control parallel resourcet transformers
        ];
        jailbreak = true;
@@ -32232,14 +33044,14 @@ self: {
        pname = "classy-prelude";
        version = "0.12.1.1";
        sha256 = "04rxmh4jzj4j5dx9i8ndh9ibn01cjdi485n1xvjngx0gs7zqa2k7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
          mono-traversable mtl mutable-containers primitive semigroups stm
          text time time-locale-compat transformers unordered-containers
          vector vector-instances
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec QuickCheck transformers unordered-containers
        ];
        homepage = "https://github.com/snoyberg/classy-prelude";
@@ -32256,11 +33068,11 @@ self: {
        pname = "classy-prelude-conduit";
        version = "0.12.0.1";
        sha256 = "1xv20i31f1za88kkdd00vin9shn9zxhqmwd0ln62cag4xfrmh9xi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring classy-prelude conduit conduit-combinators
          monad-control resourcet transformers void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit hspec QuickCheck transformers
        ];
        homepage = "https://github.com/snoyberg/classy-prelude";
@@ -32277,7 +33089,7 @@ self: {
        pname = "classy-prelude-yesod";
        version = "0.12.0.1";
        sha256 = "00pzlsbsdajzdlna1flrdd1lb98g0vx2b9757m8kfa37h6l443r2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base classy-prelude classy-prelude-conduit data-default
          http-conduit http-types persistent yesod yesod-newsfeed
          yesod-static
@@ -32294,11 +33106,11 @@ self: {
      mkDerivation {
        pname = "clay";
        version = "0.10.1";
-       revision = "1";
        sha256 = "0m0ajbgypn9ki741x2bmcmpmpkccazv76wh8b9gha9483cl21f1v";
+       revision = "1";
        editedCabalFile = "8ecb3c320c9470f2bf250552d7fac738520d90d28e8e90b11922d1c4940a0263";
-       buildDepends = [ base mtl text ];
-       testDepends = [
+       libraryHaskellDepends = [ base mtl text ];
+       testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit text
        ];
        homepage = "http://fvisser.nl/clay";
@@ -32322,7 +33134,7 @@ self: {
        pname = "clckwrks";
        version = "0.23.8";
        sha256 = "0inhxyjs12990mngfx2n3m107wxnamgi4gby5lnvai5nz913qgzd";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
          happstack-hsp happstack-jmacro happstack-server
@@ -32333,8 +33145,8 @@ self: {
          web-plugins web-routes web-routes-happstack web-routes-hsp
          web-routes-th xss-sanitize
        ];
-       buildTools = [ hsx2hs ];
-       extraLibraries = [ openssl ];
+       librarySystemDepends = [ openssl ];
+       libraryToolDepends = [ hsx2hs ];
        jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
@@ -32352,7 +33164,7 @@ self: {
        sha256 = "1dwvrxz2sjk61bbima9m70qv6gf4h4jx9yysmwnwpinmmqixwdi3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state base clckwrks haskeline mtl network parsec
        ];
        homepage = "http://www.clckwrks.com/";
@@ -32372,12 +33184,12 @@ self: {
        sha256 = "0f39ws919qy00090l002k3g8dkcldq7rwayf0wyxg8mfycrnb700";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base clckwrks clckwrks-plugin-media clckwrks-plugin-page
          clckwrks-theme-clckwrks containers happstack-server hsp mtl network
          text web-plugins
        ];
-       buildTools = [ hsx2hs ];
+       executableToolDepends = [ hsx2hs ];
        jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "clckwrks.com";
@@ -32397,14 +33209,14 @@ self: {
        pname = "clckwrks-plugin-bugs";
        version = "0.7.5";
        sha256 = "0la4ivk8sbh8wq1g2nhxx522ir2idffz5818bghjf8qffmqa47fv";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state attoparsec base cereal clckwrks clckwrks-plugin-page
          containers directory filepath happstack-authenticate happstack-hsp
          happstack-server hsp ixset mtl network network-uri reform
          reform-happstack reform-hsp safecopy text time web-plugins
          web-routes web-routes-th
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        jailbreak = true;
        homepage = "http://clckwrks.com/";
        description = "bug tracking plugin for clckwrks";
@@ -32423,13 +33235,13 @@ self: {
        pname = "clckwrks-plugin-ircbot";
        version = "0.6.14";
        sha256 = "1lrh2929ia6326vf9lyd5jy1a3nnavl8f27f9faw35871p1my1r2";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state attoparsec base blaze-html bytestring clckwrks
          containers directory filepath happstack-hsp happstack-server hsp
          ircbot ixset mtl network reform reform-happstack reform-hsp
          safecopy text web-plugins web-routes web-routes-th
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        homepage = "http://clckwrks.com/";
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32447,13 +33259,13 @@ self: {
        pname = "clckwrks-plugin-media";
        version = "0.6.13";
        sha256 = "0j6ijdq3n011h4d0gxxpjs35kwppp2kyjkg0bjcdw752ppk4y14w";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
          reform-happstack reform-hsp safecopy text web-plugins web-routes
          web-routes-th
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        homepage = "http://clckwrks.com/";
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32472,14 +33284,14 @@ self: {
        pname = "clckwrks-plugin-page";
        version = "0.4.0";
        sha256 = "0j82xzdgpy97s4xf6vx3an5ssbybcixhasmh0ca9bjmv9iqkjkws";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
          filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
          old-locale random reform reform-happstack reform-hsp safecopy
          tagsoup template-haskell text time time-locale-compat uuid
          web-plugins web-routes web-routes-happstack web-routes-th
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32494,11 +33306,11 @@ self: {
        pname = "clckwrks-theme-bootstrap";
        version = "0.4.0";
        sha256 = "08sdklr7nikngkdcls9dwy0ij4nqrb1n6dnkm3cw73iaifsl6klz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32513,7 +33325,7 @@ self: {
        pname = "clckwrks-theme-clckwrks";
        version = "0.5.0";
        sha256 = "06szqp7mcak7ra1pzxzmj8hzhm1lmdr7nwjkxk1h8bba5ipcjwhv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
          web-plugins
        ];
@@ -32529,7 +33341,7 @@ self: {
        pname = "clckwrks-theme-geo-bootstrap";
        version = "0.1.1";
        sha256 = "1qxik7hdz300n5lfb5xzh2md44b4xwwlr0c92y9x2na2xz41da7k";
-       buildDepends = [ base clckwrks hsp text ];
+       libraryHaskellDepends = [ base clckwrks hsp text ];
        jailbreak = true;
        homepage = "http://divshot.github.com/geo-bootstrap/";
        description = "geo bootstrap based template for clckwrks";
@@ -32542,10 +33354,10 @@ self: {
      mkDerivation {
        pname = "cld2";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd";
+       revision = "1";
        editedCabalFile = "60506ceb359329f803a733a06f9a6060a31cab7e86dd4a8e3fd843953cb4cfbd";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/dfoxfranke/haskell-cld2";
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
@@ -32560,7 +33372,9 @@ self: {
        sha256 = "0s894l3vjjkz94cvl5hv3vdpm934k7ila60kmr6acl7pvhppnc22";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cmdargs containers directory HSH IfElse ];
+       executableHaskellDepends = [
+         base cmdargs containers directory HSH IfElse
+       ];
        homepage = "https://github.com/ivanperez-keera/clean-home";
        description = "Keep your home dir clean by finding old conf files";
        license = stdenv.lib.licenses.bsd3;
@@ -32572,7 +33386,7 @@ self: {
        pname = "clean-unions";
        version = "0.1.1";
        sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/fumieval/clean-unions";
        description = "Open unions without need for Typeable";
        license = stdenv.lib.licenses.bsd3;
@@ -32588,7 +33402,7 @@ self: {
        sha256 = "16v2hj2qxw7ij8aqhbx11fs4ss62d4d0jwi4mk0kc76yfdwl61hg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base highlighting-kate optparse-applicative process terminfo
          wl-pprint-extras wl-pprint-terminfo
        ];
@@ -32606,7 +33420,8 @@ self: {
        sha256 = "0nnczd93j160747dc11z06ds81g938bw8lnqywg7mgylsfxalznl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec ];
+       libraryHaskellDepends = [ base containers mtl parsec ];
+       executableHaskellDepends = [ parsec ];
        homepage = "http://sandbox.pocoo.org/clevercss-hs/";
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
@@ -32621,7 +33436,7 @@ self: {
        sha256 = "0iychwxbmnlywv7b7fpxym0ybcbk0aba9p0pvg8brs6llz2qrn9x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/NicolasDP/hs-cli";
        description = "Simple Command Line Interface Library";
        license = stdenv.lib.licenses.bsd3;
@@ -32637,7 +33452,7 @@ self: {
        sha256 = "0ngvdq0i82qxwawqb5pqa3fscnyv1kxc3ifc3qijnn5v4py9ydd8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers GLFW Hipmunk MonadRandom mtl OpenGL random StateVar
          transformers
        ];
@@ -32658,11 +33473,12 @@ self: {
        sha256 = "08h0461ydhfymw2pya472n81kx5rqp7awfgxlbz2r851rl5kqmn9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cereal cipher-aes cprng-aes
          crypto-api crypto-random directory entropy setenv skein tagged
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base bytestring cereal containers hspec HUnit QuickCheck
          transformers
        ];
@@ -32684,13 +33500,18 @@ self: {
        sha256 = "00xxvwa60ihrd24267hzs5ssjm6nrli39qlh9gm4fkdnrzif9r4r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base cereal Chart Chart-cairo colour converge criterion
-         data-default-class data-ordlist deepseq derive gnuplot hspec lens
-         MemoTrie monoid-extras nats numeric-prelude permutation QuickCheck
-         reflection semigroupoids stream-fusion tagged vector
+       libraryHaskellDepends = [
+         base cereal converge criterion data-ordlist deepseq derive hspec
+         lens MemoTrie monoid-extras nats numeric-prelude permutation
+         QuickCheck reflection semigroupoids stream-fusion tagged vector
+       ];
+       executableHaskellDepends = [
+         base Chart Chart-cairo colour data-default-class gnuplot lens
+         numeric-prelude stream-fusion
+       ];
+       testHaskellDepends = [
+         base hspec nats numeric-prelude QuickCheck
        ];
-       testDepends = [ base hspec nats numeric-prelude QuickCheck ];
        jailbreak = true;
        homepage = "http://github.com/spacekitteh/haskell-clifford";
        description = "A Clifford algebra library";
@@ -32704,7 +33525,7 @@ self: {
        pname = "clippard";
        version = "0.1.1";
        sha256 = "0qhi727irlkvi4ygx5qvd6h1zzz22588lymi39s0gcjir473a538";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        jailbreak = true;
        homepage = "https://github.com/Raynes/clippard";
        description = "A simple Haskell library for copying text to the clipboard in a cross-platform way";
@@ -32717,7 +33538,7 @@ self: {
        pname = "clipper";
        version = "0.0.1";
        sha256 = "0s4n8d07190yarkxpa2kjphkm6lw2ljgwcix3x6m3lxcxrvc3nr0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chetant/clipper";
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
        license = stdenv.lib.licenses.bsd3;
@@ -32735,11 +33556,13 @@ self: {
        sha256 = "0dm0cpqcv8r66zlwq7myjv7klpp43lbcwdgxs2zkg6mbsb2f1qvr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bifunctors bytestring cassava data-default old-locale parsec
-         safecopy strptime time
+       libraryHaskellDepends = [
+         base bifunctors data-default old-locale parsec strptime time
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bifunctors bytestring cassava parsec safecopy
+       ];
+       testHaskellDepends = [
          assertions base data-default filepath old-locale parsec time
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
@@ -32753,7 +33576,7 @@ self: {
        pname = "clist";
        version = "0.1.0.0";
        sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd";
-       buildDepends = [ base base-unicode-symbols peano ];
+       libraryHaskellDepends = [ base base-unicode-symbols peano ];
        homepage = "https://github.com/strake/clist.hs";
        description = "Counted list";
        license = "unknown";
@@ -32765,8 +33588,8 @@ self: {
        pname = "clock";
        version = "0.5.1";
        sha256 = "1ncph7vi2q6ywwc8ysxl1ibw6i5dwfvln88ssfazk8jgpj4iyykw";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
@@ -32780,10 +33603,10 @@ self: {
        pname = "clocked";
        version = "0.4.1.3";
        sha256 = "1z9n4nisa73zlwch7arixg6633w3jmcqw5w97jf4p5559q874wi8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clock containers MonadCatchIO-transformers transformers
        ];
-       pkgconfigDepends = [ QtCore ];
+       libraryPkgconfigDepends = [ QtCore ];
        homepage = "http://patch-tag.com/r/shahn/clocked/home";
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.gpl3;
@@ -32798,7 +33621,7 @@ self: {
        pname = "clogparse";
        version = "0.2";
        sha256 = "17n5rwi64wjyv2xcxm86bawgmnpfrg7fjzwr9l3bj5jg0ggbyrbx";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring filepath text time timezone-olson
          timezone-series
        ];
@@ -32818,7 +33641,7 @@ self: {
        sha256 = "1mif1cqwpgp1wis7lplqrvv5aikdl0iv5ddazwgm6zgrxz645p09";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory github optparse-applicative process
          system-fileio system-filepath text transformers
        ];
@@ -32835,7 +33658,7 @@ self: {
        pname = "closure";
        version = "0.1.0.0";
        sha256 = "1z9clkwjpj01g258h8bldlc759vwsgdlyppn29sr11kyani1zjwf";
-       buildDepends = [ base hashable unordered-containers ];
+       libraryHaskellDepends = [ base hashable unordered-containers ];
        jailbreak = true;
        homepage = "http://github.com/tel/closure";
        description = "Depth- and breadth-first set closures";
@@ -32853,7 +33676,7 @@ self: {
        pname = "cloud-haskell";
        version = "0.2.0.0";
        sha256 = "11i2r7zf3vvywsfnlcsgvnh2qf92wgc81sfmhkhfpdrpcd2zx606";
-       buildDepends = [
+       libraryHaskellDepends = [
          distributed-process distributed-process-async
          distributed-process-client-server distributed-process-execution
          distributed-process-extras distributed-process-supervisor
@@ -32875,7 +33698,7 @@ self: {
        pname = "cloudfront-signer";
        version = "0.0.0.1";
        sha256 = "1ikjrlb421rxsj4c7dl4dw8a3kls43gzn4mapg1y9b2bkd7q6ywz";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-bytestring bytestring
          crypto-pubkey-types old-locale RSA time
        ];
@@ -32896,7 +33719,7 @@ self: {
        sha256 = "0jfv3830kg3yp1vqqs75bmiwflv4y8ya86q575bsw1l695dc5lwg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers convertible datetime filepath HFuse HTTP
          regex-base regex-tdfa tagsoup timerep unix
        ];
@@ -32914,7 +33737,7 @@ self: {
        sha256 = "08nishc8ngmvx0pdksn4z8a6l8vdgm3jiyz3w6d302pwp566z4q9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base curl mtl random tagsoup ];
+       executableHaskellDepends = [ base curl mtl random tagsoup ];
        homepage = "http://ui3.info/d/proj/cltw.html";
        description = "Command line Twitter utility";
        license = stdenv.lib.licenses.bsd3;
@@ -32930,7 +33753,7 @@ self: {
        sha256 = "0xzhpjsb9nf8xw7fa111n5gki46gz67aiyd2wr1k50pzyjrvl3vv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers haskell98 language-c pretty pretty-show
        ];
        homepage = "http://zwizwa.be/-/meta";
@@ -32945,7 +33768,7 @@ self: {
        pname = "cluss";
        version = "0.3";
        sha256 = "1q5km2f8zwnzcwnzj0khnszsgrb1x53zp0ryjwz2nfx9ajvh7zgg";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/Kinokkory/cluss";
        description = "simple alternative to type classes";
        license = stdenv.lib.licenses.bsd3;
@@ -32961,11 +33784,11 @@ self: {
        pname = "clustering";
        version = "0.2.1";
        sha256 = "1jxrgb13zm8bqcsx39fp31lrpna3y0pn7ckcf9q6gljz327c4y2h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers matrices mwc-random parallel primitive
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary hierarchical-clustering matrices mwc-random Rlang-QQ
          split tasty tasty-hunit tasty-quickcheck vector
        ];
@@ -32984,7 +33807,7 @@ self: {
        sha256 = "0in6fqzr1aki2dhbkv3vlmw17vla5m39g6msaplk4vix5yjw7vkq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bio bytestring containers QuickCheck regex-compat simpleargs
        ];
        homepage = "http://malde.org/~ketil/";
@@ -33001,9 +33824,11 @@ self: {
        pname = "clutterhs";
        version = "0.1";
        sha256 = "0mcl6pc0qjyijyqqlf1wh3548gn71kv6xy0jaqgrjddf20qlc8xl";
-       buildDepends = [ array base cairo glib gtk haskell98 mtl X11 ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ clutter pango ];
+       libraryHaskellDepends = [
+         array base cairo glib gtk haskell98 mtl X11
+       ];
+       libraryPkgconfigDepends = [ clutter pango ];
+       libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33017,8 +33842,8 @@ self: {
        pname = "cmaes";
        version = "0.2.2";
        sha256 = "060bmnkhbwrxhalfy5zxwjzbb6mp5ffj4r0qgkv6wp7bac2nnrp8";
-       buildDepends = [ base mtl process safe strict syb ];
-       testDepends = [
+       libraryHaskellDepends = [ base mtl process safe strict syb ];
+       testHaskellDepends = [
          base doctest doctest-prop mtl process random syb vector
        ];
        description = "CMA-ES wrapper in Haskell";
@@ -33032,8 +33857,8 @@ self: {
        pname = "cmark";
        version = "0.4.0.1";
        sha256 = "1kimba33r0f2ify0sxy7x9npqarb9xaw8hih1z6vvf1bkjsji0v3";
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base HUnit text ];
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
@@ -33045,7 +33870,7 @@ self: {
        pname = "cmath";
        version = "0.3";
        sha256 = "1hb92cgblmwp49lv0x0ib8g557mhjk6db7ihnim75ldii2f93dnm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~dons/code/cmath";
        description = "A binding to the standard C math library";
        license = stdenv.lib.licenses.bsd3;
@@ -33062,10 +33887,11 @@ self: {
        sha256 = "0mh6qzdlbfc1lfx7353p2qfa2j77xjlnnnnw3csmv125zha4y96d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array arrowapply-utils base Cabal containers filepath hxt monads-tf
-         parsec syb transformers url
+       libraryHaskellDepends = [
+         array arrowapply-utils base containers hxt monads-tf parsec syb
+         transformers url
        ];
+       executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33079,8 +33905,8 @@ self: {
        pname = "cmd-item";
        version = "0.0.1.0";
        sha256 = "1lawn0v32dn38xf3jaz70gks99llbq453zlf876pylinh5id7q62";
-       buildDepends = [ base containers templater text ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers templater text ];
+       testHaskellDepends = [
          base hspec hspec-laws HUnit QuickCheck quickcheck-instances text
        ];
        homepage = "https://github.com/geraud/cmd-item";
@@ -33098,7 +33924,7 @@ self: {
        sha256 = "0vmz7f0ssrqlp6wzmc0mjqj4qczfgk58g0lr0yz7jamamlgpq4b6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
        homepage = "http://community.haskell.org/~ndm/cmdargs/";
@@ -33116,7 +33942,7 @@ self: {
        sha256 = "1k0g2vh7sqkblzjsfvyhfiy1fcwkw0i10kgl4n2r68w7v52mmzd0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs directory filepath http-types process text
          transformers wai wai-handler-launch
        ];
@@ -33135,7 +33961,7 @@ self: {
        sha256 = "0mxk7yy3sglxc97my5lnphisg6fawifrbdbpz31h7ybiqccx4hsn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl split syb transformers ];
+       libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33149,11 +33975,11 @@ self: {
        pname = "cmdtheline";
        version = "0.2.3";
        sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath parsec pretty process
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filepath HUnit parsec pretty process
          test-framework test-framework-hunit transformers
        ];
@@ -33170,7 +33996,7 @@ self: {
        pname = "cml";
        version = "0.1.3";
        sha256 = "1hym074a8akzg3c96b1yczmdw5pgn4g0ahqxsxhg8d0kf8lzi5ph";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/cml/";
        description = "Events and Channels as in Concurrent ML";
        license = stdenv.lib.licenses.bsd3;
@@ -33182,7 +34008,7 @@ self: {
        pname = "cmonad";
        version = "0.1.1.1";
        sha256 = "07adwhpsmg3q4nhifjpdjv2dy1m08n0qkvlssmbl3b6gklvb82sk";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33196,7 +34022,8 @@ self: {
        sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
+       executableHaskellDepends = [ array base containers ];
        description = "Unification in a Commutative Monoid";
        license = "GPL";
      }) {};
@@ -33212,7 +34039,7 @@ self: {
        sha256 = "0nfqglz6szbi3s8xf5i87rnac7hc8cqfyrx2rs5ydb5i439s22b0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal array base binary bytestring containers directory fgl
          filepath HUnit mtl parsec pretty prettyclass process split
          stringtable-atom unix zlib
@@ -33230,10 +34057,10 @@ self: {
      mkDerivation {
        pname = "cndict";
        version = "0.6.1";
-       revision = "1";
        sha256 = "0pi0n1chwv6y3ch7dw2smrllwsdiy6r295lmmsnfnbprc8w6gksq";
+       revision = "1";
        editedCabalFile = "6371863e768d5b9d01f80b10783bb7ab4530e8e168d0c0bcc0fcee2a4f1aa468";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cassava containers file-embed text vector
        ];
        jailbreak = true;
@@ -33249,7 +34076,7 @@ self: {
        pname = "code-builder";
        version = "0.1.3";
        sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33263,11 +34090,11 @@ self: {
        pname = "codec";
        version = "0.1.1";
        sha256 = "0fkcbdas270gad7d3k40q96w68iwfb8jgi866x3dp4mf8wvsll9k";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary binary-bits bytestring data-default-class mtl
          template-haskell text transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base binary binary-bits bytestring data-default-class mtl
          template-haskell text transformers unordered-containers
        ];
@@ -33286,7 +34113,11 @@ self: {
        sha256 = "17v7adxs65jq74ngid0iywg3p5pq5j2p9mznqwj7i53238l3p60l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary binary-strict bytestring containers parsec
+         QuickCheck regex-compat
+       ];
+       executableHaskellDepends = [
          array base binary binary-strict bytestring containers parsec
          QuickCheck regex-compat
        ];
@@ -33301,7 +34132,7 @@ self: {
        pname = "codec-mbox";
        version = "0.2.0.0";
        sha256 = "0kbn76g6ly1pjd9higi0k0f26hplm0jhz85b23inn0bjli14n2cl";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "A library to read and write mailboxes in mbox format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33316,11 +34147,14 @@ self: {
        sha256 = "0y1vv9iayjvikjfp4y41m4gypybxd1lq3pv4154nvbjpfapmndsw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring cmdargs containers curl hpc safe split
+       ];
+       executableHaskellDepends = [
          aeson async base bytestring cmdargs containers curl hpc process
          regex-posix safe split
        ];
-       testDepends = [ base HUnit ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/codecov-haskell";
        description = "Codecov.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
@@ -33337,7 +34171,7 @@ self: {
        sha256 = "14jywd60mxbj5q1srxj4igs1ah0ddf8ww5k4n5d9g7cp1b1yv1mc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers directory filepath gtk haskell98 hinotify
          MissingH process regex-posix time
        ];
@@ -33352,10 +34186,10 @@ self: {
      mkDerivation {
        pname = "codepad";
        version = "0.1";
-       revision = "1";
        sha256 = "03jvbbv4cgrmk0ihz34shd1ydv5jhl1h1xiwqrln60622jlh8mr1";
+       revision = "1";
        editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a";
-       buildDepends = [ base curl mtl network tagsoup ];
+       libraryHaskellDepends = [ base curl mtl network tagsoup ];
        jailbreak = true;
        homepage = "http://github.com/chrisdone/codepad";
        description = "Submit and retrieve paste output from CodePad.org.";
@@ -33375,11 +34209,14 @@ self: {
        sha256 = "1jlrap3qhgnsgdmp0nb2hf3bbjlajp6p4z2q2rl70l93v0v9xi02";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal containers cryptohash directory either
          filepath hackage-db http-client lens machines machines-directory
-         MissingH monad-loops network process tar text transformers wreq
-         yaml zlib
+         process tar text transformers wreq yaml zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory either filepath hackage-db MissingH
+         monad-loops network wreq yaml
        ];
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
@@ -33394,7 +34231,7 @@ self: {
        pname = "codo-notation";
        version = "0.5.2";
        sha256 = "1bwfjg0bzph0vka1rx8m6f505l9dmj8nn6al9kmjkva18l05gsvq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad haskell-src-meta parsec template-haskell uniplate
        ];
        description = "A notation for comonads, analogous to the do-notation for monads";
@@ -33407,7 +34244,7 @@ self: {
        pname = "cofunctor";
        version = "0.1.0.1";
        sha256 = "0xn4k1c7l9z3g0slbwvlfg9kpfq8jbk0qf9363qz7azv7ks1149p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "DEPRECATED: use the \"contravariant\" package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33424,12 +34261,16 @@ self: {
        sha256 = "00bq5qad7x8x0fac1gb8aq97zm4pylnk7n9bg4nkhyyvwnmjsy5l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring collections-api comonad-transformers
          containers data-lens data-lens-fd data-lens-template deepseq
          ghc-prim mtl primitive QuickCheck stm tagged template-haskell
          transformers
        ];
+       executableHaskellDepends = [
+         base bytestring containers mtl QuickCheck template-haskell
+         transformers
+       ];
        homepage = "https://github.com/Cognimeta/cognimeta-utils";
        description = "Utilities for Cognimeta products (such as perdure). API may change often.";
        license = "unknown";
@@ -33451,14 +34292,18 @@ self: {
        sha256 = "0mh95pfzdvfqy1frwsqi9fi1wgs1nk1xkzijh1pyjm2paqxzynn2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring byteable bytestring
          conduit conduit-extra cryptohash deepseq exceptions hashable
-         http-client http-client-tls http-conduit http-types mtl network
-         old-locale resourcet scientific text time transformers
-         transformers-base uuid uuid-aeson vector websockets wuss
+         http-conduit http-types mtl network old-locale resourcet scientific
+         text time transformers-base uuid uuid-aeson vector websockets wuss
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring conduit conduit-extra http-client
+         http-client-tls http-conduit network old-locale resourcet
+         scientific text time transformers uuid websockets wuss
+       ];
+       testHaskellDepends = [
          base bytestring http-client-tls http-conduit old-locale tasty
          tasty-hunit tasty-quickcheck tasty-th time transformers uuid
        ];
@@ -33478,7 +34323,11 @@ self: {
        sha256 = "16inmr2hp2racg85crrpwd45p1wgjhcp7w242nixc8dlwdy1lkz3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal cmdargs containers fclabels ghc-prim
+         ListZipper monad-atom mtl nlp-scores split swift-lda text vector
+       ];
+       executableHaskellDepends = [
          base bytestring cereal cmdargs containers fclabels ghc-prim
          ListZipper monad-atom mtl nlp-scores split swift-lda text vector
        ];
@@ -33498,7 +34347,7 @@ self: {
        pname = "colchis";
        version = "0.2.0.3";
        sha256 = "1fhamxm740r59q0sazs2np1b8hv74dhhbb4ah73m94im96729rbb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base conceit network network-simple pipes pipes-aeson
          pipes-attoparsec pipes-network text transformers
        ];
@@ -33517,7 +34366,7 @@ self: {
        sha256 = "1k6k2ljz9x06j0nrpbbpcgd3axamf3cgr6jyslam0xkgxzsi7w7x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base collada-types containers SVGPath time vector xml
        ];
        jailbreak = true;
@@ -33534,7 +34383,7 @@ self: {
        pname = "collada-types";
        version = "0.3";
        sha256 = "0aw1y3ylcnpj3wwh6w8168a4mmkiayav6swyh2fq3vfjlds91xc8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers enumerable OpenGL tuple tuple-gen vector
        ];
        jailbreak = true;
@@ -33551,7 +34400,7 @@ self: {
        sha256 = "02r4cz92wjm3hcih8jf5jvimw3ijwbp4x7iw90rkj05360ajikj7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/mwotton/collapse";
        description = "utility for collapsing adjacent writes";
@@ -33564,7 +34413,7 @@ self: {
        pname = "collection-json";
        version = "0.1.0.0";
        sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc";
-       buildDepends = [ aeson base bytestring text ];
+       libraryHaskellDepends = [ aeson base bytestring text ];
        jailbreak = true;
        homepage = "https://github.com/danchoi/collection-json.hs";
        description = "Collection+JSON hypermedia type tools";
@@ -33577,7 +34426,9 @@ self: {
        pname = "collections";
        version = "0.3.1.1";
        sha256 = "0a5km8k2jwjv4gfd2vf0jiq3f9cw47dgz8f3lspmpx2b0g2pac7g";
-       buildDepends = [ array base bytestring containers QuickCheck ];
+       libraryHaskellDepends = [
+         array base bytestring containers QuickCheck
+       ];
        jailbreak = true;
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
@@ -33590,7 +34441,7 @@ self: {
        pname = "collections-api";
        version = "1.0.0.0";
        sha256 = "0vgw1spiv6wnk11j3y45d95r3axgr1sgksb5lilnxdjj2pn4gp5l";
-       buildDepends = [ array base QuickCheck ];
+       libraryHaskellDepends = [ array base QuickCheck ];
        homepage = "http://code.haskell.org/collections/";
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -33605,7 +34456,7 @@ self: {
        pname = "collections-base-instances";
        version = "1.0.0.0";
        sha256 = "0nw6wpzqsj33pnffsflc6ipjcx6lknzdnxgn4rm3vhrl5y9rgpzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring collections-api containers
        ];
        homepage = "http://code.haskell.org/collections/";
@@ -33620,7 +34471,7 @@ self: {
        pname = "colock";
        version = "0.2.2";
        sha256 = "0h3y5c3c3711k2glmnydc1rlz9ff73iibcc8vf0zjzvvw9rz0xb1";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "thread-friendly file locks that don't block the entire program";
        license = "LGPL";
      }) {};
@@ -33633,7 +34484,8 @@ self: {
        sha256 = "1v4spa6vw9igjpd1dr595z5raz5fr8f485q5w9imrv8spms46xh3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base haskell-lexer ];
+       libraryHaskellDepends = [ ansi-terminal base haskell-lexer ];
+       executableHaskellDepends = [ ansi-terminal base haskell-lexer ];
        homepage = "http://github.com/yav/colorize-haskell";
        description = "Highligt Haskell source";
        license = stdenv.lib.licenses.bsd3;
@@ -33644,10 +34496,10 @@ self: {
      mkDerivation {
        pname = "colors";
        version = "0.3.0.2";
-       revision = "1";
        sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm";
+       revision = "1";
        editedCabalFile = "b49946d81e0089d4d80191523839f934802975ede3b9fd9521ead9e591142560";
-       buildDepends = [ base lens linear profunctors ];
+       libraryHaskellDepends = [ base lens linear profunctors ];
        homepage = "https://github.com/fumieval/colors";
        description = "A type for colors";
        license = stdenv.lib.licenses.bsd3;
@@ -33659,7 +34511,7 @@ self: {
        pname = "colour";
        version = "2.3.3";
        sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/haskellwiki/Colour";
        description = "A model for human colour/color perception";
        license = stdenv.lib.licenses.mit;
@@ -33673,7 +34525,7 @@ self: {
        pname = "coltrane";
        version = "0.1.0.0";
        sha256 = "131arfizyniapjvc9ds6l90z7gig98imhm17k1vza5wvgjqbb5fa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HTTP http-types HUnit mtl regex-compat text wai
          wai-extra warp
        ];
@@ -33701,7 +34553,9 @@ self: {
        pname = "combinat";
        version = "0.2.7.0";
        sha256 = "1rch5pk0sggmdr2wmqys5i5p1cjyqdymrngjf8a2721q6nycfjjz";
-       buildDepends = [ array base containers random transformers ];
+       libraryHaskellDepends = [
+         array base containers random transformers
+       ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Generation of various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
@@ -33716,7 +34570,7 @@ self: {
        pname = "combinat-diagrams";
        version = "0.1";
        sha256 = "1m7b0qf583jgi65vg6lxvypvjal74p83iir03ma7cfrgw5s5mw2q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base colour combinat containers diagrams-core diagrams-lib
          transformers vector-space
        ];
@@ -33736,7 +34590,10 @@ self: {
        sha256 = "0yxdy413pj6ah4d5qcpajbphfg02p0gxgs1x9salfa18fyflljc4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base lens template-haskell th-lift trifecta void
+       ];
+       executableHaskellDepends = [
          base bytestring cereal containers directory lens mtl
          template-haskell th-lift trifecta void
        ];
@@ -33755,7 +34612,7 @@ self: {
        pname = "combinatorial-problems";
        version = "0.0.5";
        sha256 = "1k3isi62i66xbisn48b018w7fcfhwwng1f64ca530qkk600fg850";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-lexing containers parsec random
        ];
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellCombinatorialProblems";
@@ -33770,7 +34627,7 @@ self: {
        pname = "combinatorics";
        version = "0.1.0";
        sha256 = "101b3lycfav6wqdqjhs0v93vgy4g3pfn5xyimip0x3alq0q2ix9a";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Efficient computation of common combinatoric functions";
        license = stdenv.lib.licenses.bsd3;
@@ -33784,7 +34641,7 @@ self: {
        pname = "combobuffer";
        version = "0.2";
        sha256 = "1zsdi9c9my6nrxpqqsy584swp4zg8lckrymfig1ywisbdfzb8rjh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers template-haskell vector vector-space
        ];
        jailbreak = true;
@@ -33799,7 +34656,7 @@ self: {
        pname = "command";
        version = "0.1.1";
        sha256 = "0qj6i5r1iz3d8visqpd74xwkribxzs4p66b1vgp0i3jiqgfrn2hw";
-       buildDepends = [ base deepseq process ];
+       libraryHaskellDepends = [ base deepseq process ];
        homepage = "https://github.com/nh2/command";
        description = "Conveniently run shell commands";
        license = stdenv.lib.licenses.bsd3;
@@ -33813,8 +34670,8 @@ self: {
        pname = "command-qq";
        version = "0.3.0.0";
        sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5";
-       buildDepends = [ base process template-haskell text ];
-       testDepends = [ base doctest hspec template-haskell text ];
+       libraryHaskellDepends = [ base process template-haskell text ];
+       testHaskellDepends = [ base doctest hspec template-haskell text ];
        homepage = "http://biegunka.github.io/command-qq/";
        description = "Quasiquoters for external commands";
        license = stdenv.lib.licenses.bsd3;
@@ -33830,11 +34687,11 @@ self: {
        pname = "commodities";
        version = "0.2.0";
        sha256 = "0xf2vp7wb3qkxkrcwhcqpqfzg9345ws890rkmibvcd21jnczhg89";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers distributive keys lens linear mtl numbers
          PSQueue semigroupoids semigroups text thyme transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory doctest filepath hspec hspec-expectations
          lens QuickCheck semigroups thyme transformers
        ];
@@ -33852,7 +34709,7 @@ self: {
        pname = "commsec";
        version = "0.3.5";
        sha256 = "1lshp876qm29370mpa3bh0gijcv317sf1y8vajixzz1083bkpngm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cipher-aes128 crypto-api network
        ];
        description = "Provide communications security using symmetric ephemeral keys";
@@ -33869,7 +34726,7 @@ self: {
        pname = "commsec-keyexchange";
        version = "0.3.3";
        sha256 = "1c207fv429frkyb742n0r1z0kkvlwnkcxblfkrjm1lwqfkdx0prn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cipher-aes128 commsec crypto-api
          crypto-pubkey-types cryptohash-cryptoapi DRBG monadcryptorandom
          network RSA
@@ -33889,11 +34746,11 @@ self: {
        pname = "comonad";
        version = "4.2.7.2";
        sha256 = "0arvbaxgkawzdp38hh53akkahjg2aa3kj2b4ns0ni8a5ylg2cqmp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers contravariant distributive semigroups tagged
          transformers transformers-compat
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/comonad/";
        description = "Comonads";
        license = stdenv.lib.licenses.bsd3;
@@ -33907,7 +34764,7 @@ self: {
        pname = "comonad-extras";
        version = "4.0";
        sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad containers distributive semigroupoids
          transformers
        ];
@@ -33924,7 +34781,7 @@ self: {
        pname = "comonad-random";
        version = "0.1.2";
        sha256 = "11jak28rpnnaswrlf2wgn91v096zkz1laq2cdhjfc7abgmkx9gay";
-       buildDepends = [ base category-extras random ];
+       libraryHaskellDepends = [ base category-extras random ];
        jailbreak = true;
        description = "Comonadic interface for random values";
        license = "unknown";
@@ -33937,7 +34794,7 @@ self: {
        pname = "comonad-transformers";
        version = "4.0";
        sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z";
-       buildDepends = [ base comonad ];
+       libraryHaskellDepends = [ base comonad ];
        homepage = "http://github.com/ekmett/comonad-transformers/";
        description = "This package has been merged into comonad 4.0";
        license = stdenv.lib.licenses.bsd3;
@@ -33949,7 +34806,7 @@ self: {
        pname = "comonads-fd";
        version = "4.0";
        sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s";
-       buildDepends = [ base comonad ];
+       libraryHaskellDepends = [ base comonad ];
        homepage = "http://github.com/ekmett/comonads-fd/";
        description = "This package has been merged into comonad 4.0";
        license = stdenv.lib.licenses.bsd3;
@@ -33961,7 +34818,9 @@ self: {
        pname = "compact-map";
        version = "2008.11.9";
        sha256 = "0rk2g5swblbbairwabv5azp6a7cjqywhv49prm1rz8mc361dd9by";
-       buildDepends = [ array base binary bytestring containers ];
+       libraryHaskellDepends = [
+         array base binary bytestring containers
+       ];
        description = "Compact Data.Map implementation using Data.Binary";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33973,7 +34832,7 @@ self: {
        pname = "compact-string";
        version = "0.3.1";
        sha256 = "02lqxl82jmw276mzxwsc0gmps1kb5i62im85bpjvzqwycbf3gnj8";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -33986,7 +34845,7 @@ self: {
        pname = "compact-string-fix";
        version = "0.3.2";
        sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
        license = stdenv.lib.licenses.bsd3;
@@ -33998,7 +34857,7 @@ self: {
        pname = "compare-type";
        version = "0.1.1";
        sha256 = "1s6p3ni8pqxbp08ci4w6y646wrh60s0g34figrwdcqrywscyicsb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Kinokkory/compare-type";
        description = "compare types of any kinds in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -34013,14 +34872,14 @@ self: {
      mkDerivation {
        pname = "compdata";
        version = "0.10";
-       revision = "1";
        sha256 = "1538jdaww57vil32hvd6s13lfiwkczpjgym07ipwccw06cj49l8h";
+       revision = "1";
        editedCabalFile = "09ef1d8f84ae93c4f212661d411542155b0da1c8202e8bf10bfc18d69001a82e";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq derive mtl QuickCheck template-haskell
          th-expand-syns transformers tree-view
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq derive HUnit mtl QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-expand-syns transformers
@@ -34034,10 +34893,10 @@ self: {
      mkDerivation {
        pname = "compdata-automata";
        version = "0.9";
-       revision = "1";
        sha256 = "1hlv6a4ywlnr86pzrlffqbg55mfkrkkxn2yir6a28bdirgi69fkf";
+       revision = "1";
        editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130";
-       buildDepends = [ base compdata containers projection ];
+       libraryHaskellDepends = [ base compdata containers projection ];
        jailbreak = true;
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
@@ -34052,10 +34911,10 @@ self: {
        pname = "compdata-dags";
        version = "0.2";
        sha256 = "0z5vjfm0c4bcixnh951mzc06977l3lcs0v8mz6pbn65qbvv0d27c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base compdata containers mtl unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base compdata containers HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
          unordered-containers vector
@@ -34074,8 +34933,10 @@ self: {
        pname = "compdata-param";
        version = "0.9";
        sha256 = "1b7kdg4g1mqpzy10wdxm90mbjfwmfpprkbb52ba9qbcg7scap4i4";
-       buildDepends = [ base compdata mtl template-haskell transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base compdata mtl template-haskell transformers
+       ];
+       testHaskellDepends = [
          base compdata containers HUnit mtl template-haskell test-framework
          test-framework-hunit transformers
        ];
@@ -34093,12 +34954,12 @@ self: {
        pname = "compensated";
        version = "0.6.1";
        sha256 = "026gq3ppk3id4bvkn3pdg6ljbl14gd8p4hg6i0rc13138b0mlxnh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq distributive
          generic-deriving hashable lens log-domain safecopy semigroupoids
          semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
@@ -34114,7 +34975,7 @@ self: {
        pname = "competition";
        version = "0.2.0.0";
        sha256 = "07c6b6yai8x9i8qndimzmyp5bzhwckis8kg207n152gnskk7i3zn";
-       buildDepends = [ base filepath parsec ];
+       libraryHaskellDepends = [ base filepath parsec ];
        jailbreak = true;
        homepage = "github.com/yanatan16/haskell-competition";
        description = "Helpers and runners for code competitions";
@@ -34127,7 +34988,7 @@ self: {
        pname = "compilation";
        version = "0.0.0.3";
        sha256 = "0a1pp1jafra1agsx2jizdb33afzg02w6jh4a4pyw5w71kzqfrril";
-       buildDepends = [ base MissingH ];
+       libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34139,7 +35000,7 @@ self: {
        pname = "complex-generic";
        version = "0.1.1";
        sha256 = "15lqcwg3jp1whf086mlx9f5jv6sbkn53jrilhapalgcgs07nf8ll";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://gitorious.org/complex-generic";
        description = "complex numbers with non-mandatory RealFloat";
        license = stdenv.lib.licenses.bsd3;
@@ -34151,7 +35012,7 @@ self: {
        pname = "complex-integrate";
        version = "1.0.0";
        sha256 = "0q0ffpqir4f2ch7d7p2fxgb73n7dg7xf19rg78an7i7zdl430cfj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/hijarian/complex-integrate";
        description = "A simple integration function to integrate a complex-valued complex functions";
        license = stdenv.lib.licenses.publicDomain;
@@ -34165,7 +35026,7 @@ self: {
        pname = "complexity";
        version = "0.1.3";
        sha256 = "16crk93qyh0arcgqq2bx0i61cah2yhm8wwdr6sasma8y5hlw76lj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Chart colour data-accessor hstats parallel pretty time
          transformers
        ];
@@ -34181,7 +35042,7 @@ self: {
        pname = "compose-trans";
        version = "0.1";
        sha256 = "0p2fd0knfbfjk4s0aalzrsrzpxffrykmaprxyakbgs1lmp4jyq9z";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34203,7 +35064,7 @@ self: {
        pname = "composition-extra";
        version = "1.1.0";
        sha256 = "1mkm0m08g9q6d8vfz33kj5lz0gnwlkmsnj4r5ar4p3slf2kaybz1";
-       buildDepends = [ base contravariant ];
+       libraryHaskellDepends = [ base contravariant ];
        description = "Combinators for unorthodox structure composition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34216,10 +35077,10 @@ self: {
      mkDerivation {
        pname = "compressed";
        version = "3.10";
-       revision = "1";
        sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw";
+       revision = "1";
        editedCabalFile = "0ab968cb9d6a6da40cb91befc6051d91b77039f8f64442eecf7a61bd508f61bb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers fingertree hashable keys pointed reducers
          semigroupoids semigroups unordered-containers
        ];
@@ -34234,7 +35095,7 @@ self: {
        pname = "compression";
        version = "0.1";
        sha256 = "0cy7851i7dvn5aphg649jr3wmw9x57s29adk7qv0mvwz99fb4cpr";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://urchin.earth.li/~ian/cabal/compression/";
        description = "Common compression algorithms";
        license = "unknown";
@@ -34249,7 +35110,7 @@ self: {
        pname = "compstrat";
        version = "0.1.0.2";
        sha256 = "1jdxvyqkszwkry3vly65nh80519cpfw4ghzg1lsbnhyrbhvlchkg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base compdata mtl template-haskell th-expand-syns transformers
        ];
        jailbreak = true;
@@ -34267,7 +35128,7 @@ self: {
        pname = "comptrans";
        version = "0.1.0.5";
        sha256 = "05r07900bniy1gazvgj3wj4g07j33h493885bhh7gq1n1xilqgkm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base compdata containers deepseq deepseq-generics ghc-prim lens
          template-haskell th-expand-syns
        ];
@@ -34286,7 +35147,7 @@ self: {
        pname = "computational-algebra";
        version = "0.3.0.0";
        sha256 = "09ljbspgwpg4g0fca8j10qmbc7194cjhv0l6svz2qr6zzhmb3l4x";
-       buildDepends = [
+       libraryHaskellDepends = [
          algebra base containers equational-reasoning heaps lens monad-loops
          monomorphic peggy singletons sized-vector tagged type-natural
        ];
@@ -34303,7 +35164,7 @@ self: {
        pname = "computations";
        version = "0.0.0.0";
        sha256 = "1kyg3dmgq5z0217rxgljs3x7x3xvcdly2aqj2ky4h4kbw1h0r260";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/computations";
        description = "Advanced notions of computation";
        license = stdenv.lib.licenses.bsd3;
@@ -34315,7 +35176,7 @@ self: {
        pname = "concatenative";
        version = "1.0.1";
        sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty";
        description = "A library for postfix control flow";
        license = stdenv.lib.licenses.bsd3;
@@ -34329,7 +35190,7 @@ self: {
        pname = "conceit";
        version = "0.3.2.0";
        sha256 = "16pj90dnjn5v16ym2gglx895c9lc5qhrry4wydqyn4f0j7rm6drg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors exceptions mtl semigroupoids transformers void
        ];
        description = "Concurrent actions that may fail";
@@ -34342,7 +35203,7 @@ self: {
        pname = "concorde";
        version = "0.1";
        sha256 = "0903lrj6bzajjdr01hbld1jm6vf7assn84hqk4kgrrs1mr3ykc20";
-       buildDepends = [ base containers process safe temporary ];
+       libraryHaskellDepends = [ base containers process safe temporary ];
        description = "Simple interface to the Concorde solver for the Traveling Salesperson Problem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34360,7 +35221,7 @@ self: {
        sha256 = "17q7mhf0n9pnxhvwk3yy61ljfifz8nhld1xhhnn13fldq34663q3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array base binary bytestring cmdargs comonad containers
          crf-chain1-constrained crf-chain2-tiers data-lens lazy-io
          monad-codec monad-ox sgd tagset-positional temporary text
@@ -34384,11 +35245,11 @@ self: {
        sha256 = "0q2l2yqxk210ycw1alcps9x7l2f60g9sb0wan7d1d2fkbfhq3z41";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base binary bytestring cmdargs concraft containers
-         double-conversion lazy-io moan network sgd split tagset-positional
-         text
+       libraryHaskellDepends = [
+         aeson base binary bytestring concraft containers double-conversion
+         lazy-io moan network sgd split tagset-positional text
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "https://github.com/vjeranc/concraft-hr";
        description = "Part-of-speech tagger for Croatian";
@@ -34407,10 +35268,11 @@ self: {
        sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base binary bytestring cmdargs concraft containers lazy-io
-         mtl network process sgd split tagset-positional text transformers
+       libraryHaskellDepends = [
+         aeson base binary bytestring concraft containers lazy-io mtl
+         network process sgd split tagset-positional text transformers
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological tagger for Polish";
@@ -34428,7 +35290,7 @@ self: {
        sha256 = "1w4bg284fcnd15yg7097d8sh0rzxr76zlrr1bfj2dksw8ddy3jda";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers hxt hxt-charproperties hxt-curl hxt-relaxng
          hxt-tagsoup
        ];
@@ -34443,11 +35305,11 @@ self: {
      mkDerivation {
        pname = "concrete-typerep";
        version = "0.1.0.2";
-       revision = "1";
        sha256 = "07wy8drg4723zdy2172jrcvd5ir2c4ggcfz1n33jhm9iv3cl2app";
+       revision = "1";
        editedCabalFile = "cdcd034ff6ff0e8cf9313f312294e12494f3f021c4bf562b9c1365b91715ff4e";
-       buildDepends = [ base binary hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary hashable ];
+       testHaskellDepends = [
          base binary hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -34463,7 +35325,7 @@ self: {
        pname = "concurrent-barrier";
        version = "0.1.2";
        sha256 = "13idx7w5k8rk3qqls3yn9xqwk116xsqb36ya3vxkb5x4q4vix3mv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jsgf/concurrent-barrier";
        description = "Simple thread barriers";
        license = stdenv.lib.licenses.bsd3;
@@ -34479,11 +35341,15 @@ self: {
        sha256 = "0awba7ar4iky211psq5d44snd5j75ddvl6klalriic4i5w41dhv2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array async base bytestring containers dns hashable iproute network
          stm time
        ];
-       testDepends = [ async base dns hspec ];
+       executableHaskellDepends = [
+         array async base bytestring containers dns hashable iproute network
+         stm time
+       ];
+       testHaskellDepends = [ async base dns hspec ];
        description = "Concurrent DNS cache";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34496,8 +35362,8 @@ self: {
        pname = "concurrent-extra";
        version = "0.7.0.9";
        sha256 = "19bqm0brnbhhmp5nypi995p27mna7kd33xzw0kf7yx2w2p2kb1aw";
-       buildDepends = [ base stm unbounded-delays ];
-       testDepends = [
+       libraryHaskellDepends = [ base stm unbounded-delays ];
+       testHaskellDepends = [
          async base HUnit random stm test-framework test-framework-hunit
          unbounded-delays
        ];
@@ -34515,11 +35381,11 @@ self: {
        pname = "concurrent-machines";
        version = "0.1.0.0";
        sha256 = "1rlxb9cjzjfzj3xj3m6cab3h6pqazi850lkglc6palamn6yd2vw4";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base machines tasty tasty-hunit time transformers
        ];
        description = "Concurrent networked stream transducers";
@@ -34532,7 +35398,7 @@ self: {
        pname = "concurrent-sa";
        version = "1.0.1";
        sha256 = "1szvw0vih5jx2hvgb3h7mqh05im3pw687h7dshiy4ii5vs9pi6d6";
-       buildDepends = [ base MonadRandom ];
+       libraryHaskellDepends = [ base MonadRandom ];
        description = "Concurrent simulated annealing system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34543,7 +35409,7 @@ self: {
        pname = "concurrent-split";
        version = "0.0.0.1";
        sha256 = "0xriw08w70dj4gji4afa034q9vcgwymjw2j6gx1x7fwdpi04lzsb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "MVars and Channels with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34556,7 +35422,7 @@ self: {
        sha256 = "0b9lndzqm451j9wv2694gjd9w9j2vmhp32j57fqnq43pq8a1h1z6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base exceptions mtl stm transformers ];
+       libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/concurrent-state";
        description = "MTL-like library using TVars";
@@ -34570,8 +35436,8 @@ self: {
        pname = "concurrent-supply";
        version = "0.1.7.1";
        sha256 = "050d1k4hvjjyap3w8spcx57lagnh77z131jbgsndpc9mjx8r4l5y";
-       buildDepends = [ base ghc-prim hashable ];
-       testDepends = [ base containers ];
+       libraryHaskellDepends = [ base ghc-prim hashable ];
+       testHaskellDepends = [ base containers ];
        homepage = "http://github.com/ekmett/concurrent-supply/";
        description = "A fast concurrent unique identifier supply with a pure API";
        license = stdenv.lib.licenses.bsd3;
@@ -34583,7 +35449,7 @@ self: {
        pname = "concurrentoutput";
        version = "0.2.0.2";
        sha256 = "0fd372awmxrngbcb2phyzy3az9j2327kdhjnm7c5mm808vix67a8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Ungarble output from several threads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34594,7 +35460,7 @@ self: {
        pname = "cond";
        version = "0.4.1.1";
        sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kallisti-dev/cond";
        description = "Basic conditional and boolean operators with monadic variants";
        license = stdenv.lib.licenses.bsd3;
@@ -34610,10 +35476,11 @@ self: {
        sha256 = "0ahikfb6h2clkx3pi6a7gyp39jhv2am98vyyaknyd1nvfvxl96x7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base binary containers glider-nlp text ];
+       executableHaskellDepends = [
          base binary containers directory filepath glider-nlp text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary Cabal containers glider-nlp HUnit text
        ];
        jailbreak = true;
@@ -34629,7 +35496,7 @@ self: {
        pname = "condorcet";
        version = "0.0.1";
        sha256 = "1raf8mrnfnn90ymcnyhqf1kzb9mpfsk83qlmajibjd8n94iq76nd";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://neugierig.org/software/darcs/condorcet";
        description = "Library for Condorcet voting";
        license = stdenv.lib.licenses.bsd3;
@@ -34642,7 +35509,7 @@ self: {
        pname = "conductive-base";
        version = "0.3";
        sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp";
-       buildDepends = [ array base containers random stm time ];
+       libraryHaskellDepends = [ array base containers random stm time ];
        homepage = "http://www.renickbell.net/doku.php?id=conductive-base";
        description = "a library for live coding and real-time musical applications";
        license = stdenv.lib.licenses.gpl3;
@@ -34668,7 +35535,7 @@ self: {
        pname = "conductive-hsc3";
        version = "0.3.1";
        sha256 = "1z037753mxkfqbqqrlkpg5a6z9afpjj16bfplsmbbx3r3vrxbkpa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conductive-base conductive-song containers directory filepath
          hosc hsc3 random
        ];
@@ -34685,7 +35552,7 @@ self: {
        pname = "conductive-song";
        version = "0.2";
        sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi";
-       buildDepends = [ base conductive-base random ];
+       libraryHaskellDepends = [ base conductive-base random ];
        homepage = "http://www.renickbell.net/doku.php?id=conductive-song";
        description = "a library of functions which are useful for composing music";
        license = stdenv.lib.licenses.gpl3;
@@ -34700,11 +35567,11 @@ self: {
        pname = "conduit";
        version = "1.2.4.1";
        sha256 = "0g5rdcj0xbiz3x2pkmhwm67r9f0yncpnssv32s7k0w7qld46wri6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck resourcet safe
          transformers void
        ];
@@ -34722,11 +35589,11 @@ self: {
        pname = "conduit";
        version = "1.2.5";
        sha256 = "0iia5hc3rx813aayp839ixr377ajnrhfvpbjach266bk52scs05i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck resourcet safe
          transformers void
        ];
@@ -34740,10 +35607,10 @@ self: {
      mkDerivation {
        pname = "conduit-audio";
        version = "0.1";
-       revision = "1";
        sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb";
+       revision = "1";
        editedCabalFile = "bf853ba8300deda982d278245bd268e91f444ca42185bd0d57eb9feae5ab066c";
-       buildDepends = [ base conduit vector ];
+       libraryHaskellDepends = [ base conduit vector ];
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "Combinators to efficiently slice and dice audio streams";
        license = "LGPL";
@@ -34756,13 +35623,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-lame";
        version = "0.1";
-       revision = "1";
        sha256 = "0i4nmb4yf2wlkl5da215ysj25gyaikfd292nc9gzmnxjgg1fx19w";
+       revision = "1";
        editedCabalFile = "34e31416cde87ad1d75570612f3e95d8f54cbeac0539a6f85b93aebaf3979c1a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
-       extraLibraries = [ mp3lame ];
+       librarySystemDepends = [ mp3lame ];
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the LAME MP3 library";
        license = "LGPL";
@@ -34776,13 +35643,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-samplerate";
        version = "0.1";
-       revision = "1";
        sha256 = "04s5ld0nsgbjlgkj3f32xnwyah26m6j5qmjxycwgvxjp1siq2xsg";
+       revision = "1";
        editedCabalFile = "c3601c344d95841d594827a61b1a7ad05042dec6f62ce9952e88b3d0fe814a63";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit conduit-audio resourcet transformers vector
        ];
-       extraLibraries = [ samplerate ];
+       librarySystemDepends = [ samplerate ];
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = "LGPL";
@@ -34796,10 +35663,10 @@ self: {
      mkDerivation {
        pname = "conduit-audio-sndfile";
        version = "0.1";
-       revision = "1";
        sha256 = "0v0vzc23c9wfc594pc91d3dw2sda26z1lrkdjjvf572771xysdbd";
+       revision = "1";
        editedCabalFile = "f753b66e55fc5332463bc54a7077b9c503439cd03c7c1c799cd60751ab954a87";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
        ];
@@ -34820,13 +35687,13 @@ self: {
        pname = "conduit-combinators";
        version = "1.0.2";
        sha256 = "1yfck6syqqi5zlp41n3qs8w5ljg63jhg25m8irrcks35n9i541j5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra filepath monad-control mono-traversable
          mwc-random primitive resourcet text transformers transformers-base
          unix unix-compat vector void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit containers directory filepath hspec mono-traversable mtl
          mwc-random QuickCheck safe silently text transformers vector
@@ -34845,10 +35712,10 @@ self: {
        pname = "conduit-connection";
        version = "0.1.0.1";
        sha256 = "1z3i2s8xl02qb4wfnmqd92kzmbp2jb09msywnzgawyxs5aghy0n4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit connection resourcet transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit connection HUnit network resourcet
          test-framework test-framework-hunit transformers
        ];
@@ -34867,12 +35734,12 @@ self: {
        pname = "conduit-extra";
        version = "1.1.9.1";
        sha256 = "18x01yll1jfv1p9kb7529k8gdh0lav4pbqcqkam2qr9jxxdy26rz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
          streaming-commons text transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async attoparsec base blaze-builder bytestring bytestring-builder
          conduit exceptions hspec process resourcet stm streaming-commons
          text transformers transformers-base
@@ -34890,8 +35757,8 @@ self: {
        pname = "conduit-iconv";
        version = "0.1.1.0";
        sha256 = "0bnak5dpqgdgybi62w1rbmr9brbcqv4i2v345x0m275gzsz0i84h";
-       buildDepends = [ base bytestring conduit ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring conduit ];
+       testHaskellDepends = [
          base bytestring conduit mtl QuickCheck test-framework
          test-framework-quickcheck2 text
        ];
@@ -34909,7 +35776,7 @@ self: {
        pname = "conduit-network-stream";
        version = "0.2";
        sha256 = "0ch0b23z7k4kxnbkvfd3gaxc7xrnlbjz7hv0pshp4k6xqg2bymv4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit mtl network-conduit resourcet
        ];
        description = "A base layer for network protocols using Conduits";
@@ -34925,10 +35792,10 @@ self: {
        pname = "conduit-parse";
        version = "0.1.0.0";
        sha256 = "093qc82nrn8ziza1bfp4xnz8k0cpm39k868a3rq4dhah3s40gsv3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit exceptions parsers text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit exceptions hlint parsers resourcet tasty tasty-hunit
        ];
        homepage = "https://github.com/k0ral/conduit-parse";
@@ -34944,8 +35811,10 @@ self: {
        pname = "conduit-resumablesink";
        version = "0.1.1";
        sha256 = "1bqdpnhqjh4dhvppsa8nlgja0jpdw48kxywz2999sp5hi53qxdfg";
-       buildDepends = [ base conduit void ];
-       testDepends = [ base bytestring conduit hspec transformers void ];
+       libraryHaskellDepends = [ base conduit void ];
+       testHaskellDepends = [
+         base bytestring conduit hspec transformers void
+       ];
        jailbreak = true;
        homepage = "http://github.com/A1kmm/conduit-resumablesink";
        description = "Allows conduit to resume sinks to feed multiple sources into it";
@@ -34961,8 +35830,8 @@ self: {
        pname = "conf";
        version = "0.1.1.0";
        sha256 = "1mxrr14188ikizyxb06764qq1iwhnh19g150mz310q8yw6cypbfw";
-       buildDepends = [ base haskell-src ];
-       testDepends = [
+       libraryHaskellDepends = [ base haskell-src ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
        jailbreak = true;
@@ -34978,7 +35847,9 @@ self: {
        sha256 = "1b1fs42c5y5sixgag972m5hb6xwbwp1d64p0gadqg9mg1vknl34y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath unix vty-menu ];
+       executableHaskellDepends = [
+         base directory filepath unix vty-menu
+       ];
        description = "A small program for swapping out dot files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34992,8 +35863,8 @@ self: {
        pname = "config-value";
        version = "0.4.0.1";
        sha256 = "0d9g6ih1rl0z4a2gf285f408vz7iysxwvw6kav280nvx99k2msb7";
-       buildDepends = [ array base pretty text transformers ];
-       buildTools = [ alex happy ];
+       libraryHaskellDepends = [ array base pretty text transformers ];
+       libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
        description = "Simple, layout-based value language similar to YAML or JSON";
        license = stdenv.lib.licenses.mit;
@@ -35011,12 +35882,14 @@ self: {
        sha256 = "0k3r8i2mb06kvrqfln0birwd92bwx8m55wpahnbbzs35i35p60vz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring case-insensitive containers either mtl pretty-show
-         regex-easy safe string-conversions text unordered-containers vector
-         yaml
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers either mtl regex-easy
+         safe string-conversions unordered-containers vector yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring mtl pretty-show string-conversions text yaml
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty base case-insensitive hspec hspec-discover mtl
          pretty-show QuickCheck scientific string-conversions
          unordered-containers vector
@@ -35024,7 +35897,6 @@ self: {
        jailbreak = true;
        description = "parser for config files, shell variables, command line args";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configuration" = callPackage
@@ -35033,7 +35905,7 @@ self: {
        pname = "configuration";
        version = "0.1.1";
        sha256 = "1jqc5xpbxrlnpxk2yci861gpxl5c9vm9lffchrpp1hk8ag5wkxk1";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35052,7 +35924,7 @@ self: {
        pname = "configuration-tools";
        version = "0.2.13";
        sha256 = "0rhr5c91bk853zlgld2im0sm0pcss0q6g82c92p85vwkdgrgxlz2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base-unicode-symbols
          base64-bytestring bytestring Cabal case-insensitive connection
          data-default deepseq directory dlist enclosed-exceptions filepath
@@ -35061,7 +35933,7 @@ self: {
          transformers unordered-containers x509 x509-system x509-validation
          yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-unicode-symbols bytestring Cabal enclosed-exceptions
          http-types monad-control mtl text transformers unordered-containers
          wai warp warp-tls yaml
@@ -35080,11 +35952,11 @@ self: {
        pname = "configurator";
        version = "0.3.0.0";
        sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring directory hashable text unix-compat
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath HUnit test-framework
          test-framework-hunit text
        ];
@@ -35103,7 +35975,7 @@ self: {
        sha256 = "0984gcahddrzlvzsfsrkr8i8jijjg7j2m5namfv8zhdlkrny8h11";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base cmdargs process system-fileio system-filepath text
          time unordered-containers
        ];
@@ -35118,7 +35990,7 @@ self: {
        pname = "congruence-relation";
        version = "0.1.0.0";
        sha256 = "1pj4kby5pba1xfz2fvv2lij7h2i8crf3qkhgs3rp4ziay0jkg18v";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        jailbreak = true;
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
        license = stdenv.lib.licenses.mit;
@@ -35130,7 +36002,7 @@ self: {
        pname = "conjugateGradient";
        version = "2.2";
        sha256 = "1is3j61ra1whjpm8rq89yj9rscqj1ipgqlnh1nwvyzi2nggl06ya";
-       buildDepends = [ base containers random ];
+       libraryHaskellDepends = [ base containers random ];
        homepage = "http://github.com/LeventErkok/conjugateGradient";
        description = "Sparse matrix linear-equation solver";
        license = stdenv.lib.licenses.bsd3;
@@ -35147,7 +36019,7 @@ self: {
        sha256 = "02a33940rnwq5bzqx50fjy76q0z6nimsg2fk3q17ai4kvi0rw0p3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers filepath html HTTP mtl network
          old-time parsec pretty random stm unix
        ];
@@ -35164,7 +36036,8 @@ self: {
        sha256 = "1bxpn27spj4cq9cwg5b486xb35gmwb8hnrhq5g5dpmm7lxgijzh3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
+       executableHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/conlogger";
        description = "A logger for a concurrent program";
@@ -35180,7 +36053,7 @@ self: {
        pname = "connection";
        version = "0.2.5";
        sha256 = "090il95jnm7ihwvcx3s9v6iwnp37nnsdx15q7722l845g51d95c8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring containers data-default-class network
          socks tls x509 x509-store x509-system x509-validation
        ];
@@ -35198,14 +36071,13 @@ self: {
        pname = "connection-pool";
        version = "0.1.2.0";
        sha256 = "12nr9vl884yj4yq9dyfc725zi6dw0amp65xlm9hjm7wffz6mc5az";
-       buildDepends = [
+       libraryHaskellDepends = [
          base between data-default-class monad-control network resource-pool
          streaming-commons time transformers-base
        ];
        homepage = "https://github.com/trskop/connection-pool";
        description = "Connection pool built on top of resource-pool and streaming-commons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "consistent" = callPackage
@@ -35216,11 +36088,11 @@ self: {
        pname = "consistent";
        version = "0.0.1";
        sha256 = "003vnmh6mbjz08msnvnjfwwfsn8m15fa9apr5igkvscdqrr5hzd5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-async lifted-base monad-control stm transformers
          transformers-base unordered-containers
        ];
-       testDepends = [ base lifted-async transformers ];
+       testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35235,7 +36107,7 @@ self: {
        pname = "console-program";
        version = "0.3.2.0";
        sha256 = "1517vwn9l10hihw7ysj812x7cypf5gca468sdzgdlcwvqa8wsr3m";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers directory fez-conf
          haskeline parsec parsec-extra split transformers utility-ht
        ];
@@ -35249,8 +36121,8 @@ self: {
        pname = "const-math-ghc-plugin";
        version = "1.0.0.0";
        sha256 = "1fcj3ssfyxnq4cmb3lr5cg7qkgnkhf1ra0469cbw61gr2fl3kzdl";
-       buildDepends = [ base containers ghc ];
-       testDepends = [ base directory process ];
+       libraryHaskellDepends = [ base containers ghc ];
+       testHaskellDepends = [ base directory process ];
        homepage = "https://github.com/kfish/const-math-ghc-plugin";
        description = "Compiler plugin for constant math elimination";
        license = stdenv.lib.licenses.bsd3;
@@ -35263,7 +36135,7 @@ self: {
        pname = "constrained-categories";
        version = "0.2.0.0";
        sha256 = "1mh61gfydh068qws3r52rbnw30ihi9k88wklx8p18j43c7jngamx";
-       buildDepends = [ base tagged void ];
+       libraryHaskellDepends = [ base tagged void ];
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
@@ -35276,7 +36148,7 @@ self: {
        pname = "constrained-normal";
        version = "1.0.2";
        sha256 = "1mq0w2qndrjx9ap9dkyxvz91fbszsnwlhh4hnm9g2dx020fawgac";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://dx.doi.org/10.1145/2500365.2500602";
        description = "Normalised Deep Embeddings for Constrained Type-Class Instances";
        license = stdenv.lib.licenses.bsd3;
@@ -35288,7 +36160,7 @@ self: {
        pname = "constraints";
        version = "0.4.1.3";
        sha256 = "1w3ssvg30rfkp1y20vx0fbq1c0md2wys2rh50mih7645djv56hyx";
-       buildDepends = [ base ghc-prim newtype ];
+       libraryHaskellDepends = [ base ghc-prim newtype ];
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd3;
@@ -35300,7 +36172,9 @@ self: {
        pname = "constructible";
        version = "0.1.0.1";
        sha256 = "0d3x92h194y6q8qn11prj05gcnv01vmbvlcsvb1zxgp51qmv1aih";
-       buildDepends = [ arithmoi base binary-search complex-generic ];
+       libraryHaskellDepends = [
+         arithmoi base binary-search complex-generic
+       ];
        homepage = "http://andersk.mit.edu/haskell/constructible/";
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -35312,7 +36186,7 @@ self: {
        pname = "constructive-algebra";
        version = "0.3.0";
        sha256 = "17ab0vkq5w3zwh76ws7b82wbc0871qdmvrxhxga78h3h0axjiz1x";
-       buildDepends = [ base QuickCheck type-level ];
+       libraryHaskellDepends = [ base QuickCheck type-level ];
        jailbreak = true;
        description = "A library of constructive algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -35329,12 +36203,12 @@ self: {
        pname = "consul-haskell";
        version = "0.2.1";
        sha256 = "13c3yqn5nsx7r0hkgdwka6fis2ypg54k4damv3c22rdjyids17x7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring http-client http-types
          lifted-async lifted-base monad-control network stm text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base http-client HUnit network tasty tasty-hunit text transformers
        ];
        homepage = "https://github.com/alphaHeavy/consul-haskell";
@@ -35352,7 +36226,7 @@ self: {
        pname = "consumers";
        version = "1.0";
        sha256 = "1f7jn9lja9fsznjz7d3wfhbd0dc8whcx9jl74jl39mv20k2sdhib";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers exceptions hpqtypes lifted-base lifted-threads log
          monad-control mtl stm time transformers-base
        ];
@@ -35367,7 +36241,7 @@ self: {
        pname = "container-classes";
        version = "0.0.0.0";
        sha256 = "18mx50mp9pv1a33kcwmckz6r4a0j6rlc1165ivn9cj8iiwpmd6pv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generic classes for interacting with different container types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35377,10 +36251,10 @@ self: {
      mkDerivation {
        pname = "containers";
        version = "0.4.2.1";
-       revision = "2";
        sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm";
+       revision = "2";
        editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8";
-       buildDepends = [ array base deepseq ];
+       libraryHaskellDepends = [ array base deepseq ];
        jailbreak = true;
        description = "Assorted concrete container types";
        license = stdenv.lib.licenses.bsd3;
@@ -35395,8 +36269,8 @@ self: {
        pname = "containers";
        version = "0.5.6.3";
        sha256 = "1kcd55nl0vzi99i8sr8fmc5j25fv7m0a9hd3nihnq1pd64pfciqn";
-       buildDepends = [ array base deepseq ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ array base deepseq ghc-prim ];
+       testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -35414,7 +36288,7 @@ self: {
        sha256 = "11h88lgwgiyacv9b9k96aih95ydjq1i4ny03z0zw8iyd3c0yi7m0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers criterion deepseq ghc-prim random
        ];
        jailbreak = true;
@@ -35429,7 +36303,7 @@ self: {
        pname = "containers-deepseq";
        version = "0.1.0.1";
        sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        description = "Provide orphan NFData instances for containers as needed. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35440,7 +36314,7 @@ self: {
        pname = "containers-unicode-symbols";
        version = "0.3.1.1";
        sha256 = "0ccv7rqkykfk5wmr73mc0kwrnwyzakgp5x495dgwn5nila3g4ma6";
-       buildDepends = [ base base-unicode-symbols containers ];
+       libraryHaskellDepends = [ base base-unicode-symbols containers ];
        homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
@@ -35456,11 +36330,11 @@ self: {
        pname = "context-free-grammar";
        version = "0.1.0";
        sha256 = "11s6v8h39iq0wy4p4y8cwpr8fjhphql07s38rgbm8qsq1hj9f3a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers control-monad-omega dlist mtl pretty
          template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit pretty QuickCheck quickcheck-properties
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -35476,7 +36350,9 @@ self: {
        pname = "context-stack";
        version = "0.1.0.1";
        sha256 = "0y51xlva4364658bgbchcasbq5pka2ixlvhdf9g38xwlmhfg736x";
-       buildDepends = [ base classy-prelude mtl unordered-containers ];
+       libraryHaskellDepends = [
+         base classy-prelude mtl unordered-containers
+       ];
        jailbreak = true;
        homepage = "http://github.com/thinkpad20/context-stack";
        description = "An abstraction of a stack and stack-based monadic context";
@@ -35492,7 +36368,7 @@ self: {
        pname = "continue";
        version = "0.2.0";
        sha256 = "0iyqwqbzmk8v4j6xdmfir8mdxjgzl1dh76c9ngwzyccpv7xbz59a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors monad-control mtl semigroupoids transformers
          transformers-base
        ];
@@ -35508,7 +36384,7 @@ self: {
        pname = "continued-fractions";
        version = "0.9.1.1";
        sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "/dev/null";
        description = "Continued fractions";
        license = stdenv.lib.licenses.publicDomain;
@@ -35526,12 +36402,15 @@ self: {
        sha256 = "0viqn05l4xjwb3w2qbldxmwv0dj1bzwbvjcgczj1clhdx2zdgfx6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal containers mtl nanomsg-haskell time
+       ];
+       executableHaskellDepends = [
          base bytestring cereal containers data-default foldl
          leveldb-haskell-fork mtl nanomsg-haskell parallel-io resourcet stm
          suspend time timers transformers transformers-base
        ];
-       extraLibraries = [ hyperleveldb ];
+       executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { hyperleveldb = null;};
@@ -35544,7 +36423,7 @@ self: {
        pname = "continuum-client";
        version = "0.1.0.0";
        sha256 = "0qv7dz2h3aay4ak5nz38wp3wrrk2zzg2g58xdlglvml08hpxsf7k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
@@ -35559,7 +36438,7 @@ self: {
        pname = "contravariant";
        version = "1.3.2";
        sha256 = "0fb6az12604vwvfhnmvxfin68n0fb2jcvrliv3vvrmfnfq3axfjj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base semigroups StateVar transformers transformers-compat void
        ];
        homepage = "http://github.com/ekmett/contravariant/";
@@ -35573,7 +36452,7 @@ self: {
        pname = "control-bool";
        version = "0.2.1";
        sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/fumieval/control-bool";
        description = "Useful combinators for boolean expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -35585,7 +36464,7 @@ self: {
        pname = "control-event";
        version = "1.2.1.1";
        sha256 = "0hwsidsxnzi4b3aphn3f7lsf1z508ql6cnhfq6zbqfsvcynm7565";
-       buildDepends = [ base containers stm time ];
+       libraryHaskellDepends = [ base containers stm time ];
        description = "Event scheduling system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35597,7 +36476,7 @@ self: {
        pname = "control-monad-attempt";
        version = "0.3.0.1";
        sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
-       buildDepends = [ attempt base transformers ];
+       libraryHaskellDepends = [ attempt base transformers ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/control-monad-attempt";
        description = "Monad transformer for attempt. (deprecated)";
@@ -35613,7 +36492,7 @@ self: {
        pname = "control-monad-exception";
        version = "0.11.2";
        sha256 = "0vdms5if6c04459ksix5q38l9cflgc5bwnchd422fp2qfji5j14p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base failure lifted-base monad-control monadloc transformers
          transformers-base
        ];
@@ -35630,7 +36509,7 @@ self: {
        pname = "control-monad-exception-monadsfd";
        version = "0.10.3";
        sha256 = "1izyxqry863jg9i88gcs7cib39q9c2mnm74mxdyl1d84kj1hrnim";
-       buildDepends = [
+       libraryHaskellDepends = [
          base control-monad-exception monads-fd transformers
        ];
        homepage = "http://pepeiborra.github.com/control-monad-exception";
@@ -35646,7 +36525,7 @@ self: {
        pname = "control-monad-exception-monadstf";
        version = "0.10.3";
        sha256 = "1qj4y71g5p6b4aa5wn5fp4i5c9iw0pdrqs9yvzr6f41v6knw16za";
-       buildDepends = [
+       libraryHaskellDepends = [
          base control-monad-exception monads-tf transformers
        ];
        homepage = "http://pepeiborra.github.com/control-monad-exception";
@@ -35660,7 +36539,7 @@ self: {
        pname = "control-monad-exception-mtl";
        version = "0.10.3";
        sha256 = "1wwqn3xcd2fspfd2cnf9cym0cbbgvlajr3pkx7f2v3b37mx6blni";
-       buildDepends = [ base control-monad-exception mtl ];
+       libraryHaskellDepends = [ base control-monad-exception mtl ];
        homepage = "http://pepeiborra.github.com/control-monad-exception";
        description = "MTL instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
@@ -35673,7 +36552,7 @@ self: {
        pname = "control-monad-failure";
        version = "0.7.0.1";
        sha256 = "1g304wb1fhx81iw2vv7nv6cp2qmy69frwiv3vax85lxw03s4nlkq";
-       buildDepends = [ base failure transformers ];
+       libraryHaskellDepends = [ base failure transformers ];
        jailbreak = true;
        homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error. (deprecated)";
@@ -35687,7 +36566,7 @@ self: {
        pname = "control-monad-failure-mtl";
        version = "0.7.1";
        sha256 = "0j9i85vq033789vx2589mfqwk954hqy1wla527ssbyf05k6vkn8j";
-       buildDepends = [ base failure mtl ];
+       libraryHaskellDepends = [ base failure mtl ];
        jailbreak = true;
        homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error for mtl 1 (deprecated)";
@@ -35701,7 +36580,7 @@ self: {
        pname = "control-monad-free";
        version = "0.5.3";
        sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1";
-       buildDepends = [ base deepseq transformers ];
+       libraryHaskellDepends = [ base deepseq transformers ];
        homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
        license = stdenv.lib.licenses.publicDomain;
@@ -35712,10 +36591,10 @@ self: {
      mkDerivation {
        pname = "control-monad-free";
        version = "0.6.1";
-       revision = "1";
        sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy";
+       revision = "1";
        editedCabalFile = "d08dceee154098bee492a1c00ef699a2a3a0e8a3851c5d49ccd49d5645a501a4";
-       buildDepends = [ base prelude-extras transformers ];
+       libraryHaskellDepends = [ base prelude-extras transformers ];
        homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
        license = stdenv.lib.licenses.publicDomain;
@@ -35727,7 +36606,7 @@ self: {
        pname = "control-monad-loop";
        version = "0.1";
        sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj";
-       buildDepends = [ base transformers transformers-base ];
+       libraryHaskellDepends = [ base transformers transformers-base ];
        homepage = "https://github.com/joeyadams/haskell-control-monad-loop";
        description = "Simple monad transformer for imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
@@ -35739,7 +36618,7 @@ self: {
        pname = "control-monad-omega";
        version = "0.3.1";
        sha256 = "11hirysr76i01qj8rm22xjcrv2qwxgwjlrqqyd1dsnnvypn9hfrq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/control-monad-omega";
        description = "A breadth-first list monad";
        license = stdenv.lib.licenses.publicDomain;
@@ -35751,7 +36630,7 @@ self: {
        pname = "control-monad-queue";
        version = "0.2";
        sha256 = "15syy24v1a2h25j4ijddi9l0pmp84wq9hlryh18f1jvqm8apc8vs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Reusable corecursive queues, via continuations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35762,7 +36641,7 @@ self: {
        pname = "control-timeout";
        version = "0.1.2";
        sha256 = "1g1x6c4dafckwcw48v83f3nm2sxv8kynwv8ib236ay913ycgayvg";
-       buildDepends = [ base containers stm time ];
+       libraryHaskellDepends = [ base containers stm time ];
        description = "Timeout handling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35773,7 +36652,7 @@ self: {
        pname = "contstuff";
        version = "1.2.6";
        sha256 = "0rw2bslajjch057fsxf881wi39bsd9y6196j0kb0lz47r0zn8003";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://haskell.org/haskellwiki/Contstuff";
        description = "Fast, easy to use CPS-based monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -35785,7 +36664,7 @@ self: {
        pname = "contstuff-monads-tf";
        version = "0.2.1";
        sha256 = "0j4y76ar0m642jxcyrvlrxagawrlq637cvx3fqprw5sl5cslgxh5";
-       buildDepends = [ base contstuff monads-tf ];
+       libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35797,7 +36676,7 @@ self: {
        pname = "contstuff-transformers";
        version = "0.1.1";
        sha256 = "0b5vskp1bxqpi4ffcxwjw6kr0jd6n8v8jlhf03p54ckfd5ym4ai6";
-       buildDepends = [ base contstuff transformers ];
+       libraryHaskellDepends = [ base contstuff transformers ];
        jailbreak = true;
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
        license = stdenv.lib.licenses.bsd3;
@@ -35810,7 +36689,7 @@ self: {
        pname = "converge";
        version = "0.1.0.1";
        sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "/dev/null";
        description = "Limit operations for converging sequences";
        license = stdenv.lib.licenses.publicDomain;
@@ -35822,7 +36701,7 @@ self: {
        pname = "conversion";
        version = "1.1.0.1";
        sha256 = "1bgads36prqw7m10hfmg9161d3hs5pa5qql9lbsny5hqvxsmb30d";
-       buildDepends = [ base-prelude ];
+       libraryHaskellDepends = [ base-prelude ];
        homepage = "https://github.com/nikita-volkov/conversion";
        description = "Universal converter between values of different types";
        license = stdenv.lib.licenses.mit;
@@ -35834,7 +36713,7 @@ self: {
        pname = "conversion-bytestring";
        version = "1.0.0.1";
        sha256 = "1gsbfmp58qzhvnyl6jgy1pah954qaxi184clh31lzam9m1j44k3y";
-       buildDepends = [ base-prelude bytestring conversion ];
+       libraryHaskellDepends = [ base-prelude bytestring conversion ];
        homepage = "https://github.com/nikita-volkov/conversion-bytestring";
        description = "\"Conversion\" instances for the \"bytestring\" library";
        license = stdenv.lib.licenses.mit;
@@ -35846,7 +36725,7 @@ self: {
        pname = "conversion-case-insensitive";
        version = "1.0.0.0";
        sha256 = "14mf5jincplqrdln6xja0c840mmj4khd5n3z5f4glgpnmk9r3dcp";
-       buildDepends = [ case-insensitive conversion ];
+       libraryHaskellDepends = [ case-insensitive conversion ];
        homepage = "https://github.com/nikita-volkov/conversion-case-insensitive";
        description = "\"Conversion\" instances for the \"case-insensitive\" library";
        license = stdenv.lib.licenses.mit;
@@ -35860,7 +36739,7 @@ self: {
        pname = "conversion-text";
        version = "1.0.0.2";
        sha256 = "0j7j0jww92v9gldh8hd35p51ka2mq4n26chfw6n4m034q3pjqpby";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude bytestring conversion conversion-bytestring text
        ];
        homepage = "https://github.com/nikita-volkov/conversion-text";
@@ -35878,7 +36757,7 @@ self: {
        sha256 = "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl old-locale old-time text time
        ];
        homepage = "http://hackage.haskell.org/package/convertible";
@@ -35894,7 +36773,7 @@ self: {
        pname = "convertible-ascii";
        version = "0.1.0.1";
        sha256 = "0yzfq0r430ziclxn44k9x3jwl675gs3lafr5d1cb6y9j20fl1sjw";
-       buildDepends = [
+       libraryHaskellDepends = [
          ascii base base-unicode-symbols blaze-builder bytestring
          convertible-text failure text
        ];
@@ -35915,7 +36794,7 @@ self: {
        sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attempt base bytestring containers old-time template-haskell text
          time
        ];
@@ -35932,7 +36811,7 @@ self: {
        pname = "cookbook";
        version = "3.0.0.1";
        sha256 = "1mhj4g7bg6gi1wx8pshwl4n37vgqacnssh5hwskyaajy4gqz6hki";
-       buildDepends = [ base directory strict ];
+       libraryHaskellDepends = [ base directory strict ];
        description = "Tiered general-purpose libraries with domain-specific applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35946,11 +36825,11 @@ self: {
        pname = "cookie";
        version = "0.4.1.6";
        sha256 = "0b6ym6fn29p5az4dwydy036lxj131kagrmgb93w4bbkqfkds8b9s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring data-default-class deepseq old-locale
          text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit
          tasty-quickcheck text time
        ];
@@ -35967,8 +36846,8 @@ self: {
        pname = "coordinate";
        version = "0.0.19";
        sha256 = "01f6dmyx2kqyzf1n06awcyx0ygqgy829snxw6bbxbvih9yhkjq2r";
-       buildDepends = [ base lens radian tagged transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base lens radian tagged transformers ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/coordinate";
@@ -35987,7 +36866,11 @@ self: {
        sha256 = "0mslkyyl5shcxh05i1vprzacaxxg3jjdqcfin475zv5gm5cn26vz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base copilot-c99 copilot-cbmc copilot-core copilot-language
+         copilot-libraries copilot-sbv
+       ];
+       executableHaskellDepends = [
          base copilot-c99 copilot-cbmc copilot-core copilot-language
          copilot-libraries copilot-sbv directory random
        ];
@@ -36007,7 +36890,11 @@ self: {
        sha256 = "0lvldfkksxxmf3mbchwxzj1a1yagdk7k3zbyid181gskvmkxnfzd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         atom base bytestring containers copilot-core csv directory pretty
+         process QuickCheck random text vector
+       ];
+       executableHaskellDepends = [
          atom base bytestring containers copilot-core csv directory pretty
          process QuickCheck random text vector
        ];
@@ -36024,7 +36911,7 @@ self: {
        pname = "copilot-cbmc";
        version = "2.1.2";
        sha256 = "02ng4iqsr5yp435fcqjjh9j5p93l4cixjdnqjx4fafhhfrv8g8a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring copilot-c99 copilot-core copilot-sbv directory
          pretty process
        ];
@@ -36041,7 +36928,7 @@ self: {
        pname = "copilot-core";
        version = "2.1.2";
        sha256 = "1gdq76c170sv58fb56ik8mam3f63dg0jk6myd5rv4sbh4z45xfs7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dlist mtl pretty pretty-ncols random
        ];
        description = "An intermediate representation for Copilot";
@@ -36057,7 +36944,7 @@ self: {
        pname = "copilot-language";
        version = "2.1.2";
        sha256 = "1099w6hk6v4rna02z4zsrwf1m883w6nxgycy5d8iamd4n2pk6bk3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers copilot-core data-reify ghc-prim mtl
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
@@ -36073,7 +36960,7 @@ self: {
        pname = "copilot-libraries";
        version = "2.1.1";
        sha256 = "0b69rfz4gvdvk9f9y7yns3hmh1m7akcrm3rcdi8rkhizykcnnsyj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers copilot-language mtl parsec
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
@@ -36089,7 +36976,7 @@ self: {
        pname = "copilot-sbv";
        version = "2.1.2";
        sha256 = "1a4blmxrglp4fmrfnc7g3w0zhyl3fdx3lvaw2mi47wchqbqcgicr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers copilot-core filepath pretty sbv
        ];
        description = "A compiler for CoPilot targeting SBV";
@@ -36104,14 +36991,14 @@ self: {
      mkDerivation {
        pname = "copr";
        version = "1.1.1";
-       revision = "1";
        sha256 = "0zgg60ri8yvz96gk08wdfn0445wqszigh2p0964nr2zdnffq5rnw";
+       revision = "1";
        editedCabalFile = "ef9fb8be7d257feae9e4647de62d489860e2bd6510e34a35465cf5b763fa2425";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers HsOpenSSL http-streams io-streams
          semigroups text
        ];
-       testDepends = [ base hlint ];
+       testHaskellDepends = [ base hlint ];
        jailbreak = true;
        homepage = "https://github.com/relrod/copr-hs";
        description = "Haskell interface to the Fedora Copr system";
@@ -36124,7 +37011,7 @@ self: {
        pname = "core";
        version = "0.5";
        sha256 = "1fqgfbd3in8l84250kda67paakz4sr2ywf5qzsy403546w7q9ccz";
-       buildDepends = [ base bytestring parsec pretty ];
+       libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36138,7 +37025,9 @@ self: {
        sha256 = "1wjmj2p8j6xw7cga01jsjgpi4dswrxif3j6mml48fq8a4k19zqxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskeline haskell-src-exts hint ];
+       executableHaskellDepends = [
+         base haskeline haskell-src-exts hint
+       ];
        homepage = "https://github.com/happlebao/Core-Haskell";
        description = "A subset of Haskell using in UCC for teaching purpose";
        license = stdenv.lib.licenses.bsd3;
@@ -36156,7 +37045,12 @@ self: {
        sha256 = "10pfz4bw1wh55c2cizd8jiwh8bkaqw9p773976vl52f0jrhns1qg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring containers directory filepath
+         filestore http-types monads-tf pandoc template-haskell text time
+         yesod
+       ];
+       executableHaskellDepends = [
          aeson base blaze-builder bytestring containers directory filepath
          filestore http-types monads-tf pandoc template-haskell text time
          yesod
@@ -36173,7 +37067,7 @@ self: {
        pname = "coroutine-enumerator";
        version = "0.1.1";
        sha256 = "1rjbhpy5vw1maawi47jsrnagqm19say9w1i31pgcpxl45vhrshp7";
-       buildDepends = [ base enumerator monad-coroutine ];
+       libraryHaskellDepends = [ base enumerator monad-coroutine ];
        jailbreak = true;
        homepage = "http://trac.haskell.org/SCC/wiki/coroutine-enumerator";
        description = "Bridge between the monad-coroutine and enumerator packages";
@@ -36186,7 +37080,7 @@ self: {
        pname = "coroutine-iteratee";
        version = "0.1.1";
        sha256 = "1ycir4kwpcz34yg64cdb9q0jxv3ma12vrrs28cr5jm64jmi8m0wd";
-       buildDepends = [ base iteratee monad-coroutine ];
+       libraryHaskellDepends = [ base iteratee monad-coroutine ];
        jailbreak = true;
        homepage = "http://trac.haskell.org/SCC/wiki/coroutine-iteratee";
        description = "Bridge between the monad-coroutine and iteratee packages";
@@ -36202,7 +37096,7 @@ self: {
        pname = "coroutine-object";
        version = "0.3";
        sha256 = "0q0rvcc7ipxwmikaxh0ymq1d65f2q1a2jrd1i553pdf8hwmv0k1r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers either lens mtl safecopy
          transformers transformers-free uuid
        ];
@@ -36220,7 +37114,7 @@ self: {
        sha256 = "0mrx0mjh9kzk6nx53gn5hvhjgmhlwphxkl5yn9a1x17l62v3x6q7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring hint random text transformers
          vector
        ];
@@ -36242,13 +37136,13 @@ self: {
        pname = "couchdb-conduit";
        version = "0.10.6";
        sha256 = "0rp5pj56m9n20g5hjjw8gbx81lb2z0ckwpgpvyr2a5sgk6b7z2al";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder bytestring
          conduit containers data-default http-conduit http-types lifted-base
          monad-control resourcet string-conversions syb text transformers
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder bytestring
          conduit containers data-default http-conduit http-types HUnit
          lifted-base monad-control string-conversions syb test-framework
@@ -36273,12 +37167,12 @@ self: {
        pname = "couchdb-enumerator";
        version = "0.3.7";
        sha256 = "02h0a61dbchyjp0shpj0shsdfcggx0cm5psxgw9g67vv3v8f98pn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-enumerator base bytestring enumerator
          http-enumerator http-types lifted-base monad-control text
          transformers unordered-containers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec attoparsec-enumerator base bytestring enumerator
          http-enumerator http-types HUnit lifted-base monad-control
          QuickCheck test-framework test-framework-hunit
@@ -36298,7 +37192,7 @@ self: {
        pname = "count";
        version = "0.0.1";
        sha256 = "1az2vr1rjq4pfgzswwbwgfq4kcb8kq759vn5kl7ghzaqr7b6vkgx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Bijective mappings between values and possibly infinite prefixes of [0..]";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36309,7 +37203,7 @@ self: {
        pname = "countable";
        version = "0.2";
        sha256 = "1az6pk1is587ggys6v1qh3yabnc63vr0fcd5bmvwx20c137yflik";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/AshleyYakeley/countable";
        description = "Countable, Searchable, Finite, Empty classes";
        license = stdenv.lib.licenses.bsd3;
@@ -36321,7 +37215,7 @@ self: {
        pname = "counter";
        version = "0.1.0.1";
        sha256 = "0pfg34ph6b7qb3wscvvnqdkqqzkjdjc8wynv35ikgf295bsf3kaz";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/wei2912/counter";
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
@@ -36337,8 +37231,9 @@ self: {
        sha256 = "16729grgn4bgnh9nw51h3pil054bixqxfa8lxwfz8xf3b6lcm774";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base shakespeare tagsoup text ];
-       testDepends = [ aeson base HTF HUnit ];
+       libraryHaskellDepends = [ aeson base shakespeare text ];
+       executableHaskellDepends = [ base tagsoup text ];
+       testHaskellDepends = [ aeson base HTF HUnit ];
        homepage = "https://github.com/prowdsponsor/country-codes";
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
@@ -36353,11 +37248,11 @@ self: {
        pname = "courier";
        version = "0.1.0.15";
        sha256 = "1aj9anrw7jfqx8s2xkdznqs212f54g6i2lcf79bgnkmxsbax252v";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring cereal containers hslogger network stm text
          uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base cereal containers directory hslogger HUnit network stm
          test-framework test-framework-hunit
        ];
@@ -36376,7 +37271,7 @@ self: {
        sha256 = "0cpvm6cjfz203hajl8fj5gxc5hc7516v0bzz4d7hyih2kh21k6dn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory filepath old-locale
          optparse-applicative process stm text time unix
        ];
@@ -36395,16 +37290,17 @@ self: {
        pname = "cpio-conduit";
        version = "0.7.0";
        sha256 = "04zma03ivg9x5f1xkdpc828fk2lh6qrn7cig7gprci13id9yf2wg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring binary bytestring conduit conduit-extra
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base16-bytestring binary bytestring conduit conduit-extra
          resourcet
        ];
        homepage = "http://github.com/da-x/cpio-conduit";
        description = "Conduit-based CPIO";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cplusplus-th" = callPackage
@@ -36415,10 +37311,10 @@ self: {
        pname = "cplusplus-th";
        version = "1.0.0.0";
        sha256 = "0gmsn35rd6ij4ax4j626hg9pdb40ilj22zg0nxrnl6n1828a9rqj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers process template-haskell
        ];
-       testDepends = [ base process QuickCheck ];
+       testHaskellDepends = [ base process QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/nicta/cplusplus-th";
        description = "C++ Foreign Import Generation";
@@ -36435,7 +37331,12 @@ self: {
        sha256 = "194hcvhjgm6rmbqp857y3j39lvl2p91mqrrgpi15jq00icnv4idv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory old-locale old-time polyparse ];
+       libraryHaskellDepends = [
+         base directory old-locale old-time polyparse
+       ];
+       executableHaskellDepends = [
+         base directory old-locale old-time polyparse
+       ];
        homepage = "http://projects.haskell.org/cpphs/";
        description = "A liberalised re-implementation of cpp, the C pre-processor";
        license = "LGPL";
@@ -36449,7 +37350,7 @@ self: {
        pname = "cprng-aes";
        version = "0.6.1";
        sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring cipher-aes crypto-random
        ];
        homepage = "http://github.com/vincenthz/hs-cprng-aes";
@@ -36464,10 +37365,10 @@ self: {
      mkDerivation {
        pname = "cprng-aes-effect";
        version = "0.1.0.2";
-       revision = "1";
        sha256 = "0443h7jfpjvc6vmp3kfx0h6j2aynvgfznssz7lin9fmsxghlvsfb";
+       revision = "1";
        editedCabalFile = "b9752152bb1764da66976eaf18776b09dabf80eeb6f252bcee0da10fa0a1057e";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cprng-aes crypto-random crypto-random-effect
          extensible-effects
        ];
@@ -36485,7 +37386,7 @@ self: {
        sha256 = "0zm2waj17ak43rhri9rhvwy970dv22r0k42fzbm3n6gcl5h2mcq5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers parallel ];
+       executableHaskellDepends = [ array base containers parallel ];
        description = "Symbolic cryptographic protocol analyzer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36499,7 +37400,7 @@ self: {
        sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/vincenthz/hs-cpu";
        description = "Cpu information and properties helpers";
        license = stdenv.lib.licenses.bsd3;
@@ -36513,7 +37414,7 @@ self: {
        sha256 = "126xg98yaf3q61h85yrs1cm6wxlayf590l0a3h0gw6c282s8l6gq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base data-accessor enumset ];
+       libraryHaskellDepends = [ base data-accessor enumset ];
        homepage = "http://code.haskell.org/cpuid/";
        description = "Binding for the cpuid machine instruction on x86 compatible processors";
        license = "GPL";
@@ -36527,7 +37428,7 @@ self: {
        sha256 = "1xnmrm3agkxziflvanihckg6q97z5w9gh7yv7mbbc7gqax3sz6l0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl process ];
+       executableHaskellDepends = [ base mtl process ];
        homepage = "http://code.haskell.org/~dons/code/cpuperf";
        description = "Modify the cpu frequency on OpenBSD systems";
        license = stdenv.lib.licenses.bsd3;
@@ -36540,9 +37441,9 @@ self: {
        pname = "cpython";
        version = "3.3.0";
        sha256 = "162m0dfgnicyv3jb9dqq6pmyymh1dim043kbmbg1hfhxjfrv17jj";
-       buildDepends = [ base bytestring text ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ python3 ];
+       libraryHaskellDepends = [ base bytestring text ];
+       libraryPkgconfigDepends = [ python3 ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "https://john-millikin.com/software/haskell-python/";
        description = "Bindings for libpython";
@@ -36559,11 +37460,11 @@ self: {
        pname = "cql";
        version = "3.0.5";
        sha256 = "12v5hhlji9w73chxdhazpmhbaxmjs98lw1y6cm8p29bgxdi75q61";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal Decimal iproute network template-haskell
          text time transformers uuid vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal Decimal iproute network QuickCheck tasty
          tasty-quickcheck text time uuid
        ];
@@ -36583,7 +37484,7 @@ self: {
        pname = "cql-io";
        version = "0.14.5";
        sha256 = "0ks2sn3dfrr8ilvmw48hfz3140x9dsi79w6ci4vfksn1g5ndnpiy";
-       buildDepends = [
+       libraryHaskellDepends = [
          async auto-update base bytestring containers cql cryptohash
          data-default-class exceptions hashable iproute lens monad-control
          mtl mwc-random network semigroups stm text time tinylog
@@ -36603,11 +37504,11 @@ self: {
        pname = "cqrs";
        version = "0.9.0";
        sha256 = "1r3wl6fwkqccnfhazq7dk4c2zmlirxrh3y7a7fjhxm9273g59f1b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers cqrs-types deepseq pool-conduit
          random SafeSemaphore stm transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring conduit cqrs-test hspec HUnit pool-conduit
          stm transformers
        ];
@@ -36628,7 +37529,7 @@ self: {
        sha256 = "0yllvs64qaxpgqlwdv3hmi4gzl5qf2lbyy3r0whyi2kz53kwl03i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-builder bytestring cereal conduit containers cqrs
          deepseq derive scotty stm text transformers wai-eventsource
          wai-middleware-static
@@ -36648,11 +37549,11 @@ self: {
        pname = "cqrs-postgresql";
        version = "0.9.0";
        sha256 = "0zannh06gbc5vm5cpx9015i7ssg38k5lwwyajxhxa1nckwynqmzb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing conduit cqrs-types old-locale
          pool-conduit postgresql-libpq text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit cqrs-test cqrs-types hspec pool-conduit
          postgresql-libpq
        ];
@@ -36670,11 +37571,11 @@ self: {
        pname = "cqrs-sqlite3";
        version = "0.9.0";
        sha256 = "086g5z7ajr2x2didd0q8qcvnxdsf2gfrn27436gbj8y81cbg0fsh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit cqrs-types direct-sqlite pool-conduit text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit cqrs-test direct-sqlite hspec pool-conduit
          text transformers
        ];
@@ -36692,7 +37593,7 @@ self: {
        pname = "cqrs-test";
        version = "0.9.0";
        sha256 = "1i47c2d7c64kp63spm12jkwg3g21i0z4n9z9gdwvmsr1s638k5gl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit cqrs-types hspec HUnit pool-conduit stm
          transformers
        ];
@@ -36710,7 +37611,7 @@ self: {
        pname = "cqrs-types";
        version = "0.9.0";
        sha256 = "1xxyy8zrx76x3vg54awhp9lz5qhg9x5cafhlqr45ilfz2rxjkzbg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring conduit deepseq
          derive random
        ];
@@ -36730,7 +37631,7 @@ self: {
        sha256 = "107chyp8br2ryjqdf7100109k0wg3jawzva76wf4r6fndjr3gin1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory process shelly text transformers unix
        ];
        homepage = "https://github.com/scvalex/cr";
@@ -36745,8 +37646,8 @@ self: {
        pname = "crack";
        version = "0.1";
        sha256 = "0rfwvvb3q0a7z8is95yjh3wfvz818xyblp1hrwh8fwddppncrzrk";
-       buildDepends = [ base ];
-       extraLibraries = [ crack ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36760,7 +37661,8 @@ self: {
        sha256 = "06balzwvvpl69abfcq0gynv6zpy42aygvlicb9jsnrys2vyipv28";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base data-binary-ieee754 ieee754 ];
+       libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ];
+       executableHaskellDepends = [ base data-binary-ieee754 ieee754 ];
        description = "Crack various integer, floating-point data formats";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36773,7 +37675,7 @@ self: {
        sha256 = "0002n3fq3afmby843gfi0dnwm2saq29w6hnn6lzqhsalw33j97d3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base colour mtl vector-space ];
+       libraryHaskellDepends = [ base colour mtl vector-space ];
        jailbreak = true;
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "2D graphics library with integrated TikZ output";
@@ -36787,7 +37689,7 @@ self: {
        pname = "craftwerk-cairo";
        version = "0.1";
        sha256 = "16in87l2v49k785fldm7fvprywg0v497kz29jr22y91q5j5gnm4z";
-       buildDepends = [ base cairo craftwerk mtl ];
+       libraryHaskellDepends = [ base cairo craftwerk mtl ];
        jailbreak = true;
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "Cairo backend for Craftwerk";
@@ -36805,7 +37707,7 @@ self: {
        sha256 = "18b63yh4p5ry38c3p6plyhk5j0gmmnyjw25r2dxdaddpnn051nff";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers craftwerk craftwerk-cairo gtk mtl
        ];
        jailbreak = true;
@@ -36821,7 +37723,7 @@ self: {
        pname = "crc16";
        version = "0.1.1";
        sha256 = "15x3xwq2vyg474m09jak1c2zx9w5acpfjgmy5jj4asxj33z9n7bz";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36833,7 +37735,7 @@ self: {
        pname = "crc16-table";
        version = "0.1";
        sha256 = "0x943wmcbj679kj7q2a2ipjycq17ajm71m487vkb8b6gdrdy8f2z";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Compute CRC16 checksums using a lookup table";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36849,12 +37751,12 @@ self: {
        pname = "creatur";
        version = "5.9.8.2";
        sha256 = "15cjk5hb4j7ydsis8fz7gag3sa17i6yr26pfbf8aqkw7iakmjqs9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal cond directory exceptions filepath
          gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
          random split time transformers unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base binary cereal directory filepath hsyslog HUnit
          MonadRandom mtl QuickCheck temporary test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -36873,7 +37775,7 @@ self: {
        pname = "crf-chain1";
        version = "0.2.2";
        sha256 = "0v0mmpvn9qma3xz92s13ywk9p5czxzshh2rf06hb2zqqq5m6iwhq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers data-lens logfloat monad-codec
          parallel random sgd vector vector-binary vector-th-unbox
        ];
@@ -36893,7 +37795,7 @@ self: {
        pname = "crf-chain1-constrained";
        version = "0.3.2";
        sha256 = "02xf9q96rlmmfcdz45bpbsdi0ki7mdrdwzg2zph7b55jwsnb4fja";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers data-lens logfloat monad-codec
          parallel random sgd vector vector-binary vector-th-unbox
        ];
@@ -36912,7 +37814,7 @@ self: {
        pname = "crf-chain2-generic";
        version = "0.3.0";
        sha256 = "104r52rf5q84bm6977bsfm4djcz8c08warfkk4xmympb0cmxkhxy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary comonad-transformers containers data-lens
          logfloat monad-codec parallel sgd vector vector-binary
        ];
@@ -36932,7 +37834,7 @@ self: {
        pname = "crf-chain2-tiers";
        version = "0.2.4";
        sha256 = "0sxa5rsla676x47a1l8cvypccyl8vi7y68fnbnrk7r20ahw6vxi1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary comonad containers data-lens logfloat monad-codec
          parallel sgd vector vector-binary vector-th-unbox
        ];
@@ -36951,8 +37853,10 @@ self: {
        pname = "critbit";
        version = "0.2.0.0";
        sha256 = "1xdgaj73ffvj1q1kyi62bifbazmzgamfwzdbdz0c339axw5dga82";
-       buildDepends = [ array base bytestring deepseq text vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         array base bytestring deepseq text vector
+       ];
+       testHaskellDepends = [
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2 text transformers vector
        ];
@@ -36975,13 +37879,14 @@ self: {
        sha256 = "0f1d8lxb9jhrhcm0gbqqimmq52q36b5h1nqznmjmxa75nqdx9vaw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-wl-pprint base binary bytestring cassava containers
          deepseq directory filepath Glob hastache mtl mwc-random
          optparse-applicative parsec statistics text time transformers
          transformers-compat vector vector-algorithms
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -37001,13 +37906,13 @@ self: {
        pname = "criterion-plus";
        version = "0.1.3";
        sha256 = "127nqhp2gczbfqablvrrk92am4kpsnzhvyl4kcy98kdv313vcwdl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base criterion deepseq loch-th monad-control mtl
          optparse-applicative placeholders statistics string-conversions
          system-fileio system-filepath text th-printf transformers
          transformers-base vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base criterion deepseq HTF HUnit loch-th monad-control mtl
          optparse-applicative placeholders QuickCheck statistics
          string-conversions system-fileio system-filepath text th-printf
@@ -37030,7 +37935,7 @@ self: {
        sha256 = "010x56czgipw3p1cfkx07mlcy4yj6advq3zzgrxpmjhrxzsa89xn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers filepath
        ];
        jailbreak = true;
@@ -37045,7 +37950,7 @@ self: {
        pname = "crockford";
        version = "0.2";
        sha256 = "1fgsmf2k0v1j7b3gv06q9c65410qa2ivl59rwkm7j931wsymsg26";
-       buildDepends = [ base digits QuickCheck safe ];
+       libraryHaskellDepends = [ base digits QuickCheck safe ];
        description = "An implementation of Douglas Crockford's base32 encoding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37060,7 +37965,7 @@ self: {
        sha256 = "1krvcn5yb9i6jxwn2wwnpc8ylivhn27315a2sifn19f1l2vvy038";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bmp bytestring deepseq ghc-prim heap HUnit
          mersenne-random-pure64 mtl parallel
        ];
@@ -37079,17 +37984,16 @@ self: {
        pname = "cron";
        version = "0.3.0";
        sha256 = "18yadf94bzyhm5nab6lc8zagp39yv5k8cjjakhaxncgipcm30s9k";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base mtl mtl-compat old-locale text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base derive hspec hspec-expectations QuickCheck text
          time transformers-compat
        ];
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cron-compat" = callPackage
@@ -37101,11 +38005,11 @@ self: {
        pname = "cron-compat";
        version = "0.2.6";
        sha256 = "0km70j3xfqvpra9mvbxpvpqd7arjjfcpazmilvmj6kjxk6cw7pfx";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base mtl mtl-compat old-locale text time
          transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base cron derive hspec hspec-expectations QuickCheck
          text time transformers
        ];
@@ -37121,8 +38025,8 @@ self: {
        pname = "cruncher-types";
        version = "1.1.0";
        sha256 = "0kp0vm8mvgn12kk5csyhzv6g6az43acl6iwjbhvfdfr2mqif2b9h";
-       buildDepends = [ aeson base containers lens text ];
-       testDepends = [ base hlint ];
+       libraryHaskellDepends = [ aeson base containers lens text ];
+       testHaskellDepends = [ base hlint ];
        homepage = "http://github.com/eval-so/cruncher-types";
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
@@ -37138,7 +38042,7 @@ self: {
        sha256 = "08341mvdca70nlkdi2im344hhkv62s278a1gkp02hj0zrixzfkqm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filelock filepath process SHA text time
          transformers unix
        ];
@@ -37156,7 +38060,7 @@ self: {
        pname = "crypto-api";
        version = "0.13.2";
        sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal entropy tagged transformers
        ];
        homepage = "https://github.com/TomMD/crypto-api";
@@ -37173,7 +38077,7 @@ self: {
        pname = "crypto-api-tests";
        version = "0.3";
        sha256 = "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal crypto-api directory filepath HUnit
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -37191,7 +38095,7 @@ self: {
        pname = "crypto-cipher-benchmarks";
        version = "0.0.5";
        sha256 = "1ddyz0fn3srvm37afbiw86lv0z7iwrmnhazgvk0gg5n3ic57anhq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring criterion crypto-cipher-types mtl pretty
          securemem
        ];
@@ -37210,12 +38114,12 @@ self: {
        pname = "crypto-cipher-tests";
        version = "0.0.11";
        sha256 = "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types HUnit mtl QuickCheck
          securemem test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-types HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -37230,7 +38134,7 @@ self: {
        pname = "crypto-cipher-types";
        version = "0.0.9";
        sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0";
-       buildDepends = [ base byteable bytestring securemem ];
+       libraryHaskellDepends = [ base byteable bytestring securemem ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher types";
        license = stdenv.lib.licenses.bsd3;
@@ -37245,7 +38149,7 @@ self: {
        pname = "crypto-classical";
        version = "0.1.0";
        sha256 = "06x694ia1alw53a282krzmkbcr1xbvn5nmgfqbgysgpz5ky931wg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers crypto-numbers crypto-random lens
          modular-arithmetic QuickCheck random random-shuffle text
          transformers
@@ -37264,11 +38168,11 @@ self: {
        pname = "crypto-conduit";
        version = "0.5.5";
        sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra crypto-api resourcet
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal conduit conduit-extra crypto-api
          cryptocipher cryptohash-cryptoapi hspec skein transformers
        ];
@@ -37285,13 +38189,13 @@ self: {
      mkDerivation {
        pname = "crypto-numbers";
        version = "0.2.7";
-       revision = "1";
        sha256 = "19l9y5jzvqrqfam13xin9m9ca0s5ql86yv0cjn6dzkydx4byn2j2";
+       revision = "1";
        editedCabalFile = "2b493386b7605b70a67f751d6496e9feff8ef319a5294b122a3ff3895a8453ca";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-random ghc-prim integer-gmp vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-random tasty tasty-hunit
          tasty-quickcheck vector
        ];
@@ -37309,11 +38213,11 @@ self: {
        pname = "crypto-pubkey";
        version = "0.2.8";
        sha256 = "0vmmx2fqq2xc3xfavy22i2nyynpk88jhmjr62qgxw5w5qgsz5k60";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-numbers crypto-pubkey-types
          crypto-random cryptohash
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-numbers crypto-pubkey-types
          crypto-random cryptohash tasty tasty-hunit tasty-kat
          tasty-quickcheck
@@ -37333,11 +38237,11 @@ self: {
        pname = "crypto-pubkey-openssh";
        version = "0.2.7";
        sha256 = "0ndb1crjl3xbd18bfs3ipqbzn120mpqnn27jfi4vjqf5ak48b444";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types attoparsec base base64-bytestring
          bytestring cereal crypto-pubkey-types pem
        ];
-       testDepends = [
+       testHaskellDepends = [
          asn1-encoding asn1-types attoparsec base base64-bytestring
          bytestring cereal crypto-pubkey-types deepseq filepath pem process
          QuickCheck tasty tasty-quickcheck temporary
@@ -37353,7 +38257,7 @@ self: {
        pname = "crypto-pubkey-types";
        version = "0.4.3";
        sha256 = "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby";
-       buildDepends = [ asn1-encoding asn1-types base ];
+       libraryHaskellDepends = [ asn1-encoding asn1-types base ];
        homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
        description = "Generic cryptography Public keys algorithm types";
        license = stdenv.lib.licenses.bsd3;
@@ -37365,7 +38269,7 @@ self: {
        pname = "crypto-random";
        version = "0.0.9";
        sha256 = "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp";
-       buildDepends = [ base bytestring securemem unix vector ];
+       libraryHaskellDepends = [ base bytestring securemem unix vector ];
        homepage = "http://github.com/vincenthz/hs-crypto-random";
        description = "Simple cryptographic random related types";
        license = stdenv.lib.licenses.bsd3;
@@ -37377,7 +38281,7 @@ self: {
        pname = "crypto-random-api";
        version = "0.2.0";
        sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
-       buildDepends = [ base bytestring entropy ];
+       libraryHaskellDepends = [ base bytestring entropy ];
        homepage = "http://github.com/vincenthz/hs-crypto-random-api";
        description = "Simple random generators API for cryptography related code";
        license = stdenv.lib.licenses.bsd3;
@@ -37390,10 +38294,10 @@ self: {
      mkDerivation {
        pname = "crypto-random-effect";
        version = "0.2.0.4.1";
-       revision = "1";
        sha256 = "1gj40r6i79jvsghyv4nqm3yrjlby9fkxxhzp0lkr5j1b9b3b2xwr";
+       revision = "1";
        editedCabalFile = "f217573816b1efe3fcc9b1dcbd6325015bc9a87872200547f56a80ec2b959c31";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-random extensible-effects securemem
          transformers
        ];
@@ -37411,7 +38315,7 @@ self: {
        pname = "crypto-totp";
        version = "0.1.0.1";
        sha256 = "0vkjkyaxp0rb4n2p7gdbbswm32gvbsbqnb6xs9hh4rncfaghpqds";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers cryptohash tagged unix
        ];
        description = "Provides generation and verification services for time-based one-time keys";
@@ -37426,7 +38330,7 @@ self: {
        pname = "cryptocipher";
        version = "0.6.2";
        sha256 = "0ip3a2as0df6drl29sryayxx22sx55v6bs60s2fh3i1nxqnydf9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cipher-aes cipher-blowfish cipher-camellia cipher-des
          cipher-rc4 crypto-cipher-types
        ];
@@ -37443,8 +38347,8 @@ self: {
        pname = "cryptohash";
        version = "0.11.6";
        sha256 = "0dyzcaxr8vhzqq9hj4240rxpi87h4ps87yz09klz723shls26f6s";
-       buildDepends = [ base byteable bytestring ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base byteable bytestring ghc-prim ];
+       testHaskellDepends = [
          base byteable bytestring HUnit QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
@@ -37461,7 +38365,7 @@ self: {
        pname = "cryptohash-conduit";
        version = "0.1.1";
        sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra cryptohash resourcet
          transformers
        ];
@@ -37478,7 +38382,7 @@ self: {
        pname = "cryptohash-cryptoapi";
        version = "0.1.3";
        sha256 = "0wj53p32js8lfg0i8akrljpash0jdiyv2vcqpmjbd4dq2fx81w2n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal crypto-api cryptohash tagged
        ];
        homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi";
@@ -37499,13 +38403,17 @@ self: {
        sha256 = "07aai72kg66skdnbydy25a07124znvrixbw91gk4n9430gsvv26z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ansi-terminal array async base containers deepseq directory
-         filepath gitrev GraphSCC haskeline heredoc monadLib old-time
-         presburger pretty process QuickCheck random sbv smtLib syb
-         template-haskell text tf-random transformers utf8-string
+       libraryHaskellDepends = [
+         array async base containers deepseq directory filepath gitrev
+         GraphSCC heredoc monadLib old-time presburger pretty process
+         QuickCheck random sbv smtLib syb template-haskell text tf-random
+         transformers utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         ansi-terminal base containers deepseq directory filepath haskeline
+         monadLib process random sbv tf-random transformers
        ];
-       buildTools = [ alex happy ];
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -37520,10 +38428,10 @@ self: {
        pname = "cryptonite";
        version = "0.6";
        sha256 = "0lzqmhslq1pwj6pp82l3vdnnxbqvh0bqjyl02x2yp6sp72mcq5m0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring memory tasty tasty-hunit tasty-kat
          tasty-quickcheck
        ];
@@ -37542,7 +38450,7 @@ self: {
        pname = "cryptsy-api";
        version = "0.2.1";
        sha256 = "1knnzh77y4rr7ka2nfwr99z61v2pvx2p1mzji06ac0mjk2n80ybs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring deepseq either http-client http-client-tls
          old-locale pipes-attoparsec pipes-http text time transformers
          unordered-containers vector
@@ -37559,7 +38467,7 @@ self: {
        pname = "crystalfontz";
        version = "0.1";
        sha256 = "14mh098kgckncips17bdsbg08q78xk1114174zq860z4znmc1gxv";
-       buildDepends = [ base crc16-table MaybeT serialport ];
+       libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37571,7 +38479,7 @@ self: {
        pname = "cse-ghc-plugin";
        version = "0.1.1";
        sha256 = "123x10ircbj8lrsqapf6cb9b3ibjgp1q8l862a3i6i0ak7ash49f";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        homepage = "http://thoughtpolice.github.com/cse-ghc-plugin";
        description = "Compiler plugin for common subexpression elimination";
        license = stdenv.lib.licenses.bsd3;
@@ -37584,7 +38492,7 @@ self: {
        pname = "csound-catalog";
        version = "0.2.2";
        sha256 = "0rrd0gk6z16ydpn90i4siy3p7d1qxb14q022r3mqmj792c1v6z5p";
-       buildDepends = [ base csound-expression transformers ];
+       libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
@@ -37600,7 +38508,7 @@ self: {
        pname = "csound-expression";
        version = "4.8.2";
        sha256 = "1zhx4smvs8xnqfcv2hxhq57n16cl3sycz659viw8l6v8f36ibj5i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean colour csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
          process temporal-media transformers
@@ -37619,7 +38527,7 @@ self: {
        pname = "csound-expression-dynamic";
        version = "0.1.4.3";
        sha256 = "1rzfah8d7j7s45w6zvrs5sabplcapx6njaimkmvfj9dby2brxprw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          transformers wl-pprint
        ];
@@ -37636,7 +38544,7 @@ self: {
        pname = "csound-expression-opcodes";
        version = "0.0.3";
        sha256 = "0f7nwrnrpsi31q9vaxy2yihripzqjzp6683qy94ljkmxmfnm9sb5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base csound-expression-dynamic csound-expression-typed transformers
        ];
        description = "opcodes for the library csound-expression";
@@ -37653,7 +38561,7 @@ self: {
        pname = "csound-expression-typed";
        version = "0.0.7.7";
        sha256 = "1z9hvkgl6lqwrdhngq79425s2frhkg4llkcpsar21d5ld4fhzfdl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq ghc-prim stable-maps temporal-media
          transformers wl-pprint
@@ -37670,7 +38578,7 @@ self: {
        pname = "csound-sampler";
        version = "0.0.6.2";
        sha256 = "0qgz3k6cw5hzp5la051xnmg3697p7yfdamn8r6mp7ca4fai311h0";
-       buildDepends = [ base csound-expression transformers ];
+       libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
        license = stdenv.lib.licenses.bsd3;
@@ -37683,7 +38591,7 @@ self: {
        pname = "csp";
        version = "1.0";
        sha256 = "0skz2yx8armbr0x7vhixxkbm7qbspg38723x98k6kysz7n5nzw2c";
-       buildDepends = [ base containers mtl nondeterminism ];
+       libraryHaskellDepends = [ base containers mtl nondeterminism ];
        description = "Discrete constraint satisfaction problem (CSP) solvers";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37698,7 +38606,9 @@ self: {
        sha256 = "1yz94yvggw6a7fh2p7fszyp02nnk7labbl6z079gqn3smayzfs31";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath haskeline libcspm mtl ];
+       executableHaskellDepends = [
+         base directory filepath haskeline libcspm mtl
+       ];
        homepage = "https://github.com/tomgr/libcspm";
        description = "A command line type checker for CSPM files";
        license = stdenv.lib.licenses.bsd3;
@@ -37711,7 +38621,7 @@ self: {
        pname = "css";
        version = "0.2";
        sha256 = "150gdsf059x658z6cbclrydzbynw06nhrpf4i1l9gwb6siarvjv9";
-       buildDepends = [ base mtl text ];
+       libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37723,8 +38633,8 @@ self: {
        pname = "css-text";
        version = "0.1.2.1";
        sha256 = "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw";
-       buildDepends = [ attoparsec base text ];
-       testDepends = [ attoparsec base hspec QuickCheck text ];
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
        homepage = "http://www.yesodweb.com/";
        description = "CSS parser and renderer";
        license = stdenv.lib.licenses.bsd3;
@@ -37736,7 +38646,7 @@ self: {
        pname = "csv";
        version = "0.1.2";
        sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c";
-       buildDepends = [ base filepath parsec ];
+       libraryHaskellDepends = [ base filepath parsec ];
        description = "CSV loader and dumper";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37754,13 +38664,17 @@ self: {
        sha256 = "12sxxv92qblsa63zdnl80a8yk01b4cvk9k6h58w82bvcy5m0aabk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring conduit
-         conduit-extra containers data-default directory ghc-prim mmorph
-         monad-control mtl primitive resourcet text transformers
-         unordered-containers vector
+         conduit-extra containers data-default ghc-prim mmorph monad-control
+         mtl primitive resourcet text transformers unordered-containers
+         vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory mtl primitive text
+         transformers vector
+       ];
+       testHaskellDepends = [
          base bytestring containers directory HUnit mtl primitive
          test-framework test-framework-hunit text transformers vector
        ];
@@ -37778,7 +38692,7 @@ self: {
        pname = "csv-enumerator";
        version = "0.10.2.0";
        sha256 = "0n1zc9rwzj9w39nmjfn65qawj19b6zay3d62ss2crnxbgqnh07gh";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring containers
          directory enumerator safe transformers unix-compat
        ];
@@ -37797,7 +38711,7 @@ self: {
        sha256 = "0898553pikxjgmycdyiw92bbmzxgbl4dl8029qljyjzlzlasj7by";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring csv html tabular text txt-sushi vector
        ];
        description = "A collection of CSV tools";
@@ -37814,10 +38728,10 @@ self: {
        sha256 = "1mfy19fvi92zzzqn70ga2p5csmc8qm0qnkn3vyl41ic6f69vm73x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base explicit-exception regex-tdfa split spreadsheet
        ];
-       testDepends = [ base Cabal hspec regex-tdfa split ];
+       testHaskellDepends = [ base Cabal hspec regex-tdfa split ];
        homepage = "https://github.com/mrVanDalo/csv-to-qif/";
        description = "A small program that will read csv files and create qif files";
        license = stdenv.lib.licenses.bsd3;
@@ -37829,8 +38743,8 @@ self: {
        pname = "ctemplate";
        version = "0.1";
        sha256 = "02xsw0zpg728cq018w6zjgbzk6d7px62mapn40gir9c0hi6rqlx8";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ ctemplate ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ ctemplate ];
        homepage = "http://darcs.imperialviolet.org/ctemplate";
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
@@ -37843,7 +38757,7 @@ self: {
        pname = "ctkl";
        version = "0.27.0.0";
        sha256 = "0sqrg04zlwq62jggjvrd1dq7a2alwx2190w6b19d3jn51n0s907m";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        jailbreak = true;
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
        license = stdenv.lib.licenses.bsd3;
@@ -37856,7 +38770,7 @@ self: {
        pname = "ctpl";
        version = "0.1.0.1";
        sha256 = "1mbqgbig5n8rrkxmrdbcl8qafa2r58c2pial2b67yr6cw08v0srv";
-       buildDepends = [ base chatty-text chatty-utils ];
+       libraryHaskellDepends = [ base chatty-text chatty-utils ];
        jailbreak = true;
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
@@ -37871,8 +38785,8 @@ self: {
        pname = "ctrie";
        version = "0.1.0.2";
        sha256 = "11ylwjmp015ppisczggzj1x7mfg1bfg4g4qg0s91xrrgms78r014";
-       buildDepends = [ atomic-primops base hashable primitive ];
-       testDepends = [
+       libraryHaskellDepends = [ atomic-primops base hashable primitive ];
+       testHaskellDepends = [
          base containers hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -37891,8 +38805,13 @@ self: {
        sha256 = "0shclcwnh1az40ckvmhpw93xbhrr19wfhhvclcnv2fijy29667yp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cereal containers hspec STL ];
-       testDepends = [ base bytestring cereal containers hspec STL ];
+       libraryHaskellDepends = [ base bytestring cereal containers STL ];
+       executableHaskellDepends = [
+         base bytestring cereal containers hspec STL
+       ];
+       testHaskellDepends = [
+         base bytestring cereal containers hspec STL
+       ];
        description = "Cubic DSL for 3D printing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37907,10 +38826,10 @@ self: {
        sha256 = "1n44d39s3r5iakbhjf99w49gb1y8l1xl46lz40jkhx7k4knwb1fj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base BNFC directory filepath haskeline mtl transformers
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "https://github.com/simhu/cubical";
        description = "Implementation of Univalence in Cubical Sets";
        license = stdenv.lib.licenses.mit;
@@ -37924,8 +38843,8 @@ self: {
        pname = "cubicbezier";
        version = "0.3.0";
        sha256 = "1d5mr1xr1y7qnb65ybf6gncndzdz63di3gxrzwykks706ry475sr";
-       buildDepends = [ base containers integration ];
-       testDepends = [ base parsec tasty tasty-hunit ];
+       libraryHaskellDepends = [ base containers integration ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Efficient manipulating of 2D cubic bezier curves";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37936,7 +38855,7 @@ self: {
        pname = "cubicspline";
        version = "0.1.1";
        sha256 = "0n4c80vjf8sh5wf1n0qp9z8v8z7mj7rfygjg5a02sz0s6l7q1i8s";
-       buildDepends = [ base hmatrix safe ];
+       libraryHaskellDepends = [ base hmatrix safe ];
        description = "Natural cubic spline interpolation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37949,11 +38868,11 @@ self: {
        pname = "cublas";
        version = "0.2.1.0";
        sha256 = "02x8a9varkj770cl4nnb0mf4qh519gf9mv51awinlaikyz932q1w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cuda filepath language-c storable-complex template-haskell
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ cublas cusparse ];
+       librarySystemDepends = [ cublas cusparse ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "https://github.com/bmsherman/cublas";
        description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries";
@@ -37968,7 +38887,7 @@ self: {
        sha256 = "08l8qf98d5p9d5qyj3kh35rzp8fih77bd2pras4dkn7an39pmr6b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT Yampa ];
+       executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37981,8 +38900,9 @@ self: {
        sha256 = "10c2nn0qhhznajpkjvmxivz3w6zr96fpsych53hnvpi2g6a332k1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring pretty ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base bytestring ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base pretty ];
        homepage = "https://github.com/tmcdonell/cuda";
        description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
        license = stdenv.lib.licenses.bsd3;
@@ -37996,9 +38916,9 @@ self: {
        pname = "cudd";
        version = "0.1.0.2";
        sha256 = "0zhsj4qrvk1q1rj55nsysznv11m1x31dg7gxmgp5wdsk8l18w02r";
-       buildDepends = [ array base mtl transformers ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ cudd dddmp epd mtr st util ];
+       libraryHaskellDepends = [ array base mtl transformers ];
+       librarySystemDepends = [ cudd dddmp epd mtr st util ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/adamwalker/haskell_cudd";
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
@@ -38012,8 +38932,8 @@ self: {
        pname = "cufft";
        version = "0.1.2.1";
        sha256 = "1qkrp2dwfpivf5j42a7wij61010a3rmldxng4j8ivkrc7vllv76j";
-       buildDepends = [ base cuda ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base cuda ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/robeverest/cufft";
        description = "Haskell bindings for the CUFFT library";
        license = stdenv.lib.licenses.bsd3;
@@ -38025,8 +38945,8 @@ self: {
        pname = "curl";
        version = "1.3.8";
        sha256 = "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh";
-       buildDepends = [ base bytestring containers ];
-       extraLibraries = [ curl ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ curl ];
        description = "Haskell binding to libcurl";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) curl;};
@@ -38037,7 +38957,7 @@ self: {
        pname = "curl-aeson";
        version = "0.0.4";
        sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx";
-       buildDepends = [ aeson base curl text utf8-string ];
+       libraryHaskellDepends = [ aeson base curl text utf8-string ];
        homepage = "https://github.com/zouppen/haskell-curl-aeson";
        description = "Communicate with HTTP service using JSON";
        license = stdenv.lib.licenses.bsd3;
@@ -38048,11 +38968,11 @@ self: {
      mkDerivation {
        pname = "curlhs";
        version = "0.1.6";
-       revision = "1";
        sha256 = "1yh7rfk9ppglpjymzzi2yc44g9bp0irnl2yvj77y55djdkmckq3b";
+       revision = "1";
        editedCabalFile = "ac8dbe0348ce66746774f019fe62dbdaf40a200bed62f5b7fb0ecb9bd11cfa1c";
-       buildDepends = [ base bytestring rtld time ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base bytestring rtld time ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/kkardzis/curlhs";
        description = "bindings to libcurl, the multiprotocol file transfer library";
        license = "unknown";
@@ -38065,7 +38985,9 @@ self: {
        pname = "currency";
        version = "0.2.0.0";
        sha256 = "0yj1x7zmkmwr9az55i9gvf84m7i3b4qi80p8qk9hszzlv7rigmdw";
-       buildDepends = [ base containers hashable iso3166-country-codes ];
+       libraryHaskellDepends = [
+         base containers hashable iso3166-country-codes
+       ];
        homepage = "https://github.com/singpolyma/currency-haskell";
        description = "Types representing standard and non-standard currencies";
        license = "unknown";
@@ -38077,7 +38999,7 @@ self: {
        pname = "current-locale";
        version = "0.2.0.1";
        sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5";
-       buildDepends = [ base old-locale process split ];
+       libraryHaskellDepends = [ base old-locale process split ];
        homepage = "https://github.com/koterpillar/current-locale";
        description = "Get the current system locale in System.Locale format";
        license = stdenv.lib.licenses.mit;
@@ -38091,7 +39013,7 @@ self: {
        pname = "curry-base";
        version = "0.2.9";
        sha256 = "0sdwygsbqmvcbzi7zsr0jd02s2r19pc7zsk4b6hjxv4vzjc9f120";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl old-time pretty syb
        ];
        homepage = "http://www.curry-language.org";
@@ -38110,8 +39032,9 @@ self: {
        sha256 = "1igys4i7wwj1ildkf4is66gq22zsjg158kv3ald5xiilwkmvfc4h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers curry-base filepath mtl old-time pretty syb
+       libraryHaskellDepends = [ filepath ];
+       executableHaskellDepends = [
+         base containers curry-base mtl old-time pretty syb
        ];
        homepage = "http://www.curry-language.org";
        description = "Compile the functional logic language Curry to several intermediate formats";
@@ -38129,7 +39052,7 @@ self: {
        sha256 = "045lfyhpwjgcdw3wxj2klq0aqn555f5r4w95fr06vsq5pxspnnvc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring csv-enumerator enumerator hscurses mtl natural-sort
          parseargs regex-tdfa safe unix
        ];
@@ -38147,8 +39070,8 @@ self: {
        pname = "curve25519";
        version = "0.2.1";
        sha256 = "1kfs7cjxig0rk17nb7dzi189msww90yw0066rlalw01kff5w2hdy";
-       buildDepends = [ base bytestring crypto-api ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring crypto-api ];
+       testHaskellDepends = [
          base bytestring crypto-api DRBG HUnit QuickCheck tagged
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -38166,7 +39089,7 @@ self: {
        pname = "curves";
        version = "1.1.0.1";
        sha256 = "0zmy9an40wnxjhqjhlvsg0jy4bqqby6hl8ckjcm0406988ma8mi6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers filepath HaXml JuicyPixels QuickCheck
        ];
        description = "Library for drawing curve based images";
@@ -38180,7 +39103,7 @@ self: {
        pname = "custom-prelude";
        version = "0.2.2.0";
        sha256 = "00lkpkl79kznib0s6xm644f3k13dv59x5z06ccymvx6l6iqxyzn6";
-       buildDepends = [ base basic-prelude monad-loops ];
+       libraryHaskellDepends = [ base basic-prelude monad-loops ];
        jailbreak = true;
        homepage = "https://github.com/ajnsit/custom-prelude";
        description = "An enhanced prelude, serving as a foundation for my projects";
@@ -38197,13 +39120,15 @@ self: {
        sha256 = "1bdhs4dy9yfgc9j281rxiiy9md3s27yy44scz86s29vbm7prccvp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         allocated-processor base HOpenCV vector-space
+       ];
+       executableHaskellDepends = [
          allocated-processor base graphics-drawingcombinators HOpenCV SDL
          vector-space
        ];
        description = "Functional Combinators for Computer Vision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cyclotomic" = callPackage
@@ -38212,7 +39137,7 @@ self: {
        pname = "cyclotomic";
        version = "0.4.3";
        sha256 = "14rfyxmqjrlirszk2mrqm030rya6cbcydbf7fl7if82y21qrfg0p";
-       buildDepends = [ arithmoi base containers ];
+       libraryHaskellDepends = [ arithmoi base containers ];
        jailbreak = true;
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
@@ -38228,7 +39153,7 @@ self: {
        pname = "cypher";
        version = "0.8.1";
        sha256 = "0f79791j9nczm80cifpc4iq5pqkhca67s94c5wqm0kiprlxblc53";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring classy-parallel conduit
          http-conduit http-types resourcet text transformers
          transformers-base unordered-containers vector
@@ -38251,14 +39176,14 @@ self: {
        pname = "d-bus";
        version = "0.1.2";
        sha256 = "176brypscws03sswda215ywc6l5hj6l5iw4vkfrcppzycdyh3yd2";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers data-binary-ieee754 data-default
          exceptions free hslogger mtl network singletons stm
          template-haskell text transformers xml-conduit xml-picklers
          xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring mtl QuickCheck singletons tasty
          tasty-quickcheck tasty-th text xml-hamlet
        ];
@@ -38273,7 +39198,7 @@ self: {
        pname = "d3js";
        version = "0.1.0.0";
        sha256 = "0wrxvfgss9fiv1pwsdi1md0plc4mf9sadkhgm46dsfq16dwrp3q2";
-       buildDepends = [ base mtl random text ];
+       libraryHaskellDepends = [ base mtl random text ];
        jailbreak = true;
        homepage = "https://github.com/nebuta/d3js-haskell";
        description = "Declarative visualization on a web browser with DSL approach";
@@ -38286,7 +39211,7 @@ self: {
        pname = "daemonize-doublefork";
        version = "0.1.1";
        sha256 = "1g446qxff8ajv44341y0f9v39j8idmnn23lwi08gq3ps4qrz0py2";
-       buildDepends = [ base directory unix ];
+       libraryHaskellDepends = [ base directory unix ];
        homepage = "https://github.com/scvalex/daemonize-doublefork";
        description = "Start background daemons by double-forking";
        license = stdenv.lib.licenses.gpl3;
@@ -38303,11 +39228,15 @@ self: {
        sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cereal containers data-default directory filepath
-         ghc-prim network pipes transformers unix
+       libraryHaskellDepends = [
+         base bytestring cereal data-default directory filepath ghc-prim
+         network pipes transformers unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring cereal containers data-default ghc-prim network
+         pipes transformers
+       ];
+       testHaskellDepends = [
          base data-default directory ghc-prim HUnit test-framework
          test-framework-hunit unix
        ];
@@ -38324,8 +39253,10 @@ self: {
        pname = "dag";
        version = "0.1.0.2";
        sha256 = "0khfyyzqzw7jj4n8p1k96wdrb2087jd380fzhlkmf0g7s4346pvp";
-       buildDepends = [ base constraints singletons ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base constraints singletons ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "Compile-time, type-safe directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38339,10 +39270,10 @@ self: {
        pname = "damnpacket";
        version = "0.6.0";
        sha256 = "137ckcsy2a9f8xfw83rapl2msb6z0pdlsksay5qkymxcpfwrabyb";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq text
        ];
-       testDepends = [ base containers QuickCheck text ];
+       testHaskellDepends = [ base containers QuickCheck text ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/damnpacket";
        description = "Parsing dAmn packets";
@@ -38360,12 +39291,17 @@ self: {
        sha256 = "0caas3ql32925rzsghb7rdrm17bw3hn84cizkl9dqmz6nwlhclk9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers Crypto data-binary-ieee754
          deepseq directory filepath mtl process random time transformers
          utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base binary bytestring containers Crypto data-binary-ieee754
+         deepseq directory filepath mtl process random time transformers
+         utf8-string
+       ];
+       testHaskellDepends = [
          array base binary bytestring containers Crypto data-binary-ieee754
          deepseq directory filepath mtl process random time transformers
          utf8-string
@@ -38385,7 +39321,7 @@ self: {
        sha256 = "0idi472qqks286fbw718vddk5kc3vxicrb8m38sllw6x663xnljz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers explicit-exception multiarg old-locale parsec
          prednote rainbow text time transformers
        ];
@@ -38399,10 +39335,10 @@ self: {
   "darcs" = callPackage
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
-     , dataenc, directory, filepath, FindBin, ghc, hashable, haskeline
-     , html, HTTP, HUnit, mmap, mtl, network, network-uri, old-time
-     , parsec, process, QuickCheck, random, regex-applicative
-     , regex-compat-tdfa, shelly, split, tar, terminfo, test-framework
+     , dataenc, directory, filepath, FindBin, hashable, haskeline, html
+     , HTTP, HUnit, mmap, mtl, network, network-uri, old-time, parsec
+     , process, QuickCheck, random, regex-applicative, regex-compat-tdfa
+     , shelly, split, tar, terminfo, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
      , transformers, transformers-compat, unix, unix-compat, utf8-string
      , vector, zip-archive, zlib
@@ -38411,9 +39347,10 @@ self: {
        pname = "darcs";
        version = "2.10.1";
        sha256 = "157faxxzziaj79ln1qqvrii1vnafyknfbnmgl4y5krw06ys6bvzi";
+       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base base16-bytestring binary bytestring
          containers cryptohash data-ordlist dataenc directory filepath
          hashable haskeline html HTTP mmap mtl network network-uri old-time
@@ -38421,15 +39358,15 @@ self: {
          terminfo text time transformers transformers-compat unix
          unix-compat utf8-string vector zip-archive zlib
        ];
-       testDepends = [
+       librarySystemDepends = [ curl ];
+       executableHaskellDepends = [ base filepath regex-compat-tdfa ];
+       testHaskellDepends = [
          array base binary bytestring cmdargs containers cryptohash dataenc
-         directory filepath FindBin ghc html HUnit mmap mtl parsec process
+         directory filepath FindBin html HUnit mmap mtl parsec process
          QuickCheck regex-compat-tdfa shelly split test-framework
          test-framework-hunit test-framework-quickcheck2 text unix-compat
          zip-archive zlib
        ];
-       extraLibraries = [ curl ];
-       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -38451,7 +39388,7 @@ self: {
        sha256 = "1qwh4yas6alp65lwimh8xlz3i572nxn4iwqsppx7qqlj8kjhbyvj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs containers datetime directory filepath
          hs-gchart html HTTP json mtl network old-locale process regex-posix
          SHA split statistics strict tabular tar time utf8-string uvector
@@ -38477,13 +39414,20 @@ self: {
        sha256 = "0jkgy8k2i7hhcl7dzm4zvbm0q189hhp4cza9aslslzcq15jsa225";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory extensible-exceptions
          filepath hashed-storage haskeline html HTTP mmap mtl network
          old-time parsec process random regex-compat tar terminfo text unix
          vector zlib
        ];
-       extraLibraries = [ curl ];
+       librarySystemDepends = [ curl ];
+       executableHaskellDepends = [
+         array base bytestring containers directory extensible-exceptions
+         filepath hashed-storage haskeline html HTTP mmap mtl network
+         old-time parsec process random regex-compat tar terminfo text unix
+         vector zlib
+       ];
+       executableSystemDepends = [ curl ];
        jailbreak = true;
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
@@ -38501,7 +39445,7 @@ self: {
        sha256 = "0c82r7bgz8wj172q1n4dfz9kfn4466v7k159vlkfdqv7as0qj8qf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile directory hslogger MissingH network parsec process
          regex-compat unix
        ];
@@ -38521,11 +39465,11 @@ self: {
        sha256 = "1lc1v30zmlcrp6i22d3arghqhy9pjncddr34df6zd8s0r9wsi61d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory html HUnit mtl old-time
          parsec process QuickCheck regex-compat unix
        ];
-       extraLibraries = [ curl ncurses zlib ];
+       executableSystemDepends = [ curl ncurses zlib ];
        homepage = "http://darcs.net/";
        description = "David's Advanced Version Control System";
        license = "GPL";
@@ -38544,7 +39488,7 @@ self: {
        sha256 = "1a49v3l9n5cqlmdpjj8mzz5v6b47my84id62ag7004ynr11vih9s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring cmdlib containers darcs datetime
          directory filepath hashed-storage mtl old-time utf8-string
        ];
@@ -38563,7 +39507,7 @@ self: {
        sha256 = "01404plnjrds57lf7widss2piwpal9khl0gq22xkswj68zzfjcv6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory old-locale old-time process
          time
        ];
@@ -38582,7 +39526,9 @@ self: {
        sha256 = "0rp6flaizbaxzr28fr82vaacl4wajh6zdqnwcbgyhwz5dj7rdanq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory HaXml mtl process ];
+       executableHaskellDepends = [
+         base containers directory HaXml mtl process
+       ];
        jailbreak = true;
        homepage = "http://wiki.darcs.net/RelatedSoftware/DarcsMonitor";
        description = "Darcs repository monitor (sends email)";
@@ -38596,7 +39542,7 @@ self: {
        pname = "darcs-scripts";
        version = "0.1.1";
        sha256 = "06gs18s89nc5qyicfpkj0hz999l5pf4glhlanm2yhyd6lxbfgkba";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Shell scripts for support of darcs workflow";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38612,7 +39558,7 @@ self: {
        sha256 = "0r6hri2kpfq7r0c25qrlrj5y9pi2j76njvwsgrpnpm6p4gg151wk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers darcs graph-wrapper string-conversions
        ];
        jailbreak = true;
@@ -38636,7 +39582,7 @@ self: {
        sha256 = "1dz87a6a6bmi2sfk0q21syipgnhpg9fdlr86m7sdrlk4s9s1s0c5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base base64-string blaze-builder blaze-html blaze-markup
          bytestring containers CouchDB darcs directory filepath harp
          hashed-storage highlighting-kate HsOpenSSL hsp http-conduit HUnit
@@ -38663,7 +39609,7 @@ self: {
        sha256 = "1gl0wplzlhb6ynacq7bv38ijhazpwr642zc0a2dixbpibchgxksf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cgi concurrentoutput containers Crypto directory
          filepath HTTP mime-string mtl nano-md5 network old-locale old-time
          parsec process regex-compat safe time unix xhtml zlib
@@ -38682,16 +39628,18 @@ self: {
      mkDerivation {
        pname = "darkplaces-demo";
        version = "0.1";
-       revision = "1";
        sha256 = "0map78fnnqm2nlh92xrxmg3fs9q2hb4pl87hyara41v2dvwlsj3f";
+       revision = "1";
        editedCabalFile = "d16b0f7e29060476084a0457d38e524e1965b05e591af570197f287d574a8d01";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring containers darkplaces-text
-         data-binary-ieee754 directory mtl optparse-applicative regex-tdfa
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 regex-tdfa
          transformers
        ];
+       executableHaskellDepends = [
+         base bytestring darkplaces-text directory mtl optparse-applicative
+       ];
        jailbreak = true;
        homepage = "https://github.com/bacher09/darkplaces-demo";
        description = "Utility and parser for DarkPlaces demo files";
@@ -38707,10 +39655,10 @@ self: {
        pname = "darkplaces-rcon";
        version = "0.1";
        sha256 = "0ngxjb6zja7l905ixkr0cjyan21m311wc5dqdzacw5j5w7119v75";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring cryptohash network time
        ];
-       testDepends = [ base bytestring hspec hspec-core ];
+       testHaskellDepends = [ base bytestring hspec hspec-core ];
        jailbreak = true;
        homepage = "https://github.com/bacher09/darkplaces-rcon";
        description = "Darkplaces rcon client library";
@@ -38729,12 +39677,16 @@ self: {
        sha256 = "1xv9906ag2vgkzbk66f9r6lr5j6qwlwss246hjl7iriq315dmqlg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring ConfigFile containers darkplaces-rcon
          darkplaces-text directory filepath haskeline HostAndPort mtl
          optparse-applicative text time utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring darkplaces-rcon darkplaces-text haskeline mtl
+         optparse-applicative text utf8-string
+       ];
+       testHaskellDepends = [
          base bytestring darkplaces-rcon darkplaces-text hspec hspec-core
          text
        ];
@@ -38752,11 +39704,11 @@ self: {
        pname = "darkplaces-text";
        version = "0.2.1";
        sha256 = "12nsr005pk0v1nril61javh6nrjhqcvlif11mfhch8bvvcaiy4rm";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal array base bytestring text utf8-string vector
        ];
-       testDepends = [ base bytestring hspec QuickCheck ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/bacher09/darkplaces-text";
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
@@ -38773,12 +39725,11 @@ self: {
        sha256 = "1h22ay2cl5j2ngm2xi2hyvvprnmz48qcpzxiq9ldkzx8gg3gs36j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers direct-sqlite directory either filepath ghc
          haddock-api optparse-applicative parsec pipes sqlite-simple tagsoup
          text transformers
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/jfeltz/dash-haskell";
        description = "Convert package Haddock to Dash docsets (IDE docs)";
        license = stdenv.lib.licenses.gpl3;
@@ -38790,7 +39741,7 @@ self: {
        pname = "data-accessor";
        version = "0.2.2.6";
        sha256 = "0668qgllmp2911ppsb0g9z95nq2x0h2cvzyyjlb6iwhnjzyyg7gf";
-       buildDepends = [ array base containers transformers ];
+       libraryHaskellDepends = [ array base containers transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
@@ -38802,7 +39753,7 @@ self: {
        pname = "data-accessor-monadLib";
        version = "0.0.1";
        sha256 = "0l1ywmr4jry4cys7lq6k0w0nsdpqj1g5l3vsnxyf0ai1901zk18i";
-       buildDepends = [ base data-accessor monadLib ];
+       libraryHaskellDepends = [ base data-accessor monadLib ];
        jailbreak = true;
        description = "Accessor functions for monadLib's monads";
        license = "unknown";
@@ -38814,7 +39765,9 @@ self: {
        pname = "data-accessor-monads-fd";
        version = "0.2.0.3";
        sha256 = "1yvfk55qra7f9ggcybw3j68xg9dzx2f07swj99v4f588gh32ixhz";
-       buildDepends = [ base data-accessor monads-fd transformers ];
+       libraryHaskellDepends = [
+         base data-accessor monads-fd transformers
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in monads-fd State monad class";
@@ -38827,7 +39780,9 @@ self: {
        pname = "data-accessor-monads-tf";
        version = "0.2.1.4";
        sha256 = "12skayn01s8svfdr4h5am2y2dw7ax6s83pb7vy3jxyddywpm04mk";
-       buildDepends = [ base data-accessor monads-tf transformers ];
+       libraryHaskellDepends = [
+         base data-accessor monads-tf transformers
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in monads-tf State monad type family";
@@ -38840,7 +39795,7 @@ self: {
        pname = "data-accessor-mtl";
        version = "0.2.0.4";
        sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
-       buildDepends = [ base data-accessor mtl ];
+       libraryHaskellDepends = [ base data-accessor mtl ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in mtl State monad class";
        license = stdenv.lib.licenses.bsd3;
@@ -38853,7 +39808,9 @@ self: {
        pname = "data-accessor-template";
        version = "0.2.1.12";
        sha256 = "0pkr9qbvgysgsa28dpa77a21ghlgiykkcyl41gpr4s7jl9wjs107";
-       buildDepends = [ base data-accessor template-haskell utility-ht ];
+       libraryHaskellDepends = [
+         base data-accessor template-haskell utility-ht
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
@@ -38865,7 +39822,7 @@ self: {
        pname = "data-accessor-transformers";
        version = "0.2.1.6";
        sha256 = "1iawhp1h68ynr2axj12jrn47nf08mss0ar8blagp59yi8j7170fa";
-       buildDepends = [ base data-accessor transformers ];
+       libraryHaskellDepends = [ base data-accessor transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in transformers State monad";
        license = stdenv.lib.licenses.bsd3;
@@ -38877,7 +39834,7 @@ self: {
        pname = "data-aviary";
        version = "0.4.0";
        sha256 = "03jhlb7w98bwx5xa23as9i6id0qxcl4f7k9rql2cgcy8nxf7c2xn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Combinator birds";
        license = stdenv.lib.licenses.bsd3;
@@ -38889,7 +39846,7 @@ self: {
        pname = "data-binary-ieee754";
        version = "0.4.4";
        sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
-       buildDepends = [ base binary ];
+       libraryHaskellDepends = [ base binary ];
        homepage = "https://john-millikin.com/software/data-binary-ieee754/";
        description = "Parser/Serialiser for IEEE-754 floating-point values";
        license = stdenv.lib.licenses.mit;
@@ -38901,8 +39858,8 @@ self: {
        pname = "data-bword";
        version = "0.1";
        sha256 = "1s0fid1b8fjazii4j9rsjfmfhyacacknvy374y7nixsdgl4xp44d";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/mvv/data-bword";
        description = "Extra operations on binary words of fixed length";
        license = stdenv.lib.licenses.bsd3;
@@ -38913,10 +39870,10 @@ self: {
      mkDerivation {
        pname = "data-carousel";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1vp17428a2pw4g3y2ra22ll5vjnqwl2xwr2wfj8ppkxaj34a2nsh";
+       revision = "1";
        editedCabalFile = "56aa17d4ad0390625d0694ff6f8e281720d96bdabc678cc10934ac9becc663ea";
-       buildDepends = [ base containers lens ];
+       libraryHaskellDepends = [ base containers lens ];
        description = "A rotating sequence data structure";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -38938,7 +39895,7 @@ self: {
        pname = "data-cell";
        version = "1.0.0.2";
        sha256 = "03liak61gr90i48rd4dlm5lhr8z9v02nn6kdy33sinbpm6313agr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/zadarnowski/data-cell";
        description = "Generic cellular data representation library";
        license = stdenv.lib.licenses.bsd3;
@@ -38950,7 +39907,7 @@ self: {
        pname = "data-checked";
        version = "0.3";
        sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/mvv/data-checked";
        description = "Type-indexed runtime-checked properties";
        license = stdenv.lib.licenses.bsd3;
@@ -38962,7 +39919,7 @@ self: {
        pname = "data-clist";
        version = "0.0.7.4";
        sha256 = "0vnrn8fcnibdbvwdf2smipnvmamgva0x7pszl4bykmh15ns417vn";
-       buildDepends = [ base deepseq QuickCheck ];
+       libraryHaskellDepends = [ base deepseq QuickCheck ];
        homepage = "https://github.com/sw17ch/data-clist";
        description = "Simple functional ring type";
        license = stdenv.lib.licenses.bsd3;
@@ -38974,7 +39931,7 @@ self: {
        pname = "data-concurrent-queue";
        version = "0.3.0.0";
        sha256 = "0rmn4pq5pgvam78vxp4y7431jai8dklml322r4nw47jjc1m20kmv";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        jailbreak = true;
        description = "A Library for directional queues";
        license = stdenv.lib.licenses.mit;
@@ -38987,7 +39944,9 @@ self: {
        pname = "data-cycle";
        version = "0.1.2";
        sha256 = "1k7a2k4vvbwilayh5827na7fifaww66fnmd7mr9vzwmsw9g6q80g";
-       buildDepends = [ base collections-api collections-base-instances ];
+       libraryHaskellDepends = [
+         base collections-api collections-base-instances
+       ];
        description = "a cyclic doubly linked list";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39002,7 +39961,7 @@ self: {
        pname = "data-default";
        version = "0.5.3";
        sha256 = "0d1hm0l9kim3kszshr4msmgzizrzha48gz2kb7b61p7n3gs70m7c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class data-default-instances-base
          data-default-instances-containers data-default-instances-dlist
          data-default-instances-old-locale
@@ -39017,7 +39976,7 @@ self: {
        pname = "data-default-class";
        version = "0.0.1";
        sha256 = "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A class for types with a default value";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39031,11 +39990,11 @@ self: {
        pname = "data-default-generics";
        version = "0.3";
        sha256 = "0asjirn324ixyzkf5vhanyf7q9aj9zh693m55qln7dx3vdayn1yv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers dlist ghc-prim old-locale text time
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers dlist ghc-prim hspec HUnit old-locale
          text time unordered-containers vector
        ];
@@ -39049,7 +40008,7 @@ self: {
        pname = "data-default-instances-base";
        version = "0.0.1";
        sha256 = "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb";
-       buildDepends = [ base data-default-class ];
+       libraryHaskellDepends = [ base data-default-class ];
        description = "Default instances for types in base";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39060,7 +40019,7 @@ self: {
        pname = "data-default-instances-containers";
        version = "0.0.1";
        sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
-       buildDepends = [ base containers data-default-class ];
+       libraryHaskellDepends = [ base containers data-default-class ];
        description = "Default instances for types in containers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39071,7 +40030,7 @@ self: {
        pname = "data-default-instances-dlist";
        version = "0.0.1";
        sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
-       buildDepends = [ base data-default-class dlist ];
+       libraryHaskellDepends = [ base data-default-class dlist ];
        description = "Default instances for types in dlist";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39082,7 +40041,7 @@ self: {
        pname = "data-default-instances-old-locale";
        version = "0.0.1";
        sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
-       buildDepends = [ base data-default-class old-locale ];
+       libraryHaskellDepends = [ base data-default-class old-locale ];
        description = "Default instances for types in old-locale";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39096,11 +40055,11 @@ self: {
        pname = "data-dispersal";
        version = "1.0.0.2";
        sha256 = "1x6wd4xah19isysk2b9waws3fyvzx3w6l917zyw0cvdzf1lkpbw6";
-       buildDepends = [
+       libraryHaskellDepends = [
          AES array base binary bytestring entropy finite-field matrix
          secret-sharing syb vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base binary bytestring QuickCheck spool syb test-framework
          test-framework-quickcheck2 vector
        ];
@@ -39118,10 +40077,10 @@ self: {
        pname = "data-dword";
        version = "0.3";
        sha256 = "0m4jmmdi5j6h0pa4d8ll6pv2qvsf3y3bk6kss0hfglcwaa5vvy73";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-bword ghc-prim hashable template-haskell
        ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/mvv/data-dword";
        description = "Stick two binary words together to get a bigger one";
        license = stdenv.lib.licenses.bsd3;
@@ -39136,8 +40095,8 @@ self: {
        pname = "data-easy";
        version = "0.6.1";
        sha256 = "01plc0cs3bgyq16j94qqvswwmi12iqfxyxgw9jipqgvi7vbf5h9v";
-       buildDepends = [ base containers safe ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers safe ];
+       testHaskellDepends = [
          base containers directory errors haskell-src-exts hlint hspec HUnit
          QuickCheck safe text transformers unix
        ];
@@ -39154,7 +40113,7 @@ self: {
        pname = "data-endian";
        version = "0.1";
        sha256 = "0ilvpd3xw1nljxvl7jdrzzyfkfl7gykidvbjvc7px3bca5mlmf1r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mvv/data-endian";
        description = "Endian-sensitive data";
        license = stdenv.lib.licenses.bsd3;
@@ -39179,7 +40138,7 @@ self: {
        pname = "data-filepath";
        version = "2.2.0.0";
        sha256 = "1l71sg02rqgk7i6w401il7crx3ikdbxi5wbb6ida677pfdrpm7f7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors ghc-prim semigroups split template-haskell
        ];
        jailbreak = true;
@@ -39196,7 +40155,7 @@ self: {
        pname = "data-fin";
        version = "0.1.1.3";
        sha256 = "02n3dr4gj73z549vwq5h7h1kvmx2j8vaxjcggpdlppps9wl6flry";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lazysmallcheck prelude-safeenum QuickCheck reflection
          smallcheck tagged
        ];
@@ -39212,8 +40171,8 @@ self: {
        pname = "data-fin-simple";
        version = "0.1.0.0";
        sha256 = "17qj3b3lkrakdk3vbs9nqc2pvqr81n43qxphcznfbkv91k1ygrp6";
-       buildDepends = [ base ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/seagull-kamome/data-fin-simple";
        description = "Simple integral finite set";
        license = stdenv.lib.licenses.bsd3;
@@ -39225,7 +40184,7 @@ self: {
        pname = "data-fix";
        version = "0.0.1";
        sha256 = "09r08lrv92ka6p35wkbfhq9ywg7y5pmgszwbz8a20h31vjz1ffpr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/anton-k/data-fix";
        description = "Fixpoint data types";
        license = stdenv.lib.licenses.bsd3;
@@ -39237,7 +40196,7 @@ self: {
        pname = "data-fix-cse";
        version = "0.0.2";
        sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2";
-       buildDepends = [ base containers data-fix transformers ];
+       libraryHaskellDepends = [ base containers data-fix transformers ];
        homepage = "https://github.com/anton-k/data-fix-cse";
        description = "Common subexpression elimination for the fixploint types";
        license = stdenv.lib.licenses.bsd3;
@@ -39249,7 +40208,7 @@ self: {
        pname = "data-flags";
        version = "0.0.3.1";
        sha256 = "1s0djw1qarjn1fkyf21fd6pacfpfy4cvyw3wbd63ccaf9g0s1gs5";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "A package for working with bit masks and flags in general";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39260,7 +40219,7 @@ self: {
        pname = "data-flagset";
        version = "1.0.0.0";
        sha256 = "0ygvzrcb2vskjf203svk9wpv8lw4447rd218zvys4a0787ss1aw2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "An efficient data type for sets of flags";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -39271,7 +40230,7 @@ self: {
        pname = "data-fresh";
        version = "0.2013.251.0";
        sha256 = "1hz30myv78mw4sf19k1yg4qikrnxsa5ng0ff4naxyz1zyi2m87f1";
-       buildDepends = [ base free transformers ];
+       libraryHaskellDepends = [ base free transformers ];
        description = "Interface and functor transformers for fresh values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39284,8 +40243,8 @@ self: {
        pname = "data-hash";
        version = "0.2.0.1";
        sha256 = "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi";
-       buildDepends = [ array base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Combinators for building fast hashing functions";
@@ -39302,8 +40261,10 @@ self: {
        pname = "data-interval";
        version = "1.2.0";
        sha256 = "139v825r0r4k8b8cmndpx6gfkdn55ygiwmq8r3fcgljajk99y4km";
-       buildDepends = [ base deepseq extended-reals hashable lattices ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base deepseq extended-reals hashable lattices
+       ];
+       testHaskellDepends = [
          base containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
@@ -39317,7 +40278,7 @@ self: {
        pname = "data-inttrie";
        version = "0.1.0";
        sha256 = "00kzf3cw0y0848cprmx3i7g70rmr92hhfzn60a2x98vb8f7y3814";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/data-inttrie";
        description = "A lazy, infinite trie of integers";
        license = stdenv.lib.licenses.bsd3;
@@ -39329,7 +40290,7 @@ self: {
        pname = "data-ivar";
        version = "0.30";
        sha256 = "1vnbmvihkrcknys33sam9zlb5qk5qqkxz6w3wamsbdmpp0q6zfb2";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39343,7 +40304,7 @@ self: {
        pname = "data-kiln";
        version = "0.1.0.0";
        sha256 = "13pkpmpjy787cjn1hcsl9r04w70nxrzdx8xrn9w6ifbzb2xj2iny";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-fix IfElse mtl transformers
        ];
        jailbreak = true;
@@ -39358,7 +40319,7 @@ self: {
        pname = "data-layout";
        version = "0.1.0.0";
        sha256 = "1w8r4vw731dmam8vcidz9a4wb2swqd5djsf9vkkxihxnphh0a1x5";
-       buildDepends = [ base bytestring vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
        homepage = "http://github.com/jystic/data-layout";
        description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\".";
        license = stdenv.lib.licenses.bsd3;
@@ -39372,7 +40333,7 @@ self: {
        pname = "data-lens";
        version = "2.10.7";
        sha256 = "0l70jzys2qb31cyq3nci97i01ncadkhizxvc9c3psxcd2n28l69v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers semigroupoids transformers
        ];
        homepage = "http://github.com/roconnor/data-lens/";
@@ -39386,7 +40347,9 @@ self: {
        pname = "data-lens-fd";
        version = "2.0.5";
        sha256 = "0r8cfgn6wx304b5ihmwgsxxjwalb7086wii655mgmb6cn3nirpyk";
-       buildDepends = [ base comonad data-lens mtl transformers ];
+       libraryHaskellDepends = [
+         base comonad data-lens mtl transformers
+       ];
        homepage = "http://github.com/roconnor/data-lens-fd/";
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -39398,8 +40361,8 @@ self: {
        pname = "data-lens-ixset";
        version = "0.1.4";
        sha256 = "0frzjfcp7w1ayfai1m07n0fpj3z1vbi971bc1kn1iarxhakny651";
-       buildDepends = [ base data-lens ixset ];
-       testDepends = [ QuickCheck ];
+       libraryHaskellDepends = [ base data-lens ixset ];
+       testHaskellDepends = [ QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/dag/data-lens-ixset";
        description = "A Lens for IxSet";
@@ -39413,7 +40376,7 @@ self: {
        pname = "data-lens-light";
        version = "0.1.2.1";
        sha256 = "038vfzb4vxk1qb0246l2kgv9br37wg59wnlhzyjpn97lypwlf68w";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/feuerbach/data-lens-light";
        description = "Simple lenses, minimum dependencies";
        license = stdenv.lib.licenses.mit;
@@ -39425,7 +40388,7 @@ self: {
        pname = "data-lens-template";
        version = "2.1.9";
        sha256 = "0dpj3a1dj5l5jll2f0flj3wss9h2jbsljihrwh68zbb92pcgb56g";
-       buildDepends = [ base data-lens template-haskell ];
+       libraryHaskellDepends = [ base data-lens template-haskell ];
        homepage = "http://github.com/roconnor/data-lens-template/";
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
@@ -39437,7 +40400,7 @@ self: {
        pname = "data-list-sequences";
        version = "0.1";
        sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jkramer/data-list-sequences";
        description = "Utilities for working with sequences within lists";
        license = stdenv.lib.licenses.gpl3;
@@ -39449,7 +40412,7 @@ self: {
        pname = "data-map-multikey";
        version = "0.0.1.2";
        sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/jhickner/data-map-multikey";
        description = "Data.Map with multiple, unique keys";
@@ -39462,7 +40425,7 @@ self: {
        pname = "data-memocombinators";
        version = "0.5.1";
        sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
-       buildDepends = [ array base data-inttrie ];
+       libraryHaskellDepends = [ array base data-inttrie ];
        homepage = "http://github.com/luqui/data-memocombinators";
        description = "Combinators for building memo tables";
        license = stdenv.lib.licenses.bsd3;
@@ -39474,7 +40437,7 @@ self: {
        pname = "data-named";
        version = "0.5.2";
        sha256 = "1mzwnbcb7ji4m6p4s68422gmpna06llbh2rhk6w048mgjxv4fhsx";
-       buildDepends = [ attoparsec base binary containers text ];
+       libraryHaskellDepends = [ attoparsec base binary containers text ];
        homepage = "https://github.com/kawu/data-named";
        description = "Data types for named entities";
        license = stdenv.lib.licenses.bsd3;
@@ -39487,7 +40450,7 @@ self: {
        pname = "data-nat";
        version = "0.1.2";
        sha256 = "1yzxkch0xzy76iyad0yshfnpvz38xklqdlyj8lgqnqsllw0vwh0m";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        jailbreak = true;
        homepage = "http://github.com/glehel/data-nat";
        description = "data Nat = Zero | Succ Nat";
@@ -39501,7 +40464,7 @@ self: {
        pname = "data-object";
        version = "0.3.1.9";
        sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
-       buildDepends = [ base bytestring failure text time ];
+       libraryHaskellDepends = [ base bytestring failure text time ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/data-object/tree/master";
        description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
@@ -39516,7 +40479,7 @@ self: {
        pname = "data-object-json";
        version = "0.3.1.8";
        sha256 = "06zkiqj4pkl5q4fmh816y4yj74rzwi2b91k542lxswjvfa3za3qk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie convertible-text data-object
          failure JSONb text
        ];
@@ -39537,7 +40500,7 @@ self: {
        sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers convertible-text data-object
          failure text transformers yaml
        ];
@@ -39554,7 +40517,7 @@ self: {
        pname = "data-or";
        version = "1.0.0.5";
        sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A data type for non-exclusive disjunction";
        license = stdenv.lib.licenses.bsd3;
@@ -39566,7 +40529,7 @@ self: {
        pname = "data-ordlist";
        version = "0.4.7.0";
        sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Set and bag operations on ordered lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39577,7 +40540,7 @@ self: {
        pname = "data-partition";
        version = "0.3.0.0";
        sha256 = "05i8fg9q7fpc9jalhwbqpw6pfki2flqj4nqwgs3yfi0hvasvgjjb";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/luqui/data-partition";
        description = "A pure disjoint set (union find) data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -39589,7 +40552,7 @@ self: {
        pname = "data-pprint";
        version = "0.2.4";
        sha256 = "0r4q95pl9gmgc080psi3j87cg1v3cmm6gxnrps17j5sw1nqzb6v5";
-       buildDepends = [ base deepseq mtl parallel pretty time ];
+       libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39600,7 +40563,7 @@ self: {
        pname = "data-quotientref";
        version = "0.1";
        sha256 = "0ylimakhw37klz2axg8qrdhwag34mfa1byb2z2mz2i8z0w4737j8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39615,8 +40578,8 @@ self: {
        pname = "data-r-tree";
        version = "0.0.5.0";
        sha256 = "1zgwm020zxfhb70llch4y075rd6klwwnv9yn8mpgh0rm0ib7jvyy";
-       buildDepends = [ base binary deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary deepseq ];
+       testHaskellDepends = [
          base binary containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -39631,7 +40594,7 @@ self: {
        pname = "data-ref";
        version = "0.0";
        sha256 = "0bcizcf6i1hfpk7ry64si40mfdndgd8k0h9mzh873xp1v2qali7n";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Mutable_variable";
        description = "Unify STRef and IORef in plain Haskell 98";
@@ -39646,7 +40609,8 @@ self: {
        sha256 = "00mjv6dc3fwhbqzrll02qxilwpfypahkzcdqnv17c4nbjqg0ldb1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
@@ -39658,7 +40622,7 @@ self: {
        pname = "data-reify-cse";
        version = "0.0.3";
        sha256 = "0vjfpbp0maqwirvi8j21z9qbs396l76dk5npn8zxac56j0i6l62r";
-       buildDepends = [ base containers data-reify ];
+       libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39669,7 +40633,7 @@ self: {
        pname = "data-rev";
        version = "0.1.0.1";
        sha256 = "13bqp3vvsc6i6lcvw480i08fz2rm3f8varwyhvrp44dzv2q8zkl1";
-       buildDepends = [ base bytestring containers text vector ];
+       libraryHaskellDepends = [ base bytestring containers text vector ];
        jailbreak = true;
        homepage = "https://github.com/jxv/data-rev";
        description = "A typeclass for reversing order of contents";
@@ -39682,7 +40646,7 @@ self: {
        pname = "data-rope";
        version = "0.3";
        sha256 = "06sz6z0kd53av4acmgxh4668fsn588hx5k5qp752rrjf2nx9vww8";
-       buildDepends = [ base bytestring bytestring-mmap unix ];
+       libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39694,7 +40658,9 @@ self: {
        pname = "data-size";
        version = "0.1.1.7";
        sha256 = "0j1g39ha2fjgd960zd0gbhpznisw3qw07mbdacbx226bw50nwa7y";
-       buildDepends = [ base bytestring containers deepseq text ];
+       libraryHaskellDepends = [
+         base bytestring containers deepseq text
+       ];
        description = "Profiling of data structures";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -39705,7 +40671,7 @@ self: {
        pname = "data-spacepart";
        version = "20090215.0";
        sha256 = "0h6z4yibjbnzck2fvh9mnppz9j0lzgx8nzmzm08q5yzmzjydy3rk";
-       buildDepends = [ base vector-space ];
+       libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
        description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
@@ -39721,10 +40687,10 @@ self: {
        pname = "data-store";
        version = "0.3.0.7";
        sha256 = "0cv02d3fwyyyxjv3519k9wilaagxlcn8m2nfifrcq0q0qihxd1bd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal containers deepseq lens safecopy transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cereal containers deepseq lens QuickCheck safecopy
          test-framework test-framework-quickcheck2 transformers vector
        ];
@@ -39744,8 +40710,8 @@ self: {
        pname = "data-stringmap";
        version = "1.0.1.1";
        sha256 = "0djbky5m6hxr04jgxi2cq3fsivja32nzn16zs8ffqgadxw030pa1";
-       buildDepends = [ base binary containers deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary containers deepseq ];
+       testHaskellDepends = [
          base containers deepseq ghc-heap-view HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -39764,11 +40730,11 @@ self: {
        sha256 = "0jkbysk1rmbkjvjizwx72h58amvnz4iyjbs0lcx6987m4fn456w9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal array base deepseq derive directory filepath
          language-c mtl random safe utility-ht
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://github.com/alistra/data-structure-inferrer";
        description = "Program that infers the fastest data structure available for your program";
        license = stdenv.lib.licenses.mit;
@@ -39780,7 +40746,7 @@ self: {
        pname = "data-tensor";
        version = "0.1.0.0";
        sha256 = "0j6jsgj3lhx6ps3xs90vbgyvzmlr3sfl33r6rz34rvb29gs171n8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/tdammers/data-tensor";
        description = "Tensor and Group typeclasses";
        license = stdenv.lib.licenses.mit;
@@ -39795,10 +40761,10 @@ self: {
        pname = "data-textual";
        version = "0.3.0.2";
        sha256 = "0c4qs923dj4jnvvkjvbij0c1yg922iw66140cq6wb1m4h6q31ia4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring parsers text text-latin1 text-printer
        ];
-       testDepends = [
+       testHaskellDepends = [
          base parsers QuickCheck test-framework test-framework-quickcheck2
          text-printer type-hint
        ];
@@ -39815,7 +40781,7 @@ self: {
        pname = "data-timeout";
        version = "0.3";
        sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-textual parsers tagged text-printer transformers-base
        ];
        homepage = "https://github.com/mvv/data-timeout";
@@ -39829,7 +40795,7 @@ self: {
        pname = "data-transform";
        version = "0.1.0.0";
        sha256 = "1mhcbwh4s414hq4cwljxxadazxfi382spfgkw38fz2xi08lbfsji";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Functions to transform data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39840,7 +40806,7 @@ self: {
        pname = "data-treify";
        version = "0.3.4";
        sha256 = "03xchr2h0f54rlcq285xaq5bakjq13mbjwz3xi3kfa6i71rr2rk9";
-       buildDepends = [ base containers ty ];
+       libraryHaskellDepends = [ base containers ty ];
        homepage = "http://ittc.ku.edu/~andygill/data-reify.php";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
@@ -39852,7 +40818,7 @@ self: {
        pname = "data-type";
        version = "0.1.0";
        sha256 = "1x3wsnilp9sxy061sfmyyg0f6b0k2lxvi0g4qf2gkldrz32c4qvj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39864,7 +40830,7 @@ self: {
        pname = "data-util";
        version = "0.4";
        sha256 = "1ywp3h2zccknc2sr0b5zbf9ms2zph5qh8znswxc7bi5wynyk9z98";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/cutsea110/data-util";
        description = "utilities for handle data";
@@ -39877,7 +40843,7 @@ self: {
        pname = "data-variant";
        version = "0.28.0.5";
        sha256 = "11ia37q28xz8a87xkc8yyvqqd3qzfvcbdnp2caxdbzvdnjbazhmk";
-       buildDepends = [ base safe ];
+       libraryHaskellDepends = [ base safe ];
        homepage = "https://bitbucket.org/tdammers/data-variant";
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
        license = stdenv.lib.licenses.bsd3;
@@ -39892,7 +40858,7 @@ self: {
        pname = "database-migrate";
        version = "0.2.0";
        sha256 = "1hhx3851yzgq7cf397sifdbnznk0sfqf3blflxfl50yq68rmwbzy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs containers directory either filepath lens
          postgresql-simple text time transformers
        ];
@@ -39907,7 +40873,7 @@ self: {
        pname = "database-study";
        version = "0.0.1";
        sha256 = "1aqp7a46p758f1q99cn700mgc1dic896gpsih3vj2fmffqj42gd7";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://dbs.informatik.uni-halle.de/Lehre/LP09/";
        description = "Demonstrate how a database can be implemented the functional way";
@@ -39923,7 +40889,7 @@ self: {
        pname = "datadog";
        version = "0.1.0.1";
        sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson auto-update base buffer-builder bytestring lens lifted-base
          monad-control network old-locale text time transformers-base
        ];
@@ -39940,7 +40906,7 @@ self: {
        sha256 = "1wwgm7wakkz6v94lyxyd3yi21l3h28sss4xxdb3d770vmjhp1lzr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
        description = "Data encoding library";
@@ -39957,8 +40923,9 @@ self: {
        sha256 = "099n0mlx695zvazx7q53i474nzmdrqk38q8lrzf6qh440h60q7bx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers MissingH mtl parsec ];
-       testDepends = [ base hspec HUnit ];
+       libraryHaskellDepends = [ base containers MissingH mtl parsec ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit ];
        jailbreak = true;
        homepage = "https://github.com/sonyxperiadev/dataflow";
        description = "Generate Graphviz documents from a Haskell representation";
@@ -39976,11 +40943,15 @@ self: {
        sha256 = "1nfjmgf6j8a8602rmk7fg3kbkafiyd7lsnhvnwc95ms90icg0r86";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers exceptions hashable text transformers
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
          base containers exceptions hashable haskeline parsec pretty text
          transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hashable HUnit test-framework test-framework-hunit
          text
        ];
@@ -40000,7 +40971,7 @@ self: {
        sha256 = "10fj1z4wbr76wfnp9h1jzyd8afzn495r6xvbjiw55bimy0hasalg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath hslogger MissingH mtl process unix
        ];
        homepage = "http://software.complete.org/datapacker";
@@ -40014,7 +40985,7 @@ self: {
        pname = "date-cache";
        version = "0.3.0";
        sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Date cacher";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40025,7 +40996,9 @@ self: {
        pname = "dates";
        version = "0.2.2.0";
        sha256 = "08d90fii0nmvmfxhhw4k5ja13jyxg79n527089lrc2r31l3wj40a";
-       buildDepends = [ base base-unicode-symbols parsec syb time ];
+       libraryHaskellDepends = [
+         base base-unicode-symbols parsec syb time
+       ];
        jailbreak = true;
        homepage = "http://redmine.iportnov.ru/projects/dates/";
        description = "Small library for parsing different dates formats";
@@ -40041,15 +41014,14 @@ self: {
        pname = "datetime";
        version = "0.3.1";
        sha256 = "0jmxxmv5s9rch84ivfjhqxdqnvqqzvabjs152wyv47h5qmvpag1k";
-       buildDepends = [ base old-locale old-time time ];
-       testDepends = [
+       libraryHaskellDepends = [ base old-locale old-time time ];
+       testHaskellDepends = [
          base HUnit old-locale old-time QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
        homepage = "http://github.com/stackbuilders/datetime";
        description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "datetime-sb" = callPackage
@@ -40061,8 +41033,8 @@ self: {
        pname = "datetime-sb";
        version = "0.2.4";
        sha256 = "1p2pn0jdidqcvmmi80njqm9z4amn1qp05nlxbnz1svpp6nc7amjf";
-       buildDepends = [ base old-locale old-time time ];
-       testDepends = [
+       libraryHaskellDepends = [ base old-locale old-time time ];
+       testHaskellDepends = [
          base HUnit old-locale old-time QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
@@ -40079,7 +41051,7 @@ self: {
        pname = "dawg";
        version = "0.11";
        sha256 = "0xvkw5hp66r46v59ld0s7yi2jzvlcc4vc8ignadai9vqxayzm799";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers mtl transformers vector vector-binary
        ];
        homepage = "https://github.com/kawu/dawg";
@@ -40093,8 +41065,8 @@ self: {
        pname = "dbcleaner";
        version = "0.1.1";
        sha256 = "1n4al0fd577ldvaxca6nz181lp0b29z4slrjldx3m51nkxy1ficc";
-       buildDepends = [ base postgresql-simple text ];
-       testDepends = [ base hspec postgresql-simple text ];
+       libraryHaskellDepends = [ base postgresql-simple text ];
+       testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -40105,7 +41077,9 @@ self: {
        pname = "dbf";
        version = "0.0.0.2";
        sha256 = "1pay47bbmxvishmczs3kgn19nzkfmmip3m51h4zlwydm5kxfc5n2";
-       buildDepends = [ base binary bytestring monad-loops rwlock ];
+       libraryHaskellDepends = [
+         base binary bytestring monad-loops rwlock
+       ];
        homepage = "http://code.haskell.org/~mokus/dbf";
        description = "Read and write XBase \".dbf\" files";
        license = stdenv.lib.licenses.publicDomain;
@@ -40121,7 +41095,12 @@ self: {
        sha256 = "06xz0a38sjjr64sz19lg0wzb73yz1msdlbg5s02ldd8n4b9yjk5f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring haskell98 process uulib ];
+       libraryHaskellDepends = [
+         base binary bytestring haskell98 process uulib
+       ];
+       executableHaskellDepends = [
+         base binary bytestring haskell98 process uulib
+       ];
        homepage = "http://devel.comunidadhaskell.org/dbjava/";
        description = "Decompiler Bytecode Java";
        license = stdenv.lib.licenses.bsd3;
@@ -40140,12 +41119,17 @@ self: {
        sha256 = "031ibk22iyqzbkc6cy5ab5kmbhk68k5217szpw50vdp646rya21w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator containers directory fgl filepath HDBC
          HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time
          yaml-light
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring configurator containers directory fgl filepath HDBC
+         HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time
+         yaml-light
+       ];
+       testHaskellDepends = [
          base bytestring containers directory fgl filepath HDBC
          HDBC-postgresql HDBC-sqlite3 HUnit mtl process template-haskell
          time yaml-light
@@ -40164,11 +41148,11 @@ self: {
        pname = "dbus";
        version = "0.10.10";
        sha256 = "0s14yb2bbi5n9m3xkznm4nbb0hpj9hmiwl0ppqqiml5s7xhwas6d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers libxml-sax network parsec random
          text transformers unix vector xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal chell chell-quickcheck containers directory
          filepath libxml-sax network parsec process QuickCheck random text
          transformers unix vector xml-types
@@ -40186,7 +41170,7 @@ self: {
        pname = "dbus-client";
        version = "0.4.1";
        sha256 = "0z7061kafjzd4jaws4xcp1xzh2kx559bgp7cmcjq55mbxr1rrsjq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dbus-core monads-tf text transformers
        ];
        jailbreak = true;
@@ -40205,7 +41189,7 @@ self: {
        pname = "dbus-core";
        version = "0.9.3";
        sha256 = "110373yinimq0k7hl8wkk7g4hm3hj563dpa2y8ag2lpl9yydzgfa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 libxml-sax
          network parsec text unix vector xml-types
        ];
@@ -40224,8 +41208,10 @@ self: {
        pname = "dbus-qq";
        version = "0.1.0";
        sha256 = "0dg03nv7bsjydywhby0rv1a6jc90gf2885djxd8pb9aly2ncpjxx";
-       buildDepends = [ base containers dbus parsec template-haskell ];
-       testDepends = [ base containers dbus QuickCheck ];
+       libraryHaskellDepends = [
+         base containers dbus parsec template-haskell
+       ];
+       testHaskellDepends = [ base containers dbus QuickCheck ];
        jailbreak = true;
        description = "Quasi-quoter for DBus functions";
        license = stdenv.lib.licenses.bsd3;
@@ -40239,7 +41225,9 @@ self: {
        pname = "dbus-th";
        version = "0.1.1.1";
        sha256 = "0sxk7m8fdd7cx0n0lbcfz2bv28d0i8v0im50y1sciac7pi13q4bc";
-       buildDepends = [ base containers dbus syb template-haskell text ];
+       libraryHaskellDepends = [
+         base containers dbus syb template-haskell text
+       ];
        description = "TemplateHaskell generator of DBus bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40252,8 +41240,8 @@ self: {
        pname = "dclabel";
        version = "0.9.0.0";
        sha256 = "0bnbqbjpbx98wjgsz7kgr5znljbwhd6lsb8m9ky7dmzqygzybvir";
-       buildDepends = [ base bytestring cereal containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cereal containers ];
+       testHaskellDepends = [
          base bytestring cereal containers QuickCheck quickcheck-instances
          test-framework test-framework-quickcheck2
        ];
@@ -40269,7 +41257,7 @@ self: {
        pname = "dclabel-eci11";
        version = "0.3";
        sha256 = "1bfc9ip4fqzjzlzppkrnspnm6gc50f4rkf0wngnxyj7f79fvjr6k";
-       buildDepends = [ base pretty QuickCheck ];
+       libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40282,7 +41270,7 @@ self: {
        pname = "ddc-base";
        version = "0.4.1.3";
        sha256 = "1v3qkvfcajr8ljnrkmdpkhp6069b54fg168ryknq4b7rkl4piqfm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq parsec transformers wl-pprint
        ];
        jailbreak = true;
@@ -40301,7 +41289,7 @@ self: {
        pname = "ddc-build";
        version = "0.4.1.3";
        sha256 = "15bjdr9g48p1ahga9qc1cgfbpr89551yaqx9psa44da0vy468fjs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ddc-base ddc-core ddc-core-eval ddc-core-flow
          ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra
          ddc-source-tetra deepseq directory filepath mtl process
@@ -40319,7 +41307,7 @@ self: {
        pname = "ddc-code";
        version = "0.4.1.3";
        sha256 = "1m904n1s2cszakjrlz81y1gplrgfv3np2ja0m6fapj9c2yyfmg6r";
-       buildDepends = [ base filepath ];
+       libraryHaskellDepends = [ base filepath ];
        jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler base libraries";
@@ -40334,7 +41322,7 @@ self: {
        pname = "ddc-core";
        version = "0.4.1.3";
        sha256 = "15a51cgk3pqsbmy6hv0jrf8ldxmb0kvzd0pwkqa6141phk2g1dd5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base deepseq directory mtl transformers
        ];
        jailbreak = true;
@@ -40352,7 +41340,7 @@ self: {
        pname = "ddc-core-eval";
        version = "0.4.1.3";
        sha256 = "0s11wzl75fa4pnjclgqdvymddk8srpknvpf6p3vkm2b09y0fryxd";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
        jailbreak = true;
@@ -40370,7 +41358,7 @@ self: {
        pname = "ddc-core-flow";
        version = "0.4.1.3";
        sha256 = "1szy9x5pc2l5ib8sbkajj6i7nfb46ypgi655wy0jrcnp7m2q22fy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-simpl deepseq mtl transformers
        ];
@@ -40389,7 +41377,7 @@ self: {
        pname = "ddc-core-llvm";
        version = "0.4.1.3";
        sha256 = "0f0cby09lqhvw5ajm6q25qg57qbb4h3qvqwv30bzl6kw0884lkb5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-simpl mtl transformers
        ];
@@ -40408,7 +41396,7 @@ self: {
        pname = "ddc-core-salt";
        version = "0.4.1.3";
        sha256 = "18cywxp3zp6aafpq8si1vvqy7lywwl31mdp58asyzcwi1g1v7y7q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
        jailbreak = true;
@@ -40426,7 +41414,7 @@ self: {
        pname = "ddc-core-simpl";
        version = "0.4.1.3";
        sha256 = "0y3rxcl2h6dqmy367zfri1r21flcbygvrpa7sj8cr8gh128xwbbz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
        jailbreak = true;
@@ -40444,7 +41432,7 @@ self: {
        pname = "ddc-core-tetra";
        version = "0.4.1.3";
        sha256 = "01ax5dirrf8jk03316dw1cnrs9fl5qlm8k07nb0rzxwybm3wqdv2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-simpl deepseq mtl transformers
        ];
@@ -40465,7 +41453,7 @@ self: {
        pname = "ddc-driver";
        version = "0.4.1.3";
        sha256 = "0iyvmifnj05v9r2sh867dm2vgm8hijsxf6bmzrksj1kcs36qwrrk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ddc-base ddc-build ddc-core ddc-core-eval
          ddc-core-flow ddc-core-llvm ddc-core-salt ddc-core-simpl
          ddc-core-tetra ddc-interface ddc-source-tetra deepseq directory
@@ -40484,7 +41472,7 @@ self: {
        pname = "ddc-interface";
        version = "0.4.1.3";
        sha256 = "0pbsnxzlbx9xblqf9199wrl80aard59l3193gm8gzxx7ispfhs3f";
-       buildDepends = [ base containers ddc-base directory ];
+       libraryHaskellDepends = [ base containers ddc-base directory ];
        jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler user interface support";
@@ -40499,7 +41487,7 @@ self: {
        pname = "ddc-source-tetra";
        version = "0.4.1.3";
        sha256 = "088lsavx4fhyxyxzxd4vj1880j19r4l4fvlb4dly42mbyfrg5jrs";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-tetra deepseq mtl transformers
        ];
@@ -40523,7 +41511,7 @@ self: {
        sha256 = "1hg6hajqrb7sf8bvr27cabdxalwvkw8lm2igsx05p9wq4bpirz62";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers ddc-base ddc-build ddc-code ddc-core ddc-core-eval
          ddc-core-flow ddc-core-llvm ddc-core-salt ddc-core-simpl
          ddc-core-tetra ddc-driver ddc-interface ddc-source-tetra directory
@@ -40546,7 +41534,7 @@ self: {
        sha256 = "0y9h4z1drgwgmw9wjf8ga2kiagmfgppdy29l9cz0j4rjz3mm302y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base buildbox containers directory filepath process random stm
        ];
        jailbreak = true;
@@ -40565,7 +41553,7 @@ self: {
        sha256 = "1w4kcqivphc9gmj4xnkqx2hbzd3cmssww5hqgja1kh0b03q026w0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers ddc-base ddc-core ddc-core-eval ddc-core-simpl
          haskeline haskell-src-exts
        ];
@@ -40584,7 +41572,7 @@ self: {
        pname = "dead-simple-json";
        version = "0.1.2";
        sha256 = "10wp97pxhkvlk3lhknvsnwkl9p7lm1v7y1wk0nn55q68jx1b5zpr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers parsec template-haskell transformers vector
        ];
        homepage = "http://hub.darcs.net/scravy/dead-simple-json";
@@ -40606,14 +41594,17 @@ self: {
        sha256 = "135f0szbnn8xp5zzfmlqcpmsrswahgc4rlgviyznfx6c4j7hg519";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bzlib containers directory either exceptions
          filepath HaXml HUnit ListLike mtl network network-uri old-locale
          parsec pretty process process-extras pureMD5 regex-compat
          regex-tdfa template-haskell text time unix Unixutils utf8-string
          zlib
        ];
-       testDepends = [ base HUnit parsec pretty regex-tdfa text ];
+       executableHaskellDepends = [
+         base directory filepath HaXml pretty process unix
+       ];
+       testHaskellDepends = [ base HUnit parsec pretty regex-tdfa text ];
        homepage = "https://github.com/ddssff/debian-haskell";
        description = "Modules for working with the Debian package system";
        license = stdenv.lib.licenses.bsd3;
@@ -40627,7 +41618,7 @@ self: {
        sha256 = "0k6blaq1p2phydl4pqlqg6kdicrfjhm6h27svws7dq8di3y274fq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath HSH ];
+       libraryHaskellDepends = [ base directory filepath HSH ];
        description = "Utilities to work with debian binary packages";
        license = "unknown";
      }) {};
@@ -40642,9 +41633,10 @@ self: {
        sha256 = "1x3jvrz5y85m9mnp5b8b85f4magbxa4r0yhkw30vgcljph6v7mfm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal directory filepath process split transformers
        ];
+       executableHaskellDepends = [ base filepath ];
        homepage = "http://twitter.com/khibino/";
        description = "Debian package build sequence tools";
        license = stdenv.lib.licenses.bsd3;
@@ -40656,7 +41648,7 @@ self: {
        pname = "debug-diff";
        version = "0.1";
        sha256 = "19k9f92pjh52qnr31l0468hn2klkb8wszs7azwczvxzg8aq7krld";
-       buildDepends = [ base groom process temporary ];
+       libraryHaskellDepends = [ base groom process temporary ];
        description = "Display a colorized diff between two Haskell values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40667,7 +41659,7 @@ self: {
        pname = "decepticons";
        version = "0.1.0.0";
        sha256 = "1fnp2c2rdpihvxm5j22z1mrf8pnpcnasvfsrlg7lvg5m76md7k3v";
-       buildDepends = [ base comonad-transformers ];
+       libraryHaskellDepends = [ base comonad-transformers ];
        jailbreak = true;
        description = "The categorical dual of transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -40683,7 +41675,9 @@ self: {
        sha256 = "10mj871j5gd4d8v8341lr5lr9avxxfph58sjhmd9kgywc10grqph";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ api-opentheory-unicode base opentheory-unicode ];
+       executableHaskellDepends = [
+         api-opentheory-unicode base opentheory-unicode
+       ];
        description = "Decode a UTF-8 byte stream on standard input";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -40694,7 +41688,7 @@ self: {
        pname = "decoder-conduit";
        version = "0.0.1.1";
        sha256 = "0z5krcl4xd385f7v2bsnfyr7zidqwfjvc6b432gbbn2vcrx966c7";
-       buildDepends = [ base binary bytestring conduit ];
+       libraryHaskellDepends = [ base binary bytestring conduit ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/decoder-conduit";
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
@@ -40713,10 +41707,11 @@ self: {
        sha256 = "0b7328529m3xl8bj7sncv5rr13ld2aghgqkf55j4n15jagv6g72d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ time unix ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath haskell-src-exts
          haskell-src-exts-qq hmk mtl parsec process Stream stringtable-atom
-         time unix wl-pprint
+         wl-pprint
        ];
        jailbreak = true;
        homepage = "http://www.lix.polytechnique.fr/dedukti";
@@ -40736,8 +41731,13 @@ self: {
        sha256 = "1cw29xisgykb20qv3jkpcpaiijicyzkfsgglrsbx1admfzbqv98d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ accelerate base mtl repa repa-algorithms vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         accelerate base mtl repa repa-algorithms vector
+       ];
+       executableHaskellDepends = [
+         accelerate base mtl repa repa-algorithms vector
+       ];
+       testHaskellDepends = [
          accelerate base mtl QuickCheck repa repa-algorithms test-framework
          test-framework-quickcheck2 vector
        ];
@@ -40754,7 +41754,7 @@ self: {
        pname = "deepseq";
        version = "1.3.0.1";
        sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        jailbreak = true;
        description = "Deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -40768,8 +41768,8 @@ self: {
        pname = "deepseq";
        version = "1.4.1.1";
        sha256 = "1gxk6bdqfplvq0lma2sjcxl8ibix5k60g71dncpvwsmc63mmi0ch";
-       buildDepends = [ array base ];
-       testDepends = [
+       libraryHaskellDepends = [ array base ];
+       testHaskellDepends = [
          array base HUnit test-framework test-framework-hunit
        ];
        description = "Deep evaluation of data structures";
@@ -40785,11 +41785,11 @@ self: {
        pname = "deepseq-bounded";
        version = "0.8.0.0";
        sha256 = "192hqyidgbrsig2yx7x9vdx180w1jfcqxsgg4wslwfwj7d3sa81f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cpphs deepseq deepseq-generics generics-sop mtl parallel
          random syb
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cpphs deepseq deepseq-generics generics-sop ghc-prim HUnit
          parallel random syb template-haskell
        ];
@@ -40807,11 +41807,11 @@ self: {
      mkDerivation {
        pname = "deepseq-generics";
        version = "0.1.1.2";
-       revision = "1";
        sha256 = "01pvigx8n9p8hwbzp2qiq6kzf7cxiam843jz2sjgliacmmp1v7l3";
+       revision = "1";
        editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd";
-       buildDepends = [ base deepseq ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
        ];
        homepage = "https://github.com/hvr/deepseq-generics";
@@ -40825,7 +41825,7 @@ self: {
        pname = "deepseq-magic";
        version = "1.0.0.3";
        sha256 = "15nisjmhcfippz153b8l8f291halkgbrync5c2v6xwkh07ibn7yp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ezyang/deepseq-magic";
        description = "Deep evaluation of data structures without NFData";
        license = stdenv.lib.licenses.publicDomain;
@@ -40837,8 +41837,8 @@ self: {
        pname = "deepseq-th";
        version = "0.1.0.4";
        sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965";
-       buildDepends = [ base deepseq template-haskell ];
-       testDepends = [ base deepseq template-haskell ];
+       libraryHaskellDepends = [ base deepseq template-haskell ];
+       testHaskellDepends = [ base deepseq template-haskell ];
        jailbreak = true;
        description = "Template Haskell based deriver for optimised NFData instances";
        license = stdenv.lib.licenses.bsd3;
@@ -40851,7 +41851,7 @@ self: {
        pname = "deepzoom";
        version = "0.1";
        sha256 = "1hisk6yfq4182ak7d1mi1kmnwwlcl8w7gwc8wqkq4l8m3zfyij8k";
-       buildDepends = [ base directory filepath hsmagick ];
+       libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40863,7 +41863,7 @@ self: {
        pname = "defargs";
        version = "0.3";
        sha256 = "1rz37w83awji034spyv4cnfbqb6r98r1bbvzh2i979qh5c5s6ckg";
-       buildDepends = [ base cluss ];
+       libraryHaskellDepends = [ base cluss ];
        homepage = "https://github.com/Kinokkory/defargs";
        description = "default arguments in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -40878,7 +41878,7 @@ self: {
        pname = "definitive-base";
        version = "2.3";
        sha256 = "126ln7k6k188xjnig60ksc425fp3hql5znb98h5c1w157jgg0sw9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq ghc-prim GLURaw OpenGL
          OpenGLRaw primitive vector
        ];
@@ -40897,10 +41897,10 @@ self: {
      mkDerivation {
        pname = "definitive-filesystem";
        version = "1.2";
-       revision = "1";
        sha256 = "0bc098igiqzbm25bjaxdxm4jq17kc8bgz1ab0pgm0h5jvy1bf8id";
+       revision = "1";
        editedCabalFile = "3a78d4d8aaa291ca95d889b62a979c4132bbe6f91073ab2bd9fdb0d55ed63121";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring clock containers deepseq definitive-base
          definitive-reactive directory filepath old-locale primitive time
          unix vector
@@ -40921,10 +41921,10 @@ self: {
      mkDerivation {
        pname = "definitive-graphics";
        version = "1.2";
-       revision = "1";
        sha256 = "0ah19j2al9l6pbin821rsicidmg3rd4cc74r8qw095773sa98zyr";
+       revision = "1";
        editedCabalFile = "a6d867ea8098390daff40c088c81f854ca054f9a0c8b097f9194be329416baed";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring clock containers cpu deepseq
          definitive-base definitive-parser definitive-reactive GLFW
          JuicyPixels mtl primitive stb-truetype transformers utf8-string
@@ -40946,7 +41946,7 @@ self: {
        pname = "definitive-parser";
        version = "2.1";
        sha256 = "0sl77xgk7vjn69mx89k4f3yviz821mg01fga0klqplcccbkzknmh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers cpu deepseq definitive-base
          ghc-prim GLURaw OpenGL OpenGLRaw primitive utf8-string vector
        ];
@@ -40964,10 +41964,10 @@ self: {
      mkDerivation {
        pname = "definitive-reactive";
        version = "1.0";
-       revision = "1";
        sha256 = "0gk39602k5yjxxgpd725dnvqhlcnaqgds7g0c8v1h509lc0d7xm3";
+       revision = "1";
        editedCabalFile = "8c3c6afcc4ce7569ede32c8006d1d66fb10448321159f875d1dec03419bd7797";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring clock containers deepseq definitive-base
          primitive vector
        ];
@@ -40986,10 +41986,10 @@ self: {
      mkDerivation {
        pname = "definitive-sound";
        version = "1.0";
-       revision = "1";
        sha256 = "01k4h7av4fhp4xchrcbnc1gnnbsh5ngasq55l16n3l438pr73vzj";
+       revision = "1";
        editedCabalFile = "1491f0a01f47b84ea8f01a94492738a7f3b5fe7c68c805cca8701926cc443d71";
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core alsa-pcm array base bytestring clock containers deepseq
          definitive-base primitive sample-frame storable-record vector
        ];
@@ -41008,7 +42008,7 @@ self: {
        pname = "deiko-config";
        version = "0.5.0.0";
        sha256 = "0zhi173mm905aqh52fsw1c9y3hxk07yc1g2s0rrjr75cdl7ssljy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers exceptions mtl parsec text transformers
        ];
        jailbreak = true;
@@ -41023,8 +42023,8 @@ self: {
        pname = "deka";
        version = "0.6.0.2";
        sha256 = "1l23b5v0wjg72vlnyxa87v3j2dxbld536ws8j03ddcwgqgws1fj4";
-       buildDepends = [ base bytestring parsec transformers ];
-       extraLibraries = [ mpdec ];
+       libraryHaskellDepends = [ base bytestring parsec transformers ];
+       librarySystemDepends = [ mpdec ];
        jailbreak = true;
        homepage = "https://github.com/massysett/deka";
        description = "Decimal floating point arithmetic";
@@ -41042,11 +42042,12 @@ self: {
        sha256 = "08226vca64v8brcgci8a3s5fnf4qy8g9drk3lzzd0dq6g8yvypy9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base bytestring deka QuickCheck ];
+       executableHaskellDepends = [
          base bytestring containers deka parsec pipes QuickCheck
          transformers
        ];
-       testDepends = [ base bytestring deka QuickCheck quickpull ];
+       testHaskellDepends = [ base bytestring deka QuickCheck quickpull ];
        jailbreak = true;
        homepage = "https://github.com/massysett/deka";
        description = "Tests for deka, decimal floating point arithmetic";
@@ -41062,8 +42063,10 @@ self: {
        pname = "delaunay";
        version = "0.1.0.2";
        sha256 = "145a220kv3fk2lk6jpvqmmhwmbgiqzkcbsi5hynsg196chydxgvd";
-       buildDepends = [ AC-Vector base hashable unordered-containers ];
-       testDepends = [ AC-Vector base HUnit QuickCheck ];
+       libraryHaskellDepends = [
+         AC-Vector base hashable unordered-containers
+       ];
+       testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
        homepage = "http://github.com/mruegenberg/Delaunay";
        description = "Build a Delaunay triangulation of a set of points";
        license = stdenv.lib.licenses.bsd3;
@@ -41076,7 +42079,9 @@ self: {
        pname = "delicious";
        version = "0.3.4";
        sha256 = "1dx2y2ggzcwcjs618jmg21342pcd0maqx8pj2hwv80zq6f5v0c50";
-       buildDepends = [ base bytestring curl feed json nano-md5 xml ];
+       libraryHaskellDepends = [
+         base bytestring curl feed json nano-md5 xml
+       ];
        homepage = "https://github.com/sof/delicious";
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
        license = stdenv.lib.licenses.bsd3;
@@ -41091,7 +42096,7 @@ self: {
        pname = "delimited-text";
        version = "0.3.0";
        sha256 = "0mn6sv4nm3wbzq5cc9s9kb3xbm9jd5i059xr6qr9mqxa18j78c05";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring bytestring-show
        ];
        homepage = "http://space.k-hornz.de/software/delimited-text";
@@ -41106,20 +42111,21 @@ self: {
      mkDerivation {
        pname = "delta";
        version = "0.2.1.2";
-       revision = "2";
        sha256 = "0r2a2vffs3rn2xp56nhanyywzbm2wph5664spgj4lbsna6zgjnfj";
+       revision = "2";
        editedCabalFile = "630e85a07132fe54b49c71f855b3d633982026d78120279e00888bc95a9d14dd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers directory filepath optparse-applicative process
-         sodium time
+       libraryHaskellDepends = [
+         base containers directory filepath sodium time
        ];
-       testDepends = [ base directory filepath hspec ];
+       executableHaskellDepends = [
+         base directory optparse-applicative process sodium
+       ];
+       testHaskellDepends = [ base directory filepath hspec ];
        homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delta-h" = callPackage
@@ -41132,7 +42138,10 @@ self: {
        sha256 = "0ya0hgvpa9w41gswngg84yxhvll3fyr6b3h56p80yc5bldw700wg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring containers monad-atom nlp-scores text
+       ];
+       executableHaskellDepends = [
          base binary bytestring containers monad-atom nlp-scores text
        ];
        homepage = "https://bitbucket.org/gchrupala/delta-h";
@@ -41147,8 +42156,8 @@ self: {
        pname = "demarcate";
        version = "0.1.0";
        sha256 = "130yk7461rwmjgzivsya10xzh0d0ca8pfkxh7fpll239r7xlbds3";
-       buildDepends = [ base free transformers ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base free transformers ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/fizruk/demarcate";
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
@@ -41163,7 +42172,8 @@ self: {
        sha256 = "06jdr1236wlsmapwn6hdmjl41qlig7ck541lynyds0qd6ymcb9k1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
        jailbreak = true;
        homepage = "http://protempore.net/denominate/";
        description = "Functions supporting bulk file and directory name normalization";
@@ -41177,7 +42187,7 @@ self: {
        pname = "dependent-map";
        version = "0.1.1.3";
        sha256 = "1by83rrv8dfn5lxrpx3qzs1lg31fhnzlqy979h8ampyxd0w93pa4";
-       buildDepends = [ base containers dependent-sum ];
+       libraryHaskellDepends = [ base containers dependent-sum ];
        homepage = "https://github.com/mokus0/dependent-map";
        description = "Dependent finite maps (partial dependent products)";
        license = "unknown";
@@ -41189,7 +42199,7 @@ self: {
        pname = "dependent-sum";
        version = "0.2.1.0";
        sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mokus0/dependent-sum";
        description = "Dependent sum type";
        license = stdenv.lib.licenses.publicDomain;
@@ -41202,7 +42212,9 @@ self: {
        pname = "dependent-sum-template";
        version = "0.0.0.4";
        sha256 = "103jxzzw3drg7pkgmh39s7258zcwr8ixg8mijm6p33b87a8wdpwr";
-       buildDepends = [ base dependent-sum template-haskell th-extras ];
+       libraryHaskellDepends = [
+         base dependent-sum template-haskell th-extras
+       ];
        homepage = "/dev/null";
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
        license = stdenv.lib.licenses.publicDomain;
@@ -41218,10 +42230,10 @@ self: {
        sha256 = "0y43bhxx5s4v72gc0y1cwfy2h4hyz9x5cab2fbkd7rvj5wn4w4gq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath process transformers yaml-config
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filepath hspec process QuickCheck
          transformers yaml-config
        ];
@@ -41240,7 +42252,7 @@ self: {
        sha256 = "0qgqlnj7wkmjba5f2rql51g9jhak0ksx3xdmr25j3p6qwb43k5ih";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bio bytestring cmdargs directory process regex-compat
        ];
        homepage = "http://malde.org/~ketil/biohaskell/dephd";
@@ -41257,7 +42269,8 @@ self: {
        sha256 = "1z4c3hyk1lbjqm5is1d9qb6sxwv8i870ph7n2h51r631mhxbdnxl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck safe ];
+       libraryHaskellDepends = [ base QuickCheck safe ];
+       executableHaskellDepends = [ base QuickCheck ];
        description = "A typeclass and an implementation for double-ended queues";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41269,7 +42282,7 @@ self: {
        pname = "derangement";
        version = "0.1.0";
        sha256 = "13w257bndjpaz7fiz4g2w4v2bmlch07ay5pxxv5ifc4llh665ch0";
-       buildDepends = [ base fgl ];
+       libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41281,7 +42294,9 @@ self: {
        pname = "derivation-trees";
        version = "0.7.3";
        sha256 = "05f77vkqzia91rywkg68ad24j98a7h9aqkd0568x2zmqcndzbisy";
-       buildDepends = [ applicative-extras base labeled-tree mtl ];
+       libraryHaskellDepends = [
+         applicative-extras base labeled-tree mtl
+       ];
        jailbreak = true;
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
@@ -41299,7 +42314,7 @@ self: {
        sha256 = "0g2grz9y23n8g4wwjinx5cc70aawswl84i3njgj6l1fl29fk1yf2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath haskell-src-exts
          pretty process syb template-haskell transformers uniplate
        ];
@@ -41314,7 +42329,7 @@ self: {
        pname = "derive-IG";
        version = "0.1.1";
        sha256 = "0bggj2jb3bbgxcz75v8q2yx29v88skiwjaj3fxkkynnv5zvrbgwr";
-       buildDepends = [ base instant-generics template-haskell ];
+       libraryHaskellDepends = [ base instant-generics template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/konn/derive-IG";
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
@@ -41328,7 +42343,7 @@ self: {
        pname = "derive-enumerable";
        version = "0.1.1.0";
        sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp";
-       buildDepends = [ base data-default ];
+       libraryHaskellDepends = [ base data-default ];
        jailbreak = true;
        homepage = "https://github.com/mgoszcz2/derive-enumerable";
        description = "Generic instances for enumerating complex data types";
@@ -41345,10 +42360,13 @@ self: {
        sha256 = "0s6vb3b3chf1gy44a6zsi2z19d6snk12qlk4v8q2smipmj42v7d6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta pretty
          template-haskell
        ];
+       executableHaskellDepends = [
+         base haskell-src-exts haskell-src-meta template-haskell
+       ];
        jailbreak = true;
        description = "Instance deriving for (a subset of) GADTs";
        license = stdenv.lib.licenses.bsd3;
@@ -41363,7 +42381,7 @@ self: {
        pname = "derive-topdown";
        version = "0.0.0.2";
        sha256 = "0gdalqq1ks9jjp34kzavlx2ncpdad2pf6vdhx64yii5l2nl04r8p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base derive mtl template-haskell template-haskell-util
        ];
        homepage = "https://github.com/HaskellZhangSong/derive-topdown";
@@ -41378,7 +42396,7 @@ self: {
        pname = "derive-trie";
        version = "0.2.1";
        sha256 = "11c378mh5razibd9ljffm5353v4plrgvkfb62p6029f04sf29jnc";
-       buildDepends = [ array base containers template-haskell ];
+       libraryHaskellDepends = [ array base containers template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/baldo/derive-trie";
        description = "Automatic derivation of Trie implementations";
@@ -41394,8 +42412,10 @@ self: {
        pname = "deriving-compat";
        version = "0.1";
        sha256 = "1v503lj9dds1hwnqhmw8rfbj9337gcyqqzys1d93r7s0bs3glgf3";
-       buildDepends = [ base containers ghc-prim template-haskell ];
-       testDepends = [ base base-compat hspec QuickCheck ];
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base base-compat hspec QuickCheck ];
        homepage = "https://github.com/haskell-compat/deriving-compat";
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
@@ -41407,7 +42427,7 @@ self: {
        pname = "derp";
        version = "0.1.6";
        sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Derivative Parsing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41418,7 +42438,7 @@ self: {
        pname = "derp-lib";
        version = "0.0.0.1";
        sha256 = "0j883w01k9scz6cfxljkw9s2kgs9f7vdxyyxxhlvvkgzb0050v0x";
-       buildDepends = [ base derp ];
+       libraryHaskellDepends = [ base derp ];
        homepage = "http://darcsden.com/kyagrd/derp-lib";
        description = "combinators based on parsing with derivatives (derp) package";
        license = stdenv.lib.licenses.bsd3;
@@ -41431,7 +42451,7 @@ self: {
        pname = "descrilo";
        version = "0.1.0.3";
        sha256 = "19x78lv6rd5i5xvqj92q5snly1579jiiw2fgmxzxza0km9j9yiw2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Loads a list of items with fields";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -41443,10 +42463,10 @@ self: {
      mkDerivation {
        pname = "descriptive";
        version = "0.0.2";
-       revision = "3";
        sha256 = "0jh0l4assmqsmq9ajsbdl7vn8k6srl0z27kpxwzg1v0nmkkcl48p";
+       revision = "3";
        editedCabalFile = "0aeae1dd5ab8c21ade57c1e036600b8162cd790823618a9c5894417ba68e2ea2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors containers mtl text transformers
        ];
        homepage = "https://github.com/chrisdone/descriptive";
@@ -41462,11 +42482,11 @@ self: {
        pname = "descriptive";
        version = "0.9.4";
        sha256 = "0bxskc4q6jzpvifnhh6zl77xic0fbni8abf9lipfr1xzarbwcpkr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors containers mtl scientific text transformers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bifunctors containers hspec HUnit mtl text transformers
        ];
        homepage = "https://github.com/chrisdone/descriptive";
@@ -41480,7 +42500,7 @@ self: {
        pname = "despair";
        version = "0.0.2";
        sha256 = "1dwhp1izikvj1qfz6shvnl4q519vgjpnfmkwkj8zp875dki87pnj";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        description = "Despair";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41491,8 +42511,8 @@ self: {
        pname = "deterministic-game-engine";
        version = "0.4.0";
        sha256 = "1hdwr1vxfng3yc9mdnnsraapikq9kq1c07ik16csgp2ggnhgpprs";
-       buildDepends = [ base mtl ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/TGOlson/deterministic-game-engine";
        description = "Simple deterministic game engine";
        license = stdenv.lib.licenses.mit;
@@ -41508,7 +42528,7 @@ self: {
        sha256 = "0fsdbagj9zhbm6hh5rsjgz3iq1raxkljnr65ba506nwxmc052xcn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring cmdargs containers hashable mwc-random text
          unordered-containers zlib
        ];
@@ -41524,7 +42544,7 @@ self: {
        sha256 = "08skd630jj9h3mlxm86s7qkdrpcwhknk21dmlj69126dn67v159f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring utf8-string ];
+       executableHaskellDepends = [ base bytestring utf8-string ];
        jailbreak = true;
        description = "Get rid of unicode (utf-8) symbols in Haskell sources";
        license = stdenv.lib.licenses.mit;
@@ -41540,7 +42560,7 @@ self: {
        sha256 = "1n5rzm40srakb0jv8j9gin6m15x5l37knmdckc4xhwvliyvllrf4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory filepath hinotify process split
          text unix unordered-containers
        ];
@@ -41555,7 +42575,9 @@ self: {
        pname = "dewdrop";
        version = "0.1";
        sha256 = "1xi78d31hljbybpm3jzs4l3g35sdfhmmm7ksivjdi91gv9m88l0n";
-       buildDepends = [ base bytestring containers elf hdis86 syb ];
+       libraryHaskellDepends = [
+         base bytestring containers elf hdis86 syb
+       ];
        homepage = "https://github.com/kmcallister/dewdrop";
        description = "Find gadgets for return-oriented programming on x86";
        license = stdenv.lib.licenses.bsd3;
@@ -41568,7 +42590,7 @@ self: {
        pname = "dfrac";
        version = "0.1.2.0";
        sha256 = "1ybq5bnh85dbr9lfx5d6qw87x9qc8fs0yvbi1a6860an13lvrzy7";
-       buildDepends = [ base scientific ];
+       libraryHaskellDepends = [ base scientific ];
        description = "A package for precise decimal arithmatic using rationals";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -41584,7 +42606,7 @@ self: {
        sha256 = "0nh5cvb8macw523iids072rs9kylkv8zrliraw1jrvmhsznkj05x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile directory filepath HSH hslogger MissingH network
          old-time parsec random regex-compat unix
        ];
@@ -41599,8 +42621,8 @@ self: {
        pname = "dgim";
        version = "0.0.3";
        sha256 = "1brffyfawrdgr2659hbda42mpn9jiiq474a0yd57kj7z0dzq25f6";
-       buildDepends = [ base ];
-       testDepends = [ base Cabal QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base Cabal QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/musically-ut/haskell-dgim";
        description = "Implementation of DGIM algorithm";
@@ -41614,7 +42636,7 @@ self: {
        pname = "dgs";
        version = "0.2";
        sha256 = "100xlxqhy33kllyb4dy7q0bwwy5wn9w45qy1cb5f0yb0dqff1pnx";
-       buildDepends = [ base HTTP mtl network split ];
+       libraryHaskellDepends = [ base HTTP mtl network split ];
        jailbreak = true;
        homepage = "http://www.dmwit.com/dgs";
        description = "Haskell front-end for DGS' bot interface";
@@ -41628,7 +42650,7 @@ self: {
        pname = "dia-base";
        version = "0.1.1.3";
        sha256 = "1kx7dczabfklqpvbz7zcf1hhha8vrcbv35xl82fips02x0065b75";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41641,7 +42663,7 @@ self: {
        pname = "dia-functions";
        version = "0.2.1.4";
        sha256 = "14hfapfnfl2m9g8b6mdcmmq2fbyqgg14s0sagxbb8hhz47pznc27";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-pprint deepseq dia-base mtl xhtml
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
@@ -41656,7 +42678,7 @@ self: {
        pname = "diagrams";
        version = "1.3";
        sha256 = "1f5cpa2qjpzq9m8d3066iixbq414zk0pv1vajghb214a1w9sqaf9";
-       buildDepends = [
+       libraryHaskellDepends = [
          diagrams-contrib diagrams-core diagrams-lib diagrams-svg
        ];
        homepage = "http://projects.haskell.org/diagrams";
@@ -41675,15 +42697,18 @@ self: {
        pname = "diagrams-builder";
        version = "0.7.1.1";
        sha256 = "1klmmh144bdwrg3zs45l6yy1li64r60jygqspxzyzlm8pfgzvgah";
+       configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base-orphans bytestring cmdargs diagrams-cairo diagrams-lib
-         diagrams-postscript diagrams-rasterific diagrams-svg directory
-         exceptions filepath hashable haskell-src-exts hint JuicyPixels lens
-         lucid-svg mtl split transformers
+       libraryHaskellDepends = [
+         base base-orphans cmdargs diagrams-lib directory exceptions
+         filepath hashable haskell-src-exts hint lens mtl split transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs diagrams-cairo diagrams-lib
+         diagrams-postscript diagrams-rasterific diagrams-svg directory
+         filepath JuicyPixels lens lucid-svg
        ];
-       configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41700,7 +42725,7 @@ self: {
        pname = "diagrams-cairo";
        version = "1.3.0.3";
        sha256 = "0962kz1b45hycjij90yxq88wa5qsdll82h16agzf0pm16j8r4v5s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
          optparse-applicative pango split statestack transformers unix
@@ -41720,7 +42745,7 @@ self: {
        pname = "diagrams-canvas";
        version = "1.3.0.2";
        sha256 = "1jklgvkmdhg5ari577jh5y7vr54wjdwyz2hql1n1icbfba5d6p0c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
          optparse-applicative statestack text
@@ -41743,13 +42768,13 @@ self: {
        pname = "diagrams-contrib";
        version = "1.3.0.4";
        sha256 = "0mr4m4kl028jxrjldn38kq7zsph6vqwzdjhxd0rznzbwpsnvsnkf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base circle-packing colour containers data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
          force-layout lens linear MonadRandom mtl parsec random semigroups
          split text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers diagrams-lib HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -41767,7 +42792,7 @@ self: {
        pname = "diagrams-core";
        version = "1.3.0.2";
        sha256 = "0lrzphpia24dk1mxv33c9f5iy18r5d0lfsw92422nhbs36dslyzm";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
        ];
@@ -41782,7 +42807,9 @@ self: {
        pname = "diagrams-gtk";
        version = "1.3";
        sha256 = "0kf340d63jzb0clw9kv2i8wdhprv5cialcfqbaxyhdvf0qswp8ms";
-       buildDepends = [ base cairo diagrams-cairo diagrams-lib gtk ];
+       libraryHaskellDepends = [
+         base cairo diagrams-cairo diagrams-lib gtk
+       ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
@@ -41802,13 +42829,16 @@ self: {
        sha256 = "0pa83kd1b1fnj9plwmz8gsi2nm35ghdsxdxi4w4f7shsgc64nhrj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ansi-terminal base base64-bytestring bytestring Cabal cautious-file
-         cmdargs containers cpphs diagrams-builder diagrams-lib diagrams-svg
+       libraryHaskellDepends = [
+         ansi-terminal base base64-bytestring bytestring cautious-file
+         containers cpphs diagrams-builder diagrams-lib diagrams-svg
          directory filepath haskell-src-exts lens linear lucid-svg mtl
          parsec split strict text uniplate
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base Cabal cmdargs cpphs directory filepath
+       ];
+       testHaskellDepends = [
          base containers haskell-src-exts lens parsec QuickCheck tasty
          tasty-quickcheck
        ];
@@ -41826,7 +42856,7 @@ self: {
        pname = "diagrams-hsqml";
        version = "0.1.0.0";
        sha256 = "1j1n9bamb1fyfgbmiyqssyzh93fahmg48yb7z3z18rrxmn04rnax";
-       buildDepends = [
+       libraryHaskellDepends = [
          base colour containers diagrams-core diagrams-lib hsqml lens text
          transformers
        ];
@@ -41845,7 +42875,7 @@ self: {
        pname = "diagrams-html5";
        version = "1.3.0.2";
        sha256 = "18ifqv5xkk9cd86d3mir1qka2jy35vj4hqycq44z96hhp50yl29j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cmdargs containers data-default-class diagrams-core
          diagrams-lib lens mtl NumInstances optparse-applicative split
          statestack static-canvas text
@@ -41868,7 +42898,7 @@ self: {
        pname = "diagrams-lib";
        version = "1.3.0.2";
        sha256 = "1gvvyzpzzdwzvrh452l6r2709qpbdzx1fi1ysvzalywi3gib69ds";
-       buildDepends = [
+       libraryHaskellDepends = [
          active adjunctions array base colour containers data-default-class
          diagrams-core diagrams-solve directory distributive dual-tree
          exceptions filepath fingertree fsnotify hashable intervals
@@ -41893,7 +42923,7 @@ self: {
        sha256 = "02dz0w2im68667v5k1ykdnl3cijvqfd5pgb7qqdyyizkgza88pb4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base diagrams-builder diagrams-cairo diagrams-lib directory
          filepath linear optparse-applicative pandoc-types
        ];
@@ -41910,7 +42940,7 @@ self: {
        pname = "diagrams-pdf";
        version = "0.3.1";
        sha256 = "0wi38w0r1n1zm49r16vhmgg14v3pw7ca6wwb85y3zrbjmzfa37vy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cmdargs colour diagrams-core diagrams-lib filepath HPDF lens
          monoid-extras mtl semigroups split vector-space
        ];
@@ -41931,7 +42961,7 @@ self: {
        pname = "diagrams-pgf";
        version = "0.1.0.2";
        sha256 = "1lwwr143nlvpxpkdvsbq4z4bs7qhbx636p6hi6w448xmbniq90rj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-builder colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels mtl
          optparse-applicative process split texrunner time vector zlib
@@ -41951,7 +42981,7 @@ self: {
        pname = "diagrams-postscript";
        version = "1.3.0.2";
        sha256 = "0cdhs5ia6jm89h1bxgqm1w9gkjqnw6g0nw13vjasj0fh08nayk7s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          filepath hashable lens monoid-extras mtl semigroups split
          statestack
@@ -41968,7 +42998,9 @@ self: {
        pname = "diagrams-qrcode";
        version = "1.2";
        sha256 = "15c1h0izxi475b1n8q3dmg0kpp7dk0s4nifnxcq3lbq71jmsg8ll";
-       buildDepends = [ array base colour diagrams-core diagrams-lib ];
+       libraryHaskellDepends = [
+         array base colour diagrams-core diagrams-lib
+       ];
        jailbreak = true;
        homepage = "https://github.com/prowdsponsor/diagrams-qrcode";
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
@@ -41986,7 +43018,7 @@ self: {
        pname = "diagrams-rasterific";
        version = "1.3.1.3";
        sha256 = "1gkapj3n2xyy13a819zbckslvv8k5jkdlz7x2dzhcganra9gkcki";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
          optparse-applicative Rasterific split unix
@@ -42002,7 +43034,9 @@ self: {
        pname = "diagrams-rubiks-cube";
        version = "0.2.0.0";
        sha256 = "1rymsiqwnd37mly5dlq5hkmy5vxvyvzwkn2rm2gwmxy3amk5g4db";
-       buildDepends = [ base data-default-class diagrams-lib lens ];
+       libraryHaskellDepends = [
+         base data-default-class diagrams-lib lens
+       ];
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
@@ -42014,7 +43048,7 @@ self: {
        pname = "diagrams-solve";
        version = "0.1";
        sha256 = "0jqc0mlswrp7iz7wg02fp9ggi04rb97bzlssvpv26z6i6ig3b5sf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Pure Haskell solver routines used by diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -42031,7 +43065,7 @@ self: {
        pname = "diagrams-svg";
        version = "1.3.1.4";
        sha256 = "009xn6q9qwgi3l4v0rm79309i91m1s0jbng34bbli29s6vzwgjmz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
          monoid-extras mtl old-time optparse-applicative process semigroups
@@ -42048,7 +43082,9 @@ self: {
        pname = "diagrams-tikz";
        version = "0.6";
        sha256 = "1qs4m1xy62pv6gjgip9vx2pwlv2gzjq1h86yiiq15yg4gcbn5fav";
-       buildDepends = [ base diagrams-core diagrams-lib dlist mtl ];
+       libraryHaskellDepends = [
+         base diagrams-core diagrams-lib dlist mtl
+       ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "TikZ backend for diagrams drawing EDSL";
@@ -42064,7 +43100,7 @@ self: {
        sha256 = "1rfx3vh983f3gc6si661zimhjl47ip30l3pvf7dysjirr3gffgz1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec random-fu transformers ];
+       libraryHaskellDepends = [ base parsec random-fu transformers ];
        description = "Simplistic D&D style dice-rolling system";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -42077,8 +43113,10 @@ self: {
        pname = "dice-entropy-conduit";
        version = "1.0.0.1";
        sha256 = "01xwxajwyvv6ac48j9if6xsv05aqg1p02i7d25ivk1k56ky41l1s";
-       buildDepends = [ base bytestring conduit entropy transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring conduit entropy transformers
+       ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://monoid.at/code";
@@ -42095,7 +43133,7 @@ self: {
        pname = "dicom";
        version = "0.1.1.0";
        sha256 = "16n6mx95zfg8pa6y2zlj20imssykcrjilas1dh9li4r377rz5sdb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring old-locale pretty safe time
        ];
        jailbreak = true;
@@ -42113,8 +43151,9 @@ self: {
        sha256 = "1wjxcn53h9rp8jancspb9yq4h26215b63pghw802wgh073vp9h0i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec split ];
-       testDepends = [ base hspec parsec ];
+       libraryHaskellDepends = [ base parsec split ];
+       executableHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base hspec parsec ];
        homepage = "http://github.com/mwotton/dictparser";
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
        license = stdenv.lib.licenses.bsd3;
@@ -42127,7 +43166,7 @@ self: {
        pname = "diet";
        version = "0.0.1";
        sha256 = "0qkyfmys5k6la10dvi8wsmw120xfarjblpkr33xiazll2m9845wh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tonymorris/diet";
        description = "Discrete Interval Encoding Tree";
        license = stdenv.lib.licenses.bsd3;
@@ -42139,8 +43178,8 @@ self: {
        pname = "diff-parse";
        version = "0.2.1";
        sha256 = "0idwhxwhqd65sy0kfgwi8d942lpabyknwpyq9454y49dnn8k0lam";
-       buildDepends = [ attoparsec base text ];
-       testDepends = [ attoparsec base hspec text ];
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [ attoparsec base hspec text ];
        jailbreak = true;
        description = "A parser for diff file formats";
        license = stdenv.lib.licenses.agpl3;
@@ -42154,8 +43193,8 @@ self: {
        pname = "diff3";
        version = "0.2.0.3";
        sha256 = "0zdfn1jhsq8pd23qpkhzr8wgiwbazfbq688bjnpc406i7gq88k78";
-       buildDepends = [ base Diff ];
-       testDepends = [
+       libraryHaskellDepends = [ base Diff ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://github.com/ocharles/diff3.git";
@@ -42169,7 +43208,7 @@ self: {
        pname = "diffarray";
        version = "0.1.1";
        sha256 = "0p95i1xzp0bdm0zrdil79rfxfyz372y2qjdxyvxdzxvfb1mvalcm";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "DiffArray";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42184,7 +43223,7 @@ self: {
        sha256 = "0ggla2i4jw24a3vdq2xyz70asp80s5jl5nkwms6ck4r69zm3mci6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers Diff directory filepath pretty
          process
        ];
@@ -42205,7 +43244,7 @@ self: {
        sha256 = "08z1h3xf3j5xzhf08i9w7hvg05wvqcf13k50chx6av70f0cs2rvh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cmdargs directory filemanip filepath
          parallel-io process process-extras unix
        ];
@@ -42219,7 +43258,7 @@ self: {
        pname = "digamma";
        version = "0.1";
        sha256 = "0qij2pn107dfb9rl9rrd77l69wmfp9fghv9ysql2d7g5qdr306pd";
-       buildDepends = [ base polynomial ];
+       libraryHaskellDepends = [ base polynomial ];
        jailbreak = true;
        homepage = "https://github.com/bgamari/digamma";
        description = "A robust implementation of the digamma function";
@@ -42232,8 +43271,8 @@ self: {
        pname = "digest";
        version = "0.0.1.2";
        sha256 = "04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ zlib ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
        description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) zlib;};
@@ -42244,8 +43283,8 @@ self: {
        pname = "digest-pure";
        version = "0.0.3";
        sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w";
-       buildDepends = [ array base bytestring ];
-       testDepends = [ array base bytestring digest QuickCheck ];
+       libraryHaskellDepends = [ array base bytestring ];
+       testHaskellDepends = [ array base bytestring digest QuickCheck ];
        homepage = "http://github.com/danieldk/digest-pure";
        description = "Pure hash functions for bytestrings";
        license = "unknown";
@@ -42259,7 +43298,7 @@ self: {
        pname = "digestive-bootstrap";
        version = "0.1.0.0";
        sha256 = "0c1hd3l29sci624r4gwp3ndzmancwdy9dp3gz2fmd4jniani3kzz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-bootstrap blaze-html digestive-functors
          digestive-functors-blaze http-types text
        ];
@@ -42276,7 +43315,7 @@ self: {
        pname = "digestive-foundation-lucid";
        version = "0.0.0.1";
        sha256 = "1gpmmbf5s4kxf9xhbhf086b5n3kkr9ay2qlm6xlnf8cx1l9rn6bi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base digestive-functors digestive-functors-lucid http-types lucid
          lucid-foundation text
        ];
@@ -42294,10 +43333,10 @@ self: {
        pname = "digestive-functors";
        version = "0.8.0.0";
        sha256 = "0wlp4504dpv0diw6ln0j3f3dz3232dgcccyzlck92b27asvl3yq3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl old-locale text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers HUnit mtl old-locale QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time
@@ -42316,11 +43355,11 @@ self: {
        pname = "digestive-functors-aeson";
        version = "1.1.16";
        sha256 = "0v01applw92imi3yr6drd1bqig1l1mlps1ia2i1dcln1sh31ms9y";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring digestive-functors HUnit mtl scientific tasty
          tasty-hunit text
        ];
@@ -42337,7 +43376,7 @@ self: {
        pname = "digestive-functors-blaze";
        version = "0.6.0.6";
        sha256 = "1kx8d6w89cs9dr7fpfikv7mf0ql1lz854i492nwm64x3d016q6xi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup digestive-functors text
        ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
@@ -42353,7 +43392,7 @@ self: {
        pname = "digestive-functors-happstack";
        version = "0.6.1.1";
        sha256 = "0d613rxwja327fb2dm79xh55vhpa4mg8c1ch4xzrgw3jcchykag5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring digestive-functors happstack-server text
        ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
@@ -42369,7 +43408,7 @@ self: {
        pname = "digestive-functors-heist";
        version = "0.8.6.2";
        sha256 = "0njdhyrwzvcla65j5za0h4n41f2n1sdnar7glcal343xsy2rl019";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder digestive-functors heist mtl text xmlhtml
        ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
@@ -42383,8 +43422,8 @@ self: {
        pname = "digestive-functors-hsp";
        version = "0.5.0";
        sha256 = "00n1cxkrkd3ayl7pp6pr7nyx6zcwqpsqzflnnnf0f8dabrz4wzdc";
-       buildDepends = [ base digestive-functors hsp hsx text ];
-       buildTools = [ trhsx ];
+       libraryHaskellDepends = [ base digestive-functors hsp hsx text ];
+       libraryToolDepends = [ trhsx ];
        jailbreak = true;
        homepage = "http://src.seereason.com/digestive-functors-hsp";
        description = "HSP support for digestive-functors";
@@ -42398,7 +43437,7 @@ self: {
        pname = "digestive-functors-lucid";
        version = "0.0.0.3";
        sha256 = "1f9vlyh20b4qr7q324mxpkn7wbfp3h80il79rwqd5s5n1xx8ryhm";
-       buildDepends = [ base digestive-functors lucid text ];
+       libraryHaskellDepends = [ base digestive-functors lucid text ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Lucid frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
@@ -42412,7 +43451,7 @@ self: {
        pname = "digestive-functors-scotty";
        version = "0.2.0.2";
        sha256 = "0flm1akhx3fj8pli3nz9s7asah7cfm9afz99jx3f4rv7352saclp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring digestive-functors http-types scotty text wai
          wai-extra
        ];
@@ -42429,7 +43468,7 @@ self: {
        pname = "digestive-functors-snap";
        version = "0.6.1.3";
        sha256 = "11ah4rvi5fj9vjjzjw0m60s72qiizy1i4hnj44v88ajf2095aigh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers digestive-functors directory filepath
          mtl snap-core text
        ];
@@ -42446,8 +43485,10 @@ self: {
        pname = "digit";
        version = "0.1.1";
        sha256 = "18l6ca3kgp0g8zmai6jsq6pz7hjilcnyspvz95h9pqklhh2z32qk";
-       buildDepends = [ base lens ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/NICTA/digit";
        description = "A data-type representing digits 0-9 and other combinations";
        license = stdenv.lib.licenses.bsd3;
@@ -42461,11 +43502,11 @@ self: {
        pname = "digitalocean-kzs";
        version = "0.1.0.3";
        sha256 = "0w1gbh84sbaab4gn9avjqmwd29rzv0b2dyxqqg22vq1da8g3bzng";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HTTP http-conduit http-types text
          transformers
        ];
-       testDepends = [ base doctest hspec ];
+       testHaskellDepends = [ base doctest hspec ];
        jailbreak = true;
        homepage = "https://github.com/KazumaSATO/digitalocean-kzs";
        description = "digitalocean api for haskell";
@@ -42478,7 +43519,7 @@ self: {
        pname = "digits";
        version = "0.2";
        sha256 = "18s9k7kj0qvd4297msl0k6ziwfb5bl1gwnxlrl8b4rkqda4kf17l";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Converts integers to lists of digits and back";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42489,7 +43530,7 @@ self: {
        pname = "dimensional";
        version = "0.13.0.2";
        sha256 = "1gi8948q1kxnbc76v05swj0yr58j9lljxak6lyci529ny0ac4qlp";
-       buildDepends = [ base numtype time ];
+       libraryHaskellDepends = [ base numtype time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions";
        license = stdenv.lib.licenses.bsd3;
@@ -42501,7 +43542,7 @@ self: {
        pname = "dimensional-tf";
        version = "0.3.0.2";
        sha256 = "1bqd7298y9ymykhi70pqgxwh1599xbq5x4v75mrki5kirh8gqc4x";
-       buildDepends = [ base numtype-tf time ];
+       libraryHaskellDepends = [ base numtype-tf time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -42519,7 +43560,7 @@ self: {
        pname = "dingo-core";
        version = "0.2.0";
        sha256 = "1h0ir5h6nq2c8qk4irbcai87mxgiyahyi2lcxps959zja70pmqf5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder blaze-html
          blaze-textual bytestring conduit containers cookie deepseq fclabels
          file-embed hashable http-types random SHA shakespeare-js
@@ -42543,7 +43584,7 @@ self: {
        sha256 = "0mla83bijf077bx16r9rsvbyr8v684j1bfllfw7kswlgyz37rf4b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-html bytestring dingo-core dingo-widgets fclabels
          shakespeare-js template-haskell text transformers
        ];
@@ -42562,7 +43603,7 @@ self: {
        pname = "dingo-widgets";
        version = "0.2.0";
        sha256 = "1d61l2c6vwpngffr5ynm3zrvn7as9zgsm3zg18ldq958s0mvdn8p";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html bytestring containers dingo-core fclabels
          file-embed shakespeare-js template-haskell text transformers
          unordered-containers
@@ -42579,8 +43620,8 @@ self: {
        pname = "diophantine";
        version = "0.2.1.0";
        sha256 = "118r59mwvihzqsjd530x4pdnvqjk87b3jjdhx5avq31cfdbiyaj9";
-       buildDepends = [ array base ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ happy ];
        homepage = "https://github.com/llllllllll/Math.Diophantine";
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
@@ -42593,7 +43634,7 @@ self: {
        pname = "direct-binary-files";
        version = "1.0";
        sha256 = "0ci6av8sgrlsn12dbpvqf3imq9w1hm2ll5np2fz7gh9760vvdidr";
-       buildDepends = [ base bytestring mtl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
        homepage = "http://ireneknapp.com/software/";
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -42606,7 +43647,7 @@ self: {
        pname = "direct-daemonize";
        version = "3.1";
        sha256 = "0698l8zylkgafx8g91icysz6rq2lyrnd25blhday67s9vkdpbvxh";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://dankna.com/software/";
        description = "Library to switch to daemon mode using built-in OS facilities";
        license = stdenv.lib.licenses.bsd3;
@@ -42620,7 +43661,7 @@ self: {
        pname = "direct-fastcgi";
        version = "1.0.3";
        sha256 = "049z23gkssk3h8sx9xr3baln3hz5cykf2zp9kzmvbk2n4ky8fs78";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl network utf8-string
        ];
        jailbreak = true;
@@ -42639,7 +43680,7 @@ self: {
        pname = "direct-http";
        version = "0.6";
        sha256 = "0aghfhg0nx2bqi56cw5hnnqxnjbziihn36yqpq12gyhnahwdfvpg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers direct-daemonize lifted-base
          monad-control mtl network old-locale SafeSemaphore time
          transformers-base unix utf8-string
@@ -42657,7 +43698,7 @@ self: {
        pname = "direct-murmur-hash";
        version = "1.0.1";
        sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://ireneknapp.com/software/";
        description = "An implementation of the MurmurHash3 algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -42669,7 +43710,7 @@ self: {
        pname = "direct-plugins";
        version = "1.1";
        sha256 = "03f7jrx0skqiirvpzzakk3wwwdjanjxpzv8j5nwpzvqpb4syshcr";
-       buildDepends = [ base ghc ghc-paths ];
+       libraryHaskellDepends = [ base ghc ghc-paths ];
        homepage = "http://dankna.com/software/";
        description = "Lightweight replacement for Plugins, specific to GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -42684,8 +43725,8 @@ self: {
        pname = "direct-sqlite";
        version = "2.3.15";
        sha256 = "0hlpc3j4crh9hnydcpp6fmiisq9ddn916bslm46x5q1ajvcw7v12";
-       buildDepends = [ base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit text
        ];
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
@@ -42701,7 +43742,7 @@ self: {
        pname = "directed-cubical";
        version = "0.1.2.0";
        sha256 = "0wy6p5nymri7l1ldc6c34b9y4ncmzr2wpidbqjrmacxg07iypn3z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq hashable parallel QuickCheck
          unordered-containers vector
        ];
@@ -42717,8 +43758,8 @@ self: {
        pname = "directory";
        version = "1.2.3.0";
        sha256 = "1511nw0hgy6sg82xfimg8rbbf43vcqn6gw076m96b9zcy1dzijln";
-       buildDepends = [ base filepath time unix ];
-       testDepends = [ base filepath time unix ];
+       libraryHaskellDepends = [ base filepath time unix ];
+       testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42733,12 +43774,12 @@ self: {
        pname = "directory-layout";
        version = "0.7.4.1";
        sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring command-qq containers directory filepath free hspec
          lens semigroups template-haskell text transformers unix
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring command-qq containers directory doctest filepath
          free hspec lens semigroups template-haskell temporary text
          transformers unix unordered-containers
@@ -42753,8 +43794,8 @@ self: {
        pname = "directory-tree";
        version = "0.12.0";
        sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz";
-       buildDepends = [ base directory filepath ];
-       testDepends = [ base directory filepath process ];
+       libraryHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [ base directory filepath process ];
        homepage = "http://brandon.si/code/directory-tree-module-released/";
        description = "A simple directory-like tree datatype, with useful IO functions";
        license = stdenv.lib.licenses.bsd3;
@@ -42768,7 +43809,7 @@ self: {
        pname = "dirfiles";
        version = "0.1.0.9";
        sha256 = "0jqavj2s28ffaql3mcgasxa8fg0bv0v6irr2a5334jqydksj0b96";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers hblock safecopy text time
          unordered-containers
        ];
@@ -42784,7 +43825,7 @@ self: {
        pname = "dirstream";
        version = "1.0.0";
        sha256 = "1hxmcc62h21zsy5bgm9m4d4q7vcgps168j2mp365d2wva56r87vw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory pipes pipes-safe system-fileio system-filepath unix
        ];
        description = "Easily stream directory contents in constant memory";
@@ -42797,7 +43838,7 @@ self: {
        pname = "disassembler";
        version = "0.2.0.1";
        sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c";
-       buildDepends = [ array base containers mtl parsec ];
+       libraryHaskellDepends = [ array base containers mtl parsec ];
        homepage = "https://github.com/mgrabmueller/disassembler";
        description = "Disassembler for X86 & AMD64 machine code";
        license = stdenv.lib.licenses.bsd3;
@@ -42809,7 +43850,7 @@ self: {
        pname = "discordian-calendar";
        version = "0.1";
        sha256 = "0ykbfisrb6k8vsqx5avv99j0z4j4615hmql263h12jzhjxfzd22d";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        homepage = "https://github.com/kallisti-dev/discordian-calendar";
        description = "library for handling Discordian calendar dates";
@@ -42822,8 +43863,8 @@ self: {
        pname = "discount";
        version = "0.1.1";
        sha256 = "1q1lz9dgxp5kq0ngh7pagijmlc616vwrfrb14pjx2vc9s7yvg779";
-       buildDepends = [ base bytestring text ];
-       extraLibraries = [ markdown ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ markdown ];
        homepage = "http://github.com/lightquake/discount";
        description = "Haskell bindings to the discount Markdown library";
        license = stdenv.lib.licenses.mit;
@@ -42838,7 +43879,7 @@ self: {
        pname = "discrete-space-map";
        version = "0.0.4";
        sha256 = "1dci1yk1xpndszwcxshdh6sz6ibzxk6l2726b550xx1wffakpmcq";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base comonad distributive keys semigroupoids
        ];
        homepage = "https://github.com/sjoerdvisscher/discrete-space-map";
@@ -42855,7 +43896,7 @@ self: {
        pname = "discrimination";
        version = "0.1";
        sha256 = "11ddphyjqc1zhsr6l94hyvxmz68sbjfwaasms7ilf55x5h61g3l1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim primitive
          profunctors promises semigroups transformers vector void
        ];
@@ -42872,8 +43913,8 @@ self: {
        pname = "disjoint-set";
        version = "0.2";
        sha256 = "05m7liind4fdw5lw8a8381hm6rjzsqz86qzir79y30pj0axayc3z";
-       buildDepends = [ base containers mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl transformers ];
+       testHaskellDepends = [
          base containers HUnit mtl QuickCheck transformers
        ];
        homepage = "https://github.com/maxwellsayles/disjoint-set";
@@ -42888,7 +43929,7 @@ self: {
        pname = "disjoint-sets-st";
        version = "0.1";
        sha256 = "0yy4gp5jhfsj3gbk7gh3yplxkxxfsmrl84chp4wfr4v46ff9pc2m";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://github.com/ppetr/disjoint-sets-st/";
        description = "Imperative ST/IO based disjoint set data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -42899,10 +43940,10 @@ self: {
      mkDerivation {
        pname = "disk-free-space";
        version = "0.1.0.1";
-       revision = "2";
        sha256 = "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi";
+       revision = "2";
        editedCabalFile = "60ab6de6ad0e36274c675338a37c8985972a5a64db69dee7b4f88b797c9b401b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/redneb/disk-free-space";
        description = "Retrieve information about disk space usage";
        license = stdenv.lib.licenses.bsd3;
@@ -42916,7 +43957,7 @@ self: {
        sha256 = "1i9g4jqmmjydcvi07878k6yb5kvxab6dlw3j6nkjdn4mcsc50s71";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process ];
+       libraryHaskellDepends = [ base Cabal directory filepath process ];
        description = "Generate/Upload cabal package to Hackage";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42932,7 +43973,7 @@ self: {
        pname = "distributed-process";
        version = "0.5.5";
        sha256 = "0w3jwnfc8ca0sx9mshgbxr61pfbnp82ihy3ca5v1pkwz34dqd3f5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static ghc-prim hashable mtl network-transport random
          rank1dynamic stm syb template-haskell time transformers
@@ -42941,7 +43982,6 @@ self: {
        homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -42956,12 +43996,12 @@ self: {
        pname = "distributed-process-async";
        version = "0.2.1";
        sha256 = "0g28f2f5b28ra1gnm99yalah6rxqps4yvmi403nb0axw295pbmib";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-extras fingertree hashable mtl stm time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary deepseq distributed-process
          distributed-process-extras distributed-process-tests HUnit network
          network-transport network-transport-tcp rematch stm test-framework
@@ -42986,7 +44026,7 @@ self: {
        sha256 = "0dc0izlsxzcr5jyiad5yvgs5sp5b6dqwr6gxxkk99p7h1wpd4r2g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          azure-service-api base binary bytestring certificate
          distributed-process distributed-static executable-path filepath
          libssh2 mtl network-transport network-transport-tcp pureMD5
@@ -43012,12 +44052,12 @@ self: {
        pname = "distributed-process-client-server";
        version = "0.1.2";
        sha256 = "0wr0fxdg9114jd180p4lrjkashqcyxv69harj1ww5jc8dxdb3k2s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-extras fingertree
          hashable mtl stm time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary containers deepseq distributed-process
          distributed-process-async distributed-process-extras
          distributed-process-tests fingertree ghc-prim HUnit mtl network
@@ -43045,13 +44085,13 @@ self: {
        pname = "distributed-process-execution";
        version = "0.1.1";
        sha256 = "1zm4mcicasf59s3zzca2m7hp4ialzmsmn6arjlz2mnrhcpbkg7ja";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
          distributed-process-supervisor fingertree hashable mtl stm time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-extras
          distributed-static fingertree ghc-prim hashable HUnit mtl network
@@ -43079,11 +44119,11 @@ self: {
        pname = "distributed-process-extras";
        version = "0.2.0";
        sha256 = "0l8k1h0nx2pign82ydyzsjbkc8qw3vhhbrdggzfwvr3hamnjpqly";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-tests
          distributed-static fingertree ghc-prim hashable HUnit mtl network
@@ -43106,14 +44146,13 @@ self: {
        pname = "distributed-process-monad-control";
        version = "0.5.1";
        sha256 = "01sdzmb8izsycxshhsg0pbx0mgn10y41df1dj1s66ish0qszw07m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base distributed-process monad-control transformers
          transformers-base
        ];
        homepage = "http://haskell-distributed.github.io";
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-p2p" = callPackage
@@ -43127,14 +44166,14 @@ self: {
        sha256 = "13m283cwlas0xzqxlrmnwmwimwy29hbvymavyqffd1b0k2m6ag31";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers distributed-process mtl network
          network-transport network-transport-tcp
        ];
+       executableHaskellDepends = [ base distributed-process mtl ];
        homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -43152,11 +44191,11 @@ self: {
        sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-static fingertree ghc-prim
          hashable HUnit mtl network network-transport network-transport-tcp
@@ -43184,13 +44223,13 @@ self: {
        pname = "distributed-process-registry";
        version = "0.1.0";
        sha256 = "0c2a5x70sfii053b11xfj2x7199vmmn1k759zylbd5qs129q7hw2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
          distributed-process-supervisor fingertree hashable mtl stm time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-extras
          distributed-process-tests distributed-static fingertree hashable
@@ -43216,7 +44255,7 @@ self: {
        sha256 = "01871r4cj5zwcv63m95i622h0xxfjnflj33wvpxv1ii5z265rkjy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-accessor distributed-process
          network network-multicast network-transport network-transport-tcp
          transformers
@@ -43224,7 +44263,6 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-supervisor" = callPackage
@@ -43240,12 +44278,12 @@ self: {
        pname = "distributed-process-supervisor";
        version = "0.1.2";
        sha256 = "1b2rskzjimb2s8xrz4iv4q3c10njjnycxy5bcy159m6hawz1hzj1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
          fingertree hashable mtl stm time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-client-server
          distributed-process-extras distributed-static fingertree ghc-prim
@@ -43274,13 +44312,13 @@ self: {
        pname = "distributed-process-task";
        version = "0.1.1";
        sha256 = "04w1nhca59i6bzmwfi80mryf5pcsn0zmswq3s3ksqc6wy4mfzy1m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-client-server
          distributed-process-extras fingertree hashable mtl stm time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-async
          distributed-process-client-server distributed-process-extras
@@ -43306,12 +44344,12 @@ self: {
        pname = "distributed-process-tests";
        version = "0.4.1";
        sha256 = "1jjj77pw39bbbf58j61hdcpr872ncd1k1z2ly75n96gklw9aikbb";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
          test-framework test-framework-hunit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base network network-transport network-transport-tcp test-framework
        ];
        jailbreak = true;
@@ -43333,11 +44371,12 @@ self: {
        sha256 = "1v8jm5i4kjds7xcmzrhxg9lcz49l9ip7mm8gwjz3f3lgdxm2ykxi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq distributed-process hzk
          mtl network network-transport network-transport-tcp transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base distributed-process ];
+       testHaskellDepends = [
          base bytestring deepseq distributed-process
          distributed-process-monad-control enclosed-exceptions hspec hzk
          lifted-base monad-control network network-transport
@@ -43358,13 +44397,12 @@ self: {
        pname = "distributed-static";
        version = "0.3.2.0";
        sha256 = "1zz18lgf39i8anw17qxacb6cicm1kq0yayx9a4inxpnch5xfvg4m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq rank1dynamic
        ];
        homepage = "http://haskell-distributed.github.com";
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution" = callPackage
@@ -43373,7 +44411,9 @@ self: {
        pname = "distribution";
        version = "1.0.0.0";
        sha256 = "0zh9ap3hhylpk7bsp54hm9gj5x8f8zvm5sg7nydmxnigyq0b3l4y";
-       buildDepends = [ array base containers MonadRandom random ];
+       libraryHaskellDepends = [
+         array base containers MonadRandom random
+       ];
        jailbreak = true;
        homepage = "https://github.com/redelmann/haskell-distribution";
        description = "Finite discrete probability distributions";
@@ -43389,7 +44429,7 @@ self: {
        pname = "distribution-plot";
        version = "1.0.0.0";
        sha256 = "16k57dxg79x3i7j62ln063j4g4v4n5x80b12pajjrpxrmaffy79n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Chart Chart-cairo colour containers data-default-class
          distribution lens
        ];
@@ -43408,10 +44448,10 @@ self: {
        pname = "distributive";
        version = "0.4.4";
        sha256 = "0s2ln9jv7bh4ri2y31178pvjl8x6nik5d0klx7j2b77yjlsgblc2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim tagged transformers transformers-compat
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/distributive/";
        description = "Distributive functors -- Dual to Traversable";
        license = stdenv.lib.licenses.bsd3;
@@ -43428,9 +44468,12 @@ self: {
        sha256 = "04zmqsdpplps0xnhndpvfhxq2mfhnxbj1nzspw28ky7pcps1w621";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-ordlist fasta math-functions MonadRandom
-         optparse-applicative parsec pipes random-shuffle scientific split
+         parsec random-shuffle scientific split
+       ];
+       executableHaskellDepends = [
+         base containers fasta optparse-applicative pipes
        ];
        jailbreak = true;
        homepage = "https://github.com/GregorySchwartz/diversity";
@@ -43446,7 +44489,9 @@ self: {
        sha256 = "1p9dvzb83nlrq8h4brdq5l9dm2zf28rjhsmi7nwmac79p5pk9y2g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskeline mtl pretty ];
+       executableHaskellDepends = [
+         array base containers haskeline mtl pretty
+       ];
        description = "Generate Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43459,7 +44504,7 @@ self: {
        pname = "djinn-ghc";
        version = "0.0.2.3";
        sha256 = "190llfn8dvxkdan806nybn3d4psmnr1126zg8lmk8p5wd7nnm5fb";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers djinn-lib ghc mtl transformers
        ];
        description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
@@ -43472,7 +44517,7 @@ self: {
        pname = "djinn-lib";
        version = "0.0.1.2";
        sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0";
-       buildDepends = [ base containers mtl pretty ];
+       libraryHaskellDepends = [ base containers mtl pretty ];
        homepage = "http://www.augustsson.net/Darcs/Djinn/";
        description = "Generate Haskell code from a type. Library extracted from djinn package.";
        license = stdenv.lib.licenses.bsd3;
@@ -43484,7 +44529,9 @@ self: {
        pname = "djinn-th";
        version = "0.0.1";
        sha256 = "089b6z8hcv6q9y77zy8m96lc00r1ckzmff0mybp9l1akj7gwdpix";
-       buildDepends = [ base containers logict template-haskell ];
+       libraryHaskellDepends = [
+         base containers logict template-haskell
+       ];
        jailbreak = true;
        homepage = "http://gitorious.org/djinn-th";
        description = "Generate executable Haskell code from a type";
@@ -43498,8 +44545,8 @@ self: {
        pname = "dlist";
        version = "0.7.1.1";
        sha256 = "1zayvxvkan2s2ixajdr3f5rn1gzhprzv6cww4cbpwjhzw0l7zc08";
-       buildDepends = [ base deepseq ];
-       testDepends = [ base Cabal QuickCheck ];
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/spl/dlist";
        description = "Difference lists";
        license = stdenv.lib.licenses.bsd3;
@@ -43511,7 +44558,7 @@ self: {
        pname = "dlist-instances";
        version = "0.1";
        sha256 = "0r1j7djywqd7c224wc9ixkplj3m2mbf9k3ra7n92ja2kfpksm615";
-       buildDepends = [ base dlist semigroups ];
+       libraryHaskellDepends = [ base dlist semigroups ];
        homepage = "https://github.com/gregwebs/dlist-instances";
        description = "Difference lists instances";
        license = stdenv.lib.licenses.bsd3;
@@ -43526,11 +44573,11 @@ self: {
        pname = "dns";
        version = "2.0.0";
        sha256 = "1jq12jdidgz9nrcpnr362n6rwvxywd5v7j4fi18bqaq2f67ybjay";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers iproute mtl network random resourcet
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers doctest hspec iproute mtl network random
          resourcet word8
@@ -43550,9 +44597,10 @@ self: {
        sha256 = "0bwpfw7fsis0sqnqrgw13ifla17mcm2xk9b9jagjjqmim66d6zxb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers contstuff dns iproute time
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Caching DNS resolver library and mass DNS resolver utility";
        license = stdenv.lib.licenses.bsd3;
@@ -43565,7 +44613,7 @@ self: {
        pname = "dnsrbl";
        version = "0.0.3";
        sha256 = "07xq52aqqmzq1f68m8spr7fyax0cqnpv9mh5m4x3klxm0iznv9xm";
-       buildDepends = [ base containers hsdns HUnit network ];
+       libraryHaskellDepends = [ base containers hsdns HUnit network ];
        homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/";
        description = "Asynchronous DNS RBL lookup";
        license = stdenv.lib.licenses.bsd3;
@@ -43577,8 +44625,8 @@ self: {
        pname = "dnssd";
        version = "0.1.0.0";
        sha256 = "0gfyyr1wcxni0r0r9df6lkmv6gvi0qvwclwi9majzg10pas6dk2n";
-       buildDepends = [ base transformers ];
-       extraLibraries = [ dns_sd ];
+       libraryHaskellDepends = [ base transformers ];
+       librarySystemDepends = [ dns_sd ];
        jailbreak = true;
        homepage = "https://github.com/maxpow4h/dnssd";
        description = "DNS service discovery bindings";
@@ -43599,7 +44647,7 @@ self: {
        sha256 = "0009gpm6hgjr78bsp0cd4skvhbms83j4j9axf6zns7pnfqvc6inf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base64-bytestring binary bytestring containers directory feed
          filepath haskell98 heist hexpat json MonadCatchIO-transformers
          MonadRandom monads-fd network old-locale snap-core snap-server
@@ -43623,7 +44671,7 @@ self: {
        sha256 = "055jns09s50iyzgk9m9d7gbxvnmgd4wxfb5axsxra8qnlfq331lb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base directory directory-tree filepath ghc ghc-paths
          text
        ];
@@ -43643,7 +44691,7 @@ self: {
        sha256 = "0020pi4m0n6cvb6hdzhai5f9jidwc8dy6qq3pjs6g4dwql9igsb8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath html MissingH mtl
          old-locale tagsoup time
        ];
@@ -43663,11 +44711,11 @@ self: {
        pname = "docker";
        version = "0.2.0.2";
        sha256 = "0iv36j8ixjbxlwbpw426lj5z39kwd3mrpb5qqw7c2nxkfp2dr0gi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default lens lens-aeson
          network-uri pipes pipes-bytestring pipes-http pipes-text text wreq
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers data-default http-types lens
          lens-aeson pipes pipes-bytestring pipes-http pipes-text process
          QuickCheck tasty tasty-hunit tasty-quickcheck text wreq
@@ -43693,15 +44741,18 @@ self: {
        sha256 = "0gsaw0qbbd3a017w82hwvmrv0ygxki2c8ls3b6hfc38a17ja68vc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring conduit
          conduit-combinators conduit-extra cryptohash directory filepath
-         hashable hslogger lens monad-logger mtl optparse-applicative
-         persistent-sqlite persistent-template process regex-compat
-         resourcet retry stm streaming-commons system-filepath temporary
-         text time transformers unix unordered-containers vector wreq
+         hashable hslogger lens monad-logger mtl persistent-sqlite
+         persistent-template process regex-compat resourcet retry stm
+         streaming-commons system-filepath temporary text time transformers
+         unix unordered-containers vector wreq
        ];
-       testDepends = [ base HTF text vector ];
+       executableHaskellDepends = [
+         base directory filepath hslogger optparse-applicative process
+       ];
+       testHaskellDepends = [ base HTF text vector ];
        jailbreak = true;
        homepage = "https://github.com/factisresearch/dockercook";
        description = "A build tool for multiple docker image layers";
@@ -43715,8 +44766,8 @@ self: {
        pname = "dockerfile";
        version = "0.1.0.1";
        sha256 = "0980w0fh5xb7azknnmph6rmnzswsjw360ga5ymds2valq2vc0ji9";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        description = "A simple DSL for describing and generating Dockerfile containers in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -43729,8 +44780,10 @@ self: {
        pname = "docopt";
        version = "0.7.0.2";
        sha256 = "0c62lz0xmrd3ycnpmw254jbc5s999nb0xzrrkbv3cj3n9zzcyzak";
-       buildDepends = [ base containers parsec template-haskell th-lift ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers parsec template-haskell th-lift
+       ];
+       testHaskellDepends = [
          aeson ansi-terminal base bytestring containers parsec split
        ];
        homepage = "https://github.com/docopt/docopt.hs";
@@ -43749,11 +44802,12 @@ self: {
        sha256 = "1jbyhzbi2hfrfg7vbkpj6vriaap8cn99nnmzwcfscwaijz09jyrm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq directory filepath ghc ghc-paths process syb
          transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base base-compat deepseq directory filepath ghc ghc-paths hspec
          HUnit process QuickCheck setenv silently stringbuilder syb
          transformers
@@ -43773,10 +44827,13 @@ self: {
        sha256 = "1rgk831yf4gamb4m10bbcc2r4hhdh4ffjjr80smkfs95x3pi15d3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory doctest filepath
        ];
-       testDepends = [ base doctest ];
+       executableHaskellDepends = [
+         aeson base bytestring directory doctest filepath
+       ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
@@ -43791,15 +44848,18 @@ self: {
      mkDerivation {
        pname = "doctest-discover-configurator";
        version = "0.1.0.6";
-       revision = "1";
        sha256 = "1n2x8rp67ddifyahxcny0k7r514qa82lbxg13z7yg2kvmrfip7r8";
+       revision = "1";
        editedCabalFile = "79f62a00ff10acba4f850730ed2ffe99d5637bdfdb48f6fc4b92f03fbbb20a45";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator directory doctest filepath
        ];
-       testDepends = [ base doctest ];
+       executableHaskellDepends = [
+         base bytestring configurator directory doctest filepath
+       ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "http://github.com/relrod/doctest-discover-noaeson";
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
@@ -43813,8 +44873,8 @@ self: {
        pname = "doctest-prop";
        version = "0.2.0.1";
        sha256 = "1amfsq53s0bgal77g7hbsvbn1vlqh1jc3qvcjwv0achc6z65dc2a";
-       buildDepends = [ base HUnit QuickCheck ];
-       testDepends = [ base doctest HUnit QuickCheck ];
+       libraryHaskellDepends = [ base HUnit QuickCheck ];
+       testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -43825,7 +44885,7 @@ self: {
        pname = "dom-lt";
        version = "0.1.3";
        sha256 = "0i51d8d49jpf7mhl6c2a4565d4vmh0x5f4kam46hn5ahb1v2nrga";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "The Lengauer-Tarjan graph dominators algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43838,11 +44898,11 @@ self: {
        pname = "dom-selector";
        version = "0.2.0.1";
        sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html containers html-conduit parsec QuickCheck
          template-haskell text th-lift xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-html containers html-conduit parsec QuickCheck
          template-haskell text th-lift xml-conduit
        ];
@@ -43859,7 +44919,7 @@ self: {
        pname = "domain-auth";
        version = "0.2.1";
        sha256 = "1b1kw4pkm1f5z5qwyfpppk5rjqzi4i7b2vx4zmb2cd9398dnkj4a";
-       buildDepends = [
+       libraryHaskellDepends = [
          appar base binary blaze-builder bytestring containers
          crypto-pubkey-types dns iproute network RSA SHA
        ];
@@ -43877,10 +44937,13 @@ self: {
        sha256 = "13ypa09adkj7yilyxxf84rkpap5h4mmx4pwvc4x6121j77xz29dy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hscolour lens mtl random random-extras random-fu transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base hscolour lens mtl random random-extras random-fu transformers
+       ];
+       testHaskellDepends = [
          base hscolour hspec lens mtl random random-extras random-fu
          transformers
        ];
@@ -43888,7 +44951,6 @@ self: {
        homepage = "http://github.com/egonschiele/dominion";
        description = "A simulator for the board game Dominion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "domplate" = callPackage
@@ -43899,7 +44961,7 @@ self: {
        pname = "domplate";
        version = "0.1.0.1";
        sha256 = "1njzjxz7mymjfismmv8rxkqb24m0gindbsiszbjgy1wm1lwrspb4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers tagsoup text unordered-containers vector
          yaml
        ];
@@ -43916,7 +44978,7 @@ self: {
        sha256 = "1fwfwp24fdgir0m721c801xi8gkhz2y8s1r1gxdp7m1vl5d0xqii";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers graphviz hxt text ];
+       executableHaskellDepends = [ base containers graphviz hxt text ];
        homepage = "http://redmine.iportnov.ru/projects/dot2graphml";
        description = "Converter from GraphViz .dot format to yEd GraphML";
        license = stdenv.lib.licenses.bsd3;
@@ -43932,10 +44994,13 @@ self: {
        sha256 = "1hrr8w5hi6l8v85cwq5r6175al6waj0hmfkvnx8xib2rpby47px6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base base-compat parsec ];
+       executableHaskellDepends = [
          base base-compat optparse-applicative parsec process
        ];
-       testDepends = [ base base-compat hspec parsec parseerror-eq ];
+       testHaskellDepends = [
+         base base-compat hspec parsec parseerror-eq
+       ];
        homepage = "https://github.com/stackbuilders/dotenv-hs";
        description = "Loads environment variables from dotenv files";
        license = stdenv.lib.licenses.mit;
@@ -43953,12 +45018,16 @@ self: {
        sha256 = "0hj21rvjbn8hmb3kf4225ir57j75d8jyzhw2rw8kmjxw3w62l49f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath haskell-src HFuse
          HUnit parsec process QuickCheck template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2 transformers unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory filepath HFuse parsec process
+         transformers unix
+       ];
+       testHaskellDepends = [
          base containers haskell-src HUnit parsec QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
@@ -43976,7 +45045,8 @@ self: {
        sha256 = "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/dotgen";
        description = "A simple interface for building .dot graph files.";
        license = stdenv.lib.licenses.bsd3;
@@ -43990,8 +45060,10 @@ self: {
        pname = "double-conversion";
        version = "2.0.1.0";
        sha256 = "034ji9jgf3jl0n5pp1nki3lsg173c3b9vniwnwp1q21iasqbawh0";
-       buildDepends = [ base bytestring ghc-prim integer-gmp text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
          base bytestring test-framework test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/bos/double-conversion";
@@ -44005,7 +45077,7 @@ self: {
        pname = "dove";
        version = "0.0.0";
        sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd";
-       buildDepends = [ acl2 base ];
+       libraryHaskellDepends = [ acl2 base ];
        description = "The Dove verification language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44020,12 +45092,11 @@ self: {
        sha256 = "15vlydfw0yw49jha90zcxynwajnyxhqn32x9w7n58k3j0rkcrp9l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base directory elerea GLFW mersenne-random OpenGL
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "download" = callPackage
@@ -44034,7 +45105,7 @@ self: {
        pname = "download";
        version = "0.3.2";
        sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3";
-       buildDepends = [ base bytestring feed tagsoup xml ];
+       libraryHaskellDepends = [ base bytestring feed tagsoup xml ];
        homepage = "http://code.haskell.org/~dons/code/download";
        description = "High-level file download based on URLs";
        license = stdenv.lib.licenses.bsd3;
@@ -44047,7 +45118,7 @@ self: {
        pname = "download-curl";
        version = "0.1.4";
        sha256 = "1wf3pf2k4i6jvpfsjlxdj6v53qd33jj1z1ipaf3p47glgx4xw3lm";
-       buildDepends = [ base bytestring curl feed tagsoup xml ];
+       libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/download-curl";
        description = "High-level file download based on URLs";
@@ -44064,7 +45135,7 @@ self: {
        sha256 = "1bj4310j3s26xd4ic6hm284dlk91npwilfbwvrk1zz8fas6yr6z6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring filepath http-enumerator tagsoup text
        ];
        jailbreak = true;
@@ -44080,7 +45151,7 @@ self: {
        pname = "dozenal";
        version = "0.1.0.0";
        sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/siddhanathan/dozenal";
        description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
@@ -44095,10 +45166,10 @@ self: {
      mkDerivation {
        pname = "dozens";
        version = "0.1.1";
-       revision = "1";
        sha256 = "1hvsdc69ag4x8rp2pzr3cxjfbl4fh9bdj4bwlkfvpr755qdi45ky";
+       revision = "1";
        editedCabalFile = "08e6297d7be6ec753261aa5cb8f265a6ba6c369f44d25f46f9784ae1d8a88e52";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default-class http-client http-types
          reflection scientific text transformers
        ];
@@ -44114,7 +45185,9 @@ self: {
        pname = "dph-base";
        version = "0.7.0.1";
        sha256 = "19rc0h94lgxyndaw41wgnc0prwffl780i6nqsn9b7byvgy97f15y";
-       buildDepends = [ array base ghc-prim pretty random vector ];
+       libraryHaskellDepends = [
+         array base ghc-prim pretty random vector
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell common config and debugging functions";
@@ -44131,7 +45204,7 @@ self: {
        sha256 = "1qbj8hsgpmcx95qsqycb6cnfb5vfk9h3w1jyq4k02hf9g7gyvckz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers dph-base dph-lifted-vseg dph-prim-par HUnit
          old-time parseargs random vector
        ];
@@ -44150,7 +45223,7 @@ self: {
        pname = "dph-lifted-base";
        version = "0.7.0.1";
        sha256 = "1gp3l9bgpmly3h74hyfxi3yfm8v4r918800ca64q1b16019hk20k";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers dph-base dph-prim-par ghc pretty random
          template-haskell vector
        ];
@@ -44169,7 +45242,7 @@ self: {
        pname = "dph-lifted-copy";
        version = "0.7.0.1";
        sha256 = "11aaiarvrm5463b77r2jimw78pr39g8apjk7bim3d8rl3ija775q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base dph-base dph-prim-par ghc random template-haskell vector
        ];
        jailbreak = true;
@@ -44187,7 +45260,7 @@ self: {
        pname = "dph-lifted-vseg";
        version = "0.7.0.1";
        sha256 = "0vkq7kyd65znzqxh32ql2lrm30vg1wy85bnjg8g08s9q9j3j6a45";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers dph-base dph-lifted-base dph-prim-par ghc
          pretty random template-haskell vector
        ];
@@ -44216,7 +45289,7 @@ self: {
        pname = "dph-prim-interface";
        version = "0.7.0.1";
        sha256 = "17m03gylc61d7mx26rz70kwmi014rv1g14683vraa1b77pci5h8j";
-       buildDepends = [ base dph-base random vector ];
+       libraryHaskellDepends = [ base dph-base random vector ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (abstract interface)";
@@ -44231,7 +45304,7 @@ self: {
        pname = "dph-prim-par";
        version = "0.7.0.1";
        sha256 = "13x7ribvcm965pnzissj0cwk17r5f0ag1zs7w31za17kal3r91pp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base dph-base dph-prim-interface dph-prim-seq old-time random
          vector
        ];
@@ -44250,7 +45323,7 @@ self: {
        pname = "dph-prim-seq";
        version = "0.7.0.1";
        sha256 = "1fz95qzvk2f7zg8am73vdbk14ms420vfvapz79piip0s4bv8cnqr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base dph-base dph-prim-interface ghc-prim primitive random vector
        ];
        jailbreak = true;
@@ -44272,20 +45345,23 @@ self: {
      }) {};
 
   "dpkg" = callPackage
-    ({ mkDerivation, base, bindings-DSL, bytestring, HUnit, libdpkg
-     , monad-loops
+    ({ mkDerivation, base, bindings-DSL, bytestring, dpkg, HUnit
+     , libdpkg, monad-loops
      }:
      mkDerivation {
        pname = "dpkg";
        version = "0.0.3";
        sha256 = "1bqrj1vqqjnv3qcs1s7lbwyzry95fzxrhi6340zqv0ibvyqnaz5k";
-       buildDepends = [ base bindings-DSL bytestring monad-loops ];
-       testDepends = [ base bytestring HUnit libdpkg ];
-       pkgconfigDepends = [ libdpkg ];
+       libraryHaskellDepends = [
+         base bindings-DSL bytestring monad-loops
+       ];
+       libraryPkgconfigDepends = [ libdpkg ];
+       testHaskellDepends = [ base bytestring HUnit ];
+       testSystemDepends = [ dpkg ];
+       testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
-       broken = true;
-     }) { libdpkg = null;};
+     }) { inherit (pkgs) dpkg;  libdpkg = null;};
 
   "drClickOn" = callPackage
     ({ mkDerivation, base, containers }:
@@ -44293,7 +45369,7 @@ self: {
        pname = "drClickOn";
        version = "0.1";
        sha256 = "10rcmqa2x5xlh5pqfsg9dagf2lmrwc2bby3zklzv3x4s3yqg2ar3";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/cwi-swat/monadic-frp";
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
@@ -44305,13 +45381,14 @@ self: {
      mkDerivation {
        pname = "draw-poker";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "16b17qfj3bah468hqsksk2rhyl33m2vyqw0rrs1wyaz75yq35257";
+       revision = "1";
        editedCabalFile = "62a11039e0b634f0b372c28d87f6fe84f40a33981211c9f2bc077135abcef629";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base random-shuffle safe ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base random-shuffle safe ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://tune.hateblo.jp/entry/2015/05/12/023112";
        description = "playing draw poker";
        license = stdenv.lib.licenses.bsd3;
@@ -44325,8 +45402,8 @@ self: {
        sha256 = "08zmy1r1qj7adhsp4z0mr7h0qvc9gaziacjqfl0629n5x2i7zddr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hspec QuickCheck ];
+       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;
@@ -44338,7 +45415,9 @@ self: {
        pname = "drifter";
        version = "0.1.0.1";
        sha256 = "1ldqlkxkshg4i1iqvjzq01cz9mxhyaszhybhq4kngd0rig3n1qhq";
-       buildDepends = [ base bytestring postgresql-simple text time ];
+       libraryHaskellDepends = [
+         base bytestring postgresql-simple text time
+       ];
        jailbreak = true;
        homepage = "https://github.com/AndrewRademacher/drifter";
        description = "Simple schema management for arbitrary databases";
@@ -44356,7 +45435,7 @@ self: {
        pname = "dropbox-sdk";
        version = "0.3.1";
        sha256 = "1s0aki1ayjickkkwmn1mc38gnd257v24wy6yj9p05qm2g8gm7xy2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive certificate conduit
          HTTP http-conduit http-types json monad-control network old-locale
          pem resourcet template-haskell time tls tls-extra transformers
@@ -44379,7 +45458,7 @@ self: {
        sha256 = "1nrvrcf51jdy5vhqbnrllb3y5rgrhg1qwsd05z24s38ra40whbgp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath haskell98 process regex-posix
          time
        ];
@@ -44397,8 +45476,8 @@ self: {
        pname = "ds-kanren";
        version = "0.2.0.1";
        sha256 = "14sgqd55jnqahp0mi4x46a5903bnj2f2crlfrkyg9qds73wjj7fk";
-       buildDepends = [ base containers logict ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base containers logict ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44417,16 +45496,18 @@ self: {
        sha256 = "00r1wbgbkpnza1jjd14vqr4hwgfkhnz7yivkx4bla5frfdlv5q58";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson algebra-dag algebra-sql base bytestring bytestring-lexing
-         containers Decimal DSH either HDBC HDBC-odbc HUnit mtl process
-         QuickCheck random semigroups set-monad template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         vector
+         containers Decimal DSH either HDBC HDBC-odbc mtl process random
+         semigroups set-monad template-haskell text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring bytestring-lexing containers DSH HDBC HDBC-odbc
+         HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text vector
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc" = callPackage
@@ -44438,7 +45519,7 @@ self: {
        pname = "dsmc";
        version = "0.1.0.1";
        sha256 = "0va22bx3fj80rl03mv3pnwvsdjkax41pp8qxyj3yiicbyi6zzaa5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers entropy hslogger mwc-random
          parallel primitive repa strict transformers vector
        ];
@@ -44458,7 +45539,7 @@ self: {
        sha256 = "0wry1dwcf3dwd780aic3v6jlrdjplrsciw1rr582a78c7anasjr0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs ConfigFile dsmc gloss gloss-raster hslogger
          mtl repa strict transformers vector
        ];
@@ -44474,7 +45555,7 @@ self: {
        pname = "dson";
        version = "0.3.0.0";
        sha256 = "15pqja0q1lram7xi5xk8dlcfg5m1z0l4zscqw24wm50hmqpxi09d";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "https://github.com/lcycon/hs-dson";
        description = "Haskell DogeScript Object Notation Parser";
@@ -44487,7 +45568,7 @@ self: {
        pname = "dson-parsec";
        version = "0.4.1.1";
        sha256 = "1zflz9vhcz7psssn6hrizmwdmrvpagxhl0648k6f1n9xj50kp99y";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "https://github.com/alvare/dson-parsec";
        description = "DSON parser";
@@ -44502,7 +45583,8 @@ self: {
        sha256 = "1h7y3b2gwbkq97lv6f9a4zssyqs422g5zj2bi9mq1a5fzy5i4v4v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base random ];
+       libraryHaskellDepends = [ array base random ];
+       executableHaskellDepends = [ array base ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/DSP";
        description = "Haskell Digital Signal Processing";
@@ -44516,7 +45598,7 @@ self: {
        pname = "dstring";
        version = "0.4.0.4";
        sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm";
-       buildDepends = [ base base-unicode-symbols dlist ];
+       libraryHaskellDepends = [ base base-unicode-symbols dlist ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/dstring";
        description = "Difference strings";
@@ -44531,15 +45613,16 @@ self: {
      mkDerivation {
        pname = "dtab";
        version = "1.0";
-       revision = "2";
        sha256 = "1zx5kpljjxyzbsg0hg8ml8mig1s9hggm2nlqmbfbxmldxh3pq1j3";
+       revision = "2";
        editedCabalFile = "50fe31cffb6f7eab4428bf547fd0c7e7804a0f20c604692a18b213d4a54a0a7a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754 pretty
          transformers
        ];
+       executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44555,7 +45638,7 @@ self: {
        pname = "dtd";
        version = "1.1.0.2";
        sha256 = "11sqmsxw36rn2xkccr7zrmpzijpc3j0z1cxsjcfncnj3l5iaqryp";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base blaze-builder conduit containers
          lifted-base monad-control network resourcet text transformers
          uri-conduit xml-catalog xml-conduit xml-types
@@ -44575,7 +45658,7 @@ self: {
        pname = "dtd-text";
        version = "0.1.2.0";
        sha256 = "1czygz52aparm4qbkfsskm9qd5wirdpccjn66nh7d62d440j1as8";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers dtd-types text xml-types
        ];
        homepage = "http://github.com/m15k/hs-dtd-text";
@@ -44590,7 +45673,7 @@ self: {
        pname = "dtd-types";
        version = "0.3.0.1";
        sha256 = "1w2ni9b8kn242grdqb4wxvgxqpkpp9qy66d57n33l5jghlg8b0s7";
-       buildDepends = [ base text xml-types ];
+       libraryHaskellDepends = [ base text xml-types ];
        homepage = "http://projects.haskell.org/dtd/";
        description = "Basic types for representing XML DTDs";
        license = stdenv.lib.licenses.bsd3;
@@ -44605,7 +45688,7 @@ self: {
        sha256 = "0qszlhll0cx0clydypg0r0g00v8ig1aasqp1ga0jnbfr7q7rwfrr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell interface to the DTrace system tracing utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44618,8 +45701,8 @@ self: {
        pname = "dtw";
        version = "1.0.1.0";
        sha256 = "15qk8r958pssgwqhxffw45vm5bpvv9wfarv9spaplrnb3sm5bzhk";
-       buildDepends = [ base containers vector vector-space ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers vector vector-space ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2 thyme vector vector-space
        ];
@@ -44635,7 +45718,7 @@ self: {
        pname = "dual-tree";
        version = "0.2.0.6";
        sha256 = "0zdmycfr7b2gf63r2w48ylhcywphz9v3z79im33q1wb7p7pjiacv";
-       buildDepends = [ base monoid-extras newtype semigroups ];
+       libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44648,11 +45731,11 @@ self: {
        pname = "dump";
        version = "0.2.8";
        sha256 = "0p0wwcxm2lgfbx82s226dprd8qa526pnrnpakxmdz5svd6ib0gh4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta interpolatedstring-perl6 template-haskell
          text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base haskell-src-meta hspec interpolatedstring-perl6 QuickCheck
          template-haskell text
        ];
@@ -44676,14 +45759,21 @@ self: {
        sha256 = "1k63904aly7qwx96vqys0yx4amys8y5dl9xb9hp4x7ymw0b6h43i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty ansi-terminal base base64-bytestring bytestring
-         containers directory executable-path filepath fsnotify http-types
-         language-javascript lens MissingH mtl process regex-compat scotty
-         shake system-fileio system-filepath text text-format transformers
-         unordered-containers utf8-string wai warp
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal base bytestring containers
+         directory executable-path filepath fsnotify http-types
+         language-javascript lens MissingH mtl regex-compat scotty shake
+         system-fileio text text-format transformers unordered-containers
+         utf8-string wai warp
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty ansi-terminal base base64-bytestring bytestring
+         containers directory filepath fsnotify http-types
+         language-javascript lens MissingH mtl process regex-compat scotty
+         shake system-filepath text text-format transformers
+         unordered-containers wai warp
+       ];
+       testHaskellDepends = [
          base HUnit MissingH QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        jailbreak = true;
@@ -44702,10 +45792,10 @@ self: {
        pname = "dvda";
        version = "0.4";
        sha256 = "1q8avdmzqxnr63ak0i1n6n4cvc23qkrmqlii628mis7vzfcw2yp8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable hashtables mtl unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          ad base containers directory fgl file-location graphviz hashable
          hashtables mtl process QuickCheck test-framework
          test-framework-quickcheck2 unordered-containers
@@ -44721,9 +45811,9 @@ self: {
        pname = "dvdread";
        version = "0.1";
        sha256 = "1lxqm9r4zcw364yzpqaaf4nrja5n88vlwa527ixifhc80x6ffx0m";
-       buildDepends = [ base bytestring mtl ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ dvdread ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       libraryPkgconfigDepends = [ dvdread ];
+       libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44735,7 +45825,7 @@ self: {
        pname = "dvi-processing";
        version = "0.3.1";
        sha256 = "0dp6acmrvlns85nzbbh65vd6fjam04h11kxd9bk6j6hqa2qaqa43";
-       buildDepends = [ base bytestring filepath transformers ];
+       libraryHaskellDepends = [ base bytestring filepath transformers ];
        jailbreak = true;
        description = "Read/write DVI and TFM file";
        license = stdenv.lib.licenses.publicDomain;
@@ -44747,8 +45837,8 @@ self: {
        pname = "dvorak";
        version = "0.1.0.0";
        sha256 = "1kxnzzm24kslsyy9fsjazfz14svbh9svh6f7rnf060as864vmj5g";
-       buildDepends = [ base containers ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/kvanberendonck/codec-dvorak";
        description = "Dvorak encoding for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -44760,7 +45850,7 @@ self: {
        pname = "dwarf";
        version = "0.23";
        sha256 = "0h6bzh628cz0qnbk4aiz5859r9va99q307scbwzvs1wn3nm6dszl";
-       buildDepends = [ base binary bytestring containers ];
+       libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44773,7 +45863,7 @@ self: {
        pname = "dwarf-el";
        version = "0.2.1.1";
        sha256 = "18ba03v1m7xbsgygjgfrzr9c7fah21lr3300mhvqipicdgrb691w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers transformers utf8-string
        ];
        description = "Parser for DWARF debug format";
@@ -44790,10 +45880,11 @@ self: {
        sha256 = "15mzv6sa2qf0g9skwq4ij35l3lqbc4x3fzwj5hkx93f8pz2bj1hi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-mmap containers dwarf-el elf lens pretty
          transformers
        ];
+       executableHaskellDepends = [ base containers dwarf-el ];
        jailbreak = true;
        description = "High-level wrapper around the dwarf library";
        license = stdenv.lib.licenses.bsd3;
@@ -44805,7 +45896,7 @@ self: {
        pname = "dx9base";
        version = "0.1.1";
        sha256 = "16gwlpxfgh78sx7cb2ryqklhz5smhwk51ma260d6rg082nhy5y3i";
-       buildDepends = [ base Win32 ];
+       libraryHaskellDepends = [ base Win32 ];
        description = "Backend for a binding to the Microsoft DirectX 9 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44817,8 +45908,8 @@ self: {
        pname = "dx9d3d";
        version = "0.1.1.1";
        sha256 = "1y9g53jajgnlrzzg5vzgx329mii9k396xai4b04hs6gndkdrwprj";
-       buildDepends = [ base dx9base Win32 ];
-       extraLibraries = [ d3d9 ];
+       libraryHaskellDepends = [ base dx9base Win32 ];
+       librarySystemDepends = [ d3d9 ];
        description = "A binding to the Microsoft DirectX 9 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44830,8 +45921,8 @@ self: {
        pname = "dx9d3dx";
        version = "0.1.1";
        sha256 = "1n5rbq7k1g5l9y5vkadypfksai9sfx2vimdsas1if9h3jnqvvf67";
-       buildDepends = [ base dx9base dx9d3d Win32 ];
-       extraLibraries = [ d3dx9 ];
+       libraryHaskellDepends = [ base dx9base dx9d3d Win32 ];
+       librarySystemDepends = [ d3dx9 ];
        description = "A binding to the Microsoft DirectX 9 D3DX API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44846,11 +45937,11 @@ self: {
        pname = "dynamic-cabal";
        version = "0.3.5";
        sha256 = "0fkr3hps3v0ygcah4dpzfqyfxm0rj4knivbbarllzv86h042vwxw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default directory filepath ghc ghc-paths
          haskell-generate haskell-src-exts time void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory doctest filepath ghc HUnit tasty
          tasty-hunit tasty-th
        ];
@@ -44867,7 +45958,7 @@ self: {
        pname = "dynamic-graph";
        version = "0.1.0.8";
        sha256 = "1lh7wlzmm1nsbzy7ahkcajyfkg4v2vbyp0992570w32bn7nl4b5k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo colour either GLFW-b GLUtil OpenGL pango pipes
          transformers
        ];
@@ -44883,7 +45974,7 @@ self: {
        pname = "dynamic-linker-template";
        version = "0.1.0.4";
        sha256 = "043d8kp4a5pskfyzihm7laa1h9jchdgzvc8v32ck0mxcrigicrgq";
-       buildDepends = [ base containers template-haskell unix ];
+       libraryHaskellDepends = [ base containers template-haskell unix ];
        homepage = "http://github.com/hsyl20/dynamic-linker-template";
        description = "Automatically derive dynamic linking methods from a data type";
        license = stdenv.lib.licenses.bsd3;
@@ -44897,7 +45988,7 @@ self: {
        pname = "dynamic-loader";
        version = "0.0";
        sha256 = "0cwmwf60gfcb1xzbx9yz870fxxpdwcd0kmj4pkz6zy8l53j3mqi0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory ghc-prim hashable hashtables time transformers
        ];
        homepage = "https://github.com/ggreif/dynamic-loader";
@@ -44911,7 +46002,7 @@ self: {
        pname = "dynamic-mvector";
        version = "0.1.0.3";
        sha256 = "1nydfmhkdgynng4pn7c6f3rqdx2b21j7sqnzkb477gkri58y6335";
-       buildDepends = [ base primitive vector ];
+       libraryHaskellDepends = [ base primitive vector ];
        homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
@@ -44925,10 +46016,10 @@ self: {
        pname = "dynamic-object";
        version = "0.2.1";
        sha256 = "1xzjwsdq4v08m66lph81h67sii7qkvni5pygmh3iblx7rybsvflb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers lens mtl QuickCheck text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest ghc hspec lens QuickCheck transformers
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
@@ -44946,10 +46037,10 @@ self: {
      mkDerivation {
        pname = "dynamic-plot";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "0yrkf28hsh992bd9cx3dpc69xg444n9j819ysqjfci7wwnvzxx31";
+       revision = "1";
        editedCabalFile = "bf93f06c056b95264f16bd647b64220d9dd81c421045b66a9a2d2005659cecf5";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base colour constrained-categories containers deepseq
          diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk
          lens manifolds MemoTrie MonadRandom mtl process random semigroups
@@ -44970,11 +46061,11 @@ self: {
        pname = "dynamic-pp";
        version = "0.2.0";
        sha256 = "03y9sl3xcnp1ixi4y0i1a7frd2bgfvnb0r4pqjs38bvjkz96bbdd";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base blaze-builder bytestring Cabal hashable
          unordered-containers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base blaze-builder bytestring Cabal hashable
          HUnit-Plus unordered-containers utf8-string
        ];
@@ -44992,7 +46083,7 @@ self: {
        pname = "dynamic-state";
        version = "0.2.0.0";
        sha256 = "1dp0sp5cjk7rga9jkjdhl1alpj9g6g51zm57g58b64h070b9r82k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hashable unordered-containers
        ];
        description = "Optionally serializable dynamic state keyed by type";
@@ -45016,15 +46107,19 @@ self: {
        sha256 = "1dmgi69gsh7rm385pykajlq73m3cfaw617gkj2nv0h4x11mdp0ms";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring casadi-bindings casadi-bindings-core cereal
-         Chart Chart-gtk cmdargs colour containers data-default-class
-         distributive generic-accessors hmatrix jacobi-roots lens linear mtl
-         not-gloss Plot-ho-matic process reflection semigroups spatial-math
-         stm unordered-containers vector vector-binary-instances
-         zeromq4-haskell
+       libraryHaskellDepends = [
+         base binary casadi-bindings casadi-bindings-core cereal containers
+         distributive generic-accessors hmatrix jacobi-roots linear mtl
+         Plot-ho-matic process reflection spatial-math vector
+         vector-binary-instances
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring casadi-bindings casadi-bindings-core cereal Chart
+         Chart-gtk cmdargs colour containers data-default-class
+         generic-accessors lens linear mtl not-gloss Plot-ho-matic
+         semigroups stm unordered-containers vector zeromq4-haskell
+       ];
+       testHaskellDepends = [
          base binary casadi-bindings cereal hmatrix hmatrix-gsl HUnit linear
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
@@ -45042,7 +46137,7 @@ self: {
        pname = "dyre";
        version = "0.8.12";
        sha256 = "10hnlysy4bjvvznk8v902mlk4jx95qf972clyi1l32xkqrf30972";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary directory executable-path filepath ghc-paths io-storage
          process time unix xdg-basedir
        ];
@@ -45057,7 +46152,7 @@ self: {
        pname = "dzen-utils";
        version = "0.1.1";
        sha256 = "05s47s40amydwd6dc75rnaganx2qi2spx668p8x0xs0fdwnqvsf0";
-       buildDepends = [ base colour process ];
+       libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
      }) {};
@@ -45068,7 +46163,7 @@ self: {
        pname = "eager-sockets";
        version = "0.1";
        sha256 = "10g8w50hhw8ap6lvsv9apmmfaqvqjwzhnq4mx1npapb8cmsmzgdb";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        jailbreak = true;
        description = "Socket operations with timeouts";
        license = "unknown";
@@ -45082,7 +46177,7 @@ self: {
        pname = "easy-api";
        version = "0.1.0.0";
        sha256 = "0ch4vb7h499gfc2j60gfzj164f3s8rk9hw22g36ymiihsi3ipl1b";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring either http-conduit mtl resourcet text
        ];
        jailbreak = true;
@@ -45098,7 +46193,7 @@ self: {
        pname = "easy-file";
        version = "0.2.1";
        sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz";
-       buildDepends = [ base directory filepath time unix ];
+       libraryHaskellDepends = [ base directory filepath time unix ];
        homepage = "http://github.com/kazu-yamamoto/easy-file";
        description = "Cross-platform File handling";
        license = stdenv.lib.licenses.bsd3;
@@ -45112,7 +46207,7 @@ self: {
        pname = "easyjson";
        version = "0.1.0.1";
        sha256 = "19464q0xc3pk1jbf3p94ym97i90600dzhyy4ddv9xf4ligvgbsg2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl parsec text unordered-containers vector
        ];
        jailbreak = true;
@@ -45128,7 +46223,7 @@ self: {
        pname = "easyplot";
        version = "1.0";
        sha256 = "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        homepage = "http://hub.darcs.net/scravy/easyplot";
        description = "A tiny plotting library, utilizes gnuplot for plotting";
        license = stdenv.lib.licenses.mit;
@@ -45142,7 +46237,9 @@ self: {
        pname = "easyrender";
        version = "0.1.0.1";
        sha256 = "147r2jw0vrld73637vw4k83v4xf8r1dl9cy6gcll9kkpkcck8lkn";
-       buildDepends = [ base bytestring containers mtl superdoc zlib ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl superdoc zlib
+       ];
        jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/";
        description = "User-friendly creation of EPS, PostScript, and PDF files";
@@ -45156,7 +46253,7 @@ self: {
        pname = "ebeats";
        version = "0.1.0";
        sha256 = "0r3pl63fxrrfafwp3791xh0c47pb4jqqcm9lk52g0gaqg0s8x5qk";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        description = "Time in ebeats";
        license = stdenv.lib.licenses.bsd3;
@@ -45170,10 +46267,10 @@ self: {
        pname = "ec2-signature";
        version = "3.1";
        sha256 = "1yzyz2a4fm2q6r3nlfjqjmm4fabhl31mq8dgg9shfd3p7cm646g0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring http-types SHA
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base64-bytestring bytestring doctest hspec http-types HUnit
          QuickCheck SHA
        ];
@@ -45190,7 +46287,7 @@ self: {
        pname = "ecdsa";
        version = "0.2";
        sha256 = "1300m9rszfjmwqbqb7x9clg6y3qwgwa9s38w72r6plhzbiqmy28n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-api crypto-pubkey-types hecc
        ];
        homepage = "https://github.com/singpolyma/ecdsa-haskell";
@@ -45209,9 +46306,10 @@ self: {
        sha256 = "1hvi5adgqjkxq1y10d7jr39h4i63khmgrgmlfk09114flllnh8gm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default lens parsec safe transformers
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/fabianbergmark/ECMA-262";
        description = "A ECMA-262 interpreter library";
@@ -45228,8 +46326,10 @@ self: {
        sha256 = "1afb507ywpy2y29zmvywj25qw4gn1h5sd0k051jiw03yvdasn0wj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring digest directory process vcd ];
-       extraLibraries = [ canlib ];
+       executableHaskellDepends = [
+         base bytestring digest directory process vcd
+       ];
+       executableSystemDepends = [ canlib ];
        jailbreak = true;
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
@@ -45242,8 +46342,8 @@ self: {
        pname = "ed25519";
        version = "0.0.2.0";
        sha256 = "0x08p2941g7f3xsg8jgy5j73v0dihg47j2i1hb53c7h4jhvc1fmj";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hlint QuickCheck ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hlint QuickCheck ];
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
@@ -45256,7 +46356,7 @@ self: {
        pname = "ed25519-donna";
        version = "0.1";
        sha256 = "1x7dmv53hj9j360rwyq379mfzsddbabyzpl37i5fmjwpy160c2r6";
-       buildDepends = [ base bytestring crypto-api ];
+       libraryHaskellDepends = [ base bytestring crypto-api ];
        jailbreak = true;
        homepage = "github.com/tommd/hs-ed25519-donna";
        description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)";
@@ -45273,7 +46373,7 @@ self: {
        sha256 = "1zq2xadpl33mxdn99aim5rscwqgpy5w0lk7pa3k3h9x3d3c3qzxx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bifunctors classy-prelude hint optparse-applicative safe
        ];
        homepage = "http://chiselapp.com/user/mwm/repository/eddie/";
@@ -45292,12 +46392,12 @@ self: {
        pname = "ede";
        version = "0.2.8.2";
        sha256 = "0j0b0pn9apvpqxb0gnxxp51g32xc47jky4njb9jn0x59jssc1g1q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
          filepath free lens mtl parsers scientific semigroups text
          text-format text-manipulate trifecta unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bifunctors bytestring directory tasty tasty-golden text
        ];
        homepage = "http://github.com/brendanhay/ede";
@@ -45311,7 +46411,7 @@ self: {
        pname = "edenmodules";
        version = "1.2.0.0";
        sha256 = "1wbasb9lsw2rycl2ibd8r9p3d9dl8gd75390qsc83znqx802ylxj";
-       buildDepends = [ base containers deepseq parallel ];
+       libraryHaskellDepends = [ base containers deepseq parallel ];
        jailbreak = true;
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "Semi-explicit parallel programming library";
@@ -45325,7 +46425,7 @@ self: {
        pname = "edenskel";
        version = "2.1.0.0";
        sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q";
-       buildDepends = [ base edenmodules parallel ];
+       libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45342,7 +46442,7 @@ self: {
        sha256 = "0jkcva53vm8lm76z947xms8a2zkh9sn9951cwry8k7r132dmcn32";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring cairo containers directory filepath
          ghc-events-parallel gtk mtl text zip-archive
        ];
@@ -45362,7 +46462,7 @@ self: {
        sha256 = "0rd95pw3b83zg50i29g6bvqh4dnz5ma9l3v5r1hhszmrkpyfvzkv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ALUT base cmdtheline containers gloss random wraparound
        ];
        jailbreak = true;
@@ -45380,8 +46480,8 @@ self: {
        pname = "edit-distance";
        version = "0.2.2.1";
        sha256 = "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y";
-       buildDepends = [ array base containers random ];
-       testDepends = [
+       libraryHaskellDepends = [ array base containers random ];
+       testHaskellDepends = [
          array base containers QuickCheck random test-framework
          test-framework-quickcheck2
        ];
@@ -45396,8 +46496,10 @@ self: {
        pname = "edit-distance-vector";
        version = "1.0.0.2";
        sha256 = "00j0lmj7wz5bm5z4v0v3bamf1pnrlmjkc2ysb5d16dqwi9768x85";
-       buildDepends = [ base vector ];
-       testDepends = [ base QuickCheck quickcheck-instances vector ];
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
+         base QuickCheck quickcheck-instances vector
+       ];
        homepage = "https://github.com/thsutton/edit-distance-vector";
        description = "Calculate edit distances and edit scripts between vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -45409,7 +46511,9 @@ self: {
        pname = "edit-lenses";
        version = "0.2";
        sha256 = "1nrpbrq38q779s0fbzaxig2fdqgg9qg41vajx7lbhasal6aiclya";
-       buildDepends = [ base containers data-default lattices mtl ];
+       libraryHaskellDepends = [
+         base containers data-default lattices mtl
+       ];
        description = "Symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45423,7 +46527,7 @@ self: {
        sha256 = "0dvxiwhbmknmg4w5dj202g8r0capvgy3rn6c757ci5nhcmr4lypc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Programs demoing the use of symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45434,27 +46538,27 @@ self: {
        pname = "editable";
        version = "1.0.0.2";
        sha256 = "15jz0b913xd8yd3nzk4vrlj0vzbhjarl05h9j0mdcfgxns5j0yxi";
-       buildDepends = [ base text vty vty-ui ];
+       libraryHaskellDepends = [ base text vty vty-ui ];
        jailbreak = true;
        homepage = "https://github.com/maxpow4h/editable";
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "editline" = callPackage
-    ({ mkDerivation, base, libedit }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "editline";
        version = "0.2.1.1";
        sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
-       buildDepends = [ base ];
-       extraLibraries = [ libedit ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://code.haskell.org/editline";
        description = "Bindings to the editline library (libedit)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libedit;};
+     }) {};
 
   "editor-open" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
@@ -45466,10 +46570,13 @@ self: {
        sha256 = "0raj0s8v72kz63hqpqhf58sx0a8mcwi4ania40spjirdrsdx3i9g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra directory process resourcet
          temporary transformers unix
        ];
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra resourcet
+       ];
        homepage = "https://github.com/pharpend/editor-open";
        description = "Open the user's $VISUAL or $EDITOR for text input";
        license = stdenv.lib.licenses.asl20;
@@ -45483,8 +46590,10 @@ self: {
        pname = "effect-handlers";
        version = "0.1.0.6";
        sha256 = "0i7glghwh35pfyzznzabaf8fnadk00lpajmasw5h5ndjl2dmqzy9";
-       buildDepends = [ base free kan-extensions mtl ];
-       testDepends = [ base hspec hspec-discover HUnit QuickCheck ];
+       libraryHaskellDepends = [ base free kan-extensions mtl ];
+       testHaskellDepends = [
+         base hspec hspec-discover HUnit QuickCheck
+       ];
        homepage = "https://github.com/edofic/effect-handlers";
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
@@ -45496,7 +46605,7 @@ self: {
        pname = "effect-monad";
        version = "0.6.1";
        sha256 = "0kbjsdiv2x84spbw4qrgk76xwwgqrqhasim83h2jjwvn4qdpyjw8";
-       buildDepends = [ base ghc-prim type-level-sets ];
+       libraryHaskellDepends = [ base ghc-prim type-level-sets ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45511,8 +46620,10 @@ self: {
        pname = "effective-aspects";
        version = "0.1.0.0";
        sha256 = "0hcczdc98w8mqhap20dm0dmxbmqrxa8xxs8mjx4lga7y2n6wq22i";
-       buildDepends = [ base ghc-prim hashtables HUnit mtl QuickCheck ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base ghc-prim hashtables HUnit mtl QuickCheck
+       ];
+       testHaskellDepends = [
          base Cabal ghc-prim hashtables HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -45532,8 +46643,10 @@ self: {
        pname = "effective-aspects-mzv";
        version = "0.1.0.1";
        sha256 = "03mignf38inf10l19mcsjgjb0935lm53b29xy39pkcycrpmp0ckj";
-       buildDepends = [ base ghc-prim hashtables HUnit mzv QuickCheck ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base ghc-prim hashtables HUnit mzv QuickCheck
+       ];
+       testHaskellDepends = [
          base Cabal ghc-prim hashtables HUnit mzv QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -45550,7 +46663,7 @@ self: {
        pname = "effects";
        version = "0.2.2";
        sha256 = "0ysz02qvw9gg271dsign11hs7cfsz7xfc4kjmggf10j86lcpi034";
-       buildDepends = [ base containers newtype void ];
+       libraryHaskellDepends = [ base containers newtype void ];
        homepage = "http://github.com/sjoerdvisscher/effects";
        description = "Computational Effects";
        license = stdenv.lib.licenses.bsd3;
@@ -45562,7 +46675,7 @@ self: {
        pname = "effects-parser";
        version = "0.1";
        sha256 = "0vjjld95kg02a4nr2a0lwlcwaq3867qvbbjk8b1g6fd3d1qj456r";
-       buildDepends = [ base effects ];
+       libraryHaskellDepends = [ base effects ];
        homepage = "http://github.com/nybble41/effects-parser";
        description = "Parser Effect for the Control.Effects Library";
        license = stdenv.lib.licenses.bsd3;
@@ -45574,7 +46687,7 @@ self: {
        pname = "effin";
        version = "0.3.0.1";
        sha256 = "0rckxjdkw5p4yy1kizj1z8kp7sxfxxhh9s7714jsn9in7lc4lsif";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/YellPika/effin";
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
@@ -45592,19 +46705,22 @@ self: {
        sha256 = "16d3c4r72f6hv8v7zbcqwjjc1c53895kxjn1m61d2fhz8gmb8yq0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base containers directory ghc ghc-paths haskeline mtl parsec
+         process random regex-tdfa text transformers unordered-containers
+       ];
+       executableHaskellDepends = [
          array base containers directory filepath ghc ghc-paths haskeline
-         mtl parsec process random regex-tdfa text transformers
+         mtl parsec process regex-tdfa text transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Glob HUnit mtl test-framework test-framework-hunit
          transformers
        ];
        homepage = "http://www.egison.org";
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison-quote" = callPackage
@@ -45613,7 +46729,9 @@ self: {
        pname = "egison-quote";
        version = "0.2";
        sha256 = "1qmbivr4lp8m27ns5cz38fkkynfky9z73hqr173dhyvqccjamfgk";
-       buildDepends = [ base egison mtl parsec template-haskell ];
+       libraryHaskellDepends = [
+         base egison mtl parsec template-haskell
+       ];
        homepage = "https://github.com/xenophobia/Egison-Quote";
        description = "A quasi quotes for using Egison expression in Haskell code";
        license = stdenv.lib.licenses.mit;
@@ -45631,7 +46749,7 @@ self: {
        sha256 = "1ay9m7ibl2z19yq9pd3fwghbyki6cawg3w9x42dllncjrwxwlh4m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory egison filepath ghc
          ghc-paths haskeline mtl parsec regex-posix transformers
          unordered-containers
@@ -45639,7 +46757,6 @@ self: {
        homepage = "http://www.egison.org";
        description = "A tutorial program for the Egison programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ehaskell" = callPackage
@@ -45652,7 +46769,7 @@ self: {
        sha256 = "0d7j20lrxy5qy1ybgywfjk0d0f6iin37nfw9zdbmhi1z2l89mmnj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath mtlparse process regexpr utf8-string
          yjtools
        ];
@@ -45669,15 +46786,16 @@ self: {
      mkDerivation {
        pname = "ehs";
        version = "0.7.0";
-       revision = "3";
        sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x";
+       revision = "3";
        editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring haskell-src-meta parsec template-haskell text time
+       libraryHaskellDepends = [
+         base bytestring haskell-src-meta parsec template-haskell text
          transformers
        ];
+       executableHaskellDepends = [ base bytestring text time ];
        homepage = "http://github.com/minpou/ehs/";
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
@@ -45691,11 +46809,13 @@ self: {
      mkDerivation {
        pname = "eibd-client-simple";
        version = "0.0.4";
-       revision = "1";
        sha256 = "14nxahznqy6xfjgyi8d11b4hgrw431ywqc5hkz0lbpgxysgkc61d";
+       revision = "1";
        editedCabalFile = "5154a0f9083521b4c60cee92f2614b253961fd1e2dd9e7c5b541630df8597d80";
-       buildDepends = [ base bytestring containers mtl transformers ];
-       extraLibraries = [ eibclient ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl transformers
+       ];
+       librarySystemDepends = [ eibclient ];
        jailbreak = true;
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
@@ -45710,16 +46830,15 @@ self: {
        pname = "eigen";
        version = "2.1.6";
        sha256 = "0287j907pasjb7w7bwr6snb4qic7j14msxhps445yjfkqa2arzfz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring primitive transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring mtl primitive transformers vector
        ];
        homepage = "https://github.com/osidorkin/haskell-eigen";
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either" = callPackage
@@ -45731,7 +46850,7 @@ self: {
        pname = "either";
        version = "4.4.1";
        sha256 = "1jq9b7mwljyqxmcs09bnqzza6710sfk2x444p3aagjlvq3mpvrci";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors exceptions free mmorph monad-control MonadRandom
          mtl profunctors semigroupoids semigroups transformers
          transformers-base
@@ -45747,7 +46866,7 @@ self: {
        pname = "either-unwrap";
        version = "1.1";
        sha256 = "0g1f5m7bcpnyg2sdvwx8x34ml6dqfrn326s8pbfciaqqf7wddayc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gcross/either-unwrap";
        description = "Functions for probing and unwrapping values inside of Either";
        license = stdenv.lib.licenses.bsd3;
@@ -45773,7 +46892,7 @@ self: {
        pname = "ekg";
        version = "0.4.0.8";
        sha256 = "0cp88b5bf4bpjd6qzib00n7j76svwsykzizk52fk1dmknfx8h12v";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath network snap-core
          snap-server text time transformers unordered-containers
        ];
@@ -45791,14 +46910,13 @@ self: {
        pname = "ekg-bosun";
        version = "1.0.4";
        sha256 = "0cjwv99dbb1spfn25vdl4ikxr10s7yqr9ih36amvs02rnb47lx7f";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
        ];
        homepage = "http://github.com/ocharles/ekg-bosun";
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-carbon" = callPackage
@@ -45809,7 +46927,7 @@ self: {
        pname = "ekg-carbon";
        version = "1.0.4";
        sha256 = "0l1gg13wxyivcxcsmzq6wv7ma4vk6afxjmw7f9n9dc3zdga0v772";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
        ];
@@ -45826,7 +46944,7 @@ self: {
        pname = "ekg-core";
        version = "0.1.1.0";
        sha256 = "07h6lwig1cwb526ack1g3f6w8irmaj4kibn11ihhdffk7avix8bv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim text unordered-containers
        ];
        homepage = "https://github.com/tibbe/ekg-core";
@@ -45841,7 +46959,9 @@ self: {
        pname = "ekg-json";
        version = "0.1.0.0";
        sha256 = "1nhqlajidg94zk6rs86ri5ar4cmkbdz04hwjp8qgam0vgpp5bi2j";
-       buildDepends = [ aeson base ekg-core text unordered-containers ];
+       libraryHaskellDepends = [
+         aeson base ekg-core text unordered-containers
+       ];
        homepage = "https://github.com/tibbe/ekg-json";
        description = "JSON encoding of ekg metrics";
        license = stdenv.lib.licenses.bsd3;
@@ -45855,7 +46975,7 @@ self: {
        pname = "ekg-log";
        version = "0.1.0.3";
        sha256 = "1rgjpd0cksxxr1934k9xpzhyzsl54d7yp1mh65m85z7665kcjshw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory ekg-core fast-logger filepath text
          time unix unordered-containers
        ];
@@ -45875,9 +46995,10 @@ self: {
        sha256 = "1yxp0s3i87zc205bqkw8arq8n0y225gin94x98csldb9rd0k0s5y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring ekg-core text time unordered-containers
        ];
+       executableHaskellDepends = [ base ekg-core ];
        jailbreak = true;
        homepage = "https://github.com/adarqui/ekg-push";
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
@@ -45893,10 +47014,10 @@ self: {
        pname = "ekg-rrd";
        version = "0.2.1.69";
        sha256 = "172p0whjyql5in94rcpr6h13zilhd84qp54z8qvk23kg5jqaf43r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory ekg-core mtl process text time unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base ekg-core HUnit test-framework test-framework-hunit text time
          unordered-containers
        ];
@@ -45914,7 +47035,7 @@ self: {
        pname = "ekg-statsd";
        version = "0.2.0.3";
        sha256 = "02sknwz5cqwy5byqjiyc6nfppmbmfnxndp3dcs4lz276221h91hn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
        homepage = "https://github.com/tibbe/ekg-statsd";
@@ -45928,8 +47049,8 @@ self: {
        pname = "electrum-mnemonic";
        version = "0.1.2";
        sha256 = "1lswfw72imi326146dyvva3w9g4v5725kj817q9bjgrfmzn2k2k3";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "easy to remember mnemonic for a high-entropy value";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -45941,7 +47062,9 @@ self: {
        pname = "elerea";
        version = "2.8.0";
        sha256 = "1sc71775f787dh70ay9fm6x6npsn81yci9yr984ai87ddz023sab";
-       buildDepends = [ base containers transformers transformers-base ];
+       libraryHaskellDepends = [
+         base containers transformers transformers-base
+       ];
        description = "A minimalistic FRP library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45954,10 +47077,9 @@ self: {
        sha256 = "17m52c6qa905wpfanllhnaizq6vv2hp0ldfmlv10b0hbzjs29bx1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base elerea GLFW OpenGL ];
+       executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elerea-sdl" = callPackage
@@ -45966,11 +47088,10 @@ self: {
        pname = "elerea-sdl";
        version = "0.1.1";
        sha256 = "1dfbgnwn0jj3lv2fskc2k3m4h0crars2d1p0gpj265r4k58qis36";
-       buildDepends = [ base elerea SDL ];
+       libraryHaskellDepends = [ base elerea SDL ];
        homepage = "http://github.com/singpolyma/elerea-sdl";
        description = "Elerea FRP wrapper for SDL";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elevator" = callPackage
@@ -45979,7 +47100,7 @@ self: {
        pname = "elevator";
        version = "0.2.3";
        sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2";
-       buildDepends = [ base extensible transformers ];
+       libraryHaskellDepends = [ base extensible transformers ];
        homepage = "https://github.com/fumieval/elevator";
        description = "Immediately lifts to a desired level";
        license = stdenv.lib.licenses.bsd3;
@@ -45991,7 +47112,7 @@ self: {
        pname = "elf";
        version = "0.27";
        sha256 = "19ylk13ny2clwfgqv6r55h80ghlgzbwydzrfy1msyxcxn4zmdpjs";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://github.com/erikcharlebois/elf";
        description = "Parser for ELF object format";
        license = stdenv.lib.licenses.bsd3;
@@ -46005,7 +47126,7 @@ self: {
        pname = "elm-build-lib";
        version = "0.14.0.0";
        sha256 = "12hhyjr3bshbz66zxl5jfs4s3qx6laqqwcim3kf8rj2vh12h6wj5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers elm-compiler elm-core-sources file-embed
          template-haskell
        ];
@@ -46031,13 +47152,18 @@ self: {
        sha256 = "1g3q1z6bji1vx36kfkn8qayidds29b0jkk7k70sip4055jr4jc5n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cmdargs containers directory edit-distance filepath indents
          language-ecmascript language-glsl mtl parsec pretty process text
          transformers union-find unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty base binary bytestring cmdargs containers
+         directory filepath indents language-glsl mtl parsec pretty process
+         text transformers union-find
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cmdargs containers directory edit-distance filemanip filepath HUnit
          indents language-ecmascript language-glsl mtl parsec pretty process
@@ -46060,7 +47186,7 @@ self: {
        pname = "elm-core-sources";
        version = "1.0.0";
        sha256 = "1yr0csgz0hv25cz3jslap0adwvfcvv35bns32b9g0vyda1fm00x4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers file-embed template-haskell
        ];
        homepage = "http://github.com/JoeyEremondi/elm-build-lib";
@@ -46080,7 +47206,11 @@ self: {
        sha256 = "1did7vjd1h2kh5alndd2b63zi8b1m9hf6k1k75yxwvw6f6mz5i4q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring directory Elm filepath http-client
+         http-client-tls http-types mtl network process vector
+       ];
+       executableHaskellDepends = [
          aeson aeson-pretty ansi-wl-pprint base binary bytestring containers
          directory Elm filepath HTTP http-client http-client-tls http-types
          mtl network optparse-applicative process vector
@@ -46102,13 +47232,12 @@ self: {
        sha256 = "0jvdln18dhsxly33ysy1vv1740ri1576x44jn10gjva432rp8rwx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers directory file-embed
          filepath text time
        ];
        description = "Set up basic structure for an elm project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-make" = callPackage
@@ -46122,7 +47251,7 @@ self: {
        sha256 = "10yli9nxfyykkr3p2dma5zgblwgx2434axjj17a878xd0r4841sb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base binary blaze-html blaze-markup bytestring
          containers directory elm-compiler elm-package filepath mtl
          optparse-applicative text
@@ -46147,7 +47276,13 @@ self: {
        sha256 = "08wsl42gf5wf9pmsnld38p2m675ljihpzkrvn3dzh6zf0dwblm5n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson aeson-pretty base binary bytestring containers directory
+         elm-compiler filepath HTTP http-client http-client-tls http-types
+         mtl network process text time unordered-containers vector
+         zip-archive
+       ];
+       executableHaskellDepends = [
          aeson aeson-pretty ansi-wl-pprint base binary bytestring containers
          directory elm-compiler filepath HTTP http-client http-client-tls
          http-types mtl network optparse-applicative pretty process text
@@ -46173,7 +47308,7 @@ self: {
        sha256 = "0j8md3cqg7wrcx85s5hj8g812zvrr3y4833n0wc3dvfa3wlblpga";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html blaze-markup bytestring cmdargs containers
          directory elm-compiler filepath fsnotify HTTP mtl process snap-core
          snap-server system-filepath text time transformers
@@ -46197,11 +47332,11 @@ self: {
        sha256 = "05fyk3q7243c8p4kw03jggrvp8qfgcfanr291bmgnn9s1lk0q253";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring bytestring-trie cmdargs containers directory
          elm-compiler elm-package filepath haskeline mtl parsec process
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring bytestring-trie cmdargs directory elm-compiler
          elm-package filepath haskeline HUnit mtl parsec process QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -46223,7 +47358,7 @@ self: {
        sha256 = "0nnkhmmm4cl6a314xxh5qwxkjsc3k3vcwdfar62578ykarxb53g1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs containers directory Elm filepath mtl
          process snap-core snap-server unordered-containers
        ];
@@ -46241,7 +47376,7 @@ self: {
        pname = "elm-yesod";
        version = "0.2";
        sha256 = "0hza3khwspwlqbyllh2w1083hh19hslc0lhdryq1bbs8bssird39";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup Elm shakespeare-js text yesod-core
        ];
        jailbreak = true;
@@ -46261,15 +47396,15 @@ self: {
        sha256 = "1hssxqhm962hr41mvjnrs4h74121nmvlbww0g9nyk10mx71rcbcg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base MonadRandom random ];
-       testDepends = [
+       libraryHaskellDepends = [ base MonadRandom random ];
+       executableHaskellDepends = [ base random ];
+       testHaskellDepends = [
          base MonadRandom proctest QuickCheck random tasty tasty-quickcheck
          tasty-th
        ];
        homepage = "https://www.github.com/sgillespie/elocrypt";
        description = "Generate easy-to-remember, hard-to-guess passwords";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emacs-keys" = callPackage
@@ -46280,8 +47415,10 @@ self: {
        pname = "emacs-keys";
        version = "0.0.2.0";
        sha256 = "12zxvjmlp06rjlhb7iaz7qrzb7cr1rgqg5ql5vv3lkz7z84h82ph";
-       buildDepends = [ base split template-haskell th-lift xkbcommon ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base split template-haskell th-lift xkbcommon
+       ];
+       testHaskellDepends = [
          base doctest tasty tasty-hspec tasty-quickcheck xkbcommon
        ];
        homepage = "https://github.com/cocreature/emacs-keys";
@@ -46297,7 +47434,7 @@ self: {
        pname = "email";
        version = "0.1.1.2";
        sha256 = "144a53an7laivcc6zxawsjz8yijknswnlbrd8id87d6x6lbq1cw3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring encoding HaskellNet hsemail old-locale
          old-time parsec process time
        ];
@@ -46316,11 +47453,11 @@ self: {
        pname = "email-header";
        version = "0.2.0";
        sha256 = "1kl7d1scxq6ygjdixl4xkhaa4d60zr8i92fkcw5qczk44la4wiyv";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring case-insensitive
          containers text text-icu time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring case-insensitive containers QuickCheck tasty
          tasty-quickcheck text time
        ];
@@ -46338,7 +47475,7 @@ self: {
        pname = "email-postmark";
        version = "0.2";
        sha256 = "17zby98j1glsslrndmxl6zwrc3q7ir9771yvfxijawp4wdx6nayy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers HTTP network
        ];
        jailbreak = true;
@@ -46356,8 +47493,8 @@ self: {
        pname = "email-validate";
        version = "2.1.3";
        sha256 = "1jw15hyj6p1155i3h5n4f728x33ym21ibpirkdiid0ksf6cpk5jv";
-       buildDepends = [ attoparsec base bytestring ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base bytestring ghc-prim ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -46377,11 +47514,11 @@ self: {
        sha256 = "0ai0fj7rpq9h0i0rznrsqwvqbkkry5dgq4hgg5jc8ma3j9gym87n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs directory dns email-validate HUnit
          parallel-io pcre-light tasty tasty-hunit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cmdargs directory dns doctest email-validate HUnit
          parallel-io pcre-light tasty tasty-hunit
        ];
@@ -46398,7 +47535,10 @@ self: {
        sha256 = "01xyqwnyza1cpd7ky4kgr1z5m8w2ms395lj7xjwxh42jg65b1rfr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath her-lexer MissingH process ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base filepath her-lexer MissingH process
+       ];
        homepage = "https://github.com/nushio3/embeddock";
        description = "Embed the values in scope in the haddock documentation of the module";
        license = stdenv.lib.licenses.bsd3;
@@ -46411,7 +47551,7 @@ self: {
        pname = "embeddock-example";
        version = "0.1";
        sha256 = "07xc7kdnlbfwr08zhgjphbcmn8ycilp6pna3nk4y0w2hw87g7db0";
-       buildDepends = [ base embeddock time ];
+       libraryHaskellDepends = [ base embeddock time ];
        homepage = "https://github.com/nushio3/embeddock-example";
        description = "Example of using embeddock";
        license = stdenv.lib.licenses.bsd3;
@@ -46428,9 +47568,10 @@ self: {
        sha256 = "1vqksv7a12xzi6zp4b2qfnsb5gaarg5bhxanhbi4qkn1jmwy82yx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring dlist gloss haskell98 HCodecs mtl
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://ludflu@github.com/ludflu/embroidery.git";
        description = "support for embroidery formats in haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -46443,8 +47584,8 @@ self: {
        pname = "emgm";
        version = "0.4";
        sha256 = "0cpcwrb6wqwq371wqjmhzfhdwk3vfhjjgz4vgjsjvw6cdhbpw5p1";
-       buildDepends = [ base ];
-       testDepends = [ base HUnit QuickCheck syb ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HUnit QuickCheck syb ];
        jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM";
        description = "Extensible and Modular Generics for the Masses";
@@ -46471,11 +47612,11 @@ self: {
        pname = "enclosed-exceptions";
        version = "1.0.1.1";
        sha256 = "16ax1kqdsk4apg642qxkm2hf9vb5hzmkd14zmkxra8ssp8rn28z5";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base deepseq lifted-base monad-control transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base deepseq hspec lifted-base monad-control QuickCheck
          transformers transformers-base
        ];
@@ -46492,7 +47633,7 @@ self: {
        pname = "encoding";
        version = "0.8";
        sha256 = "0y2fx99vxrqpvjflpqgnbikxsc3p50sn5b5g97zivjr9bbck52ji";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers extensible-exceptions
          ghc-prim HaXml mtl regex-compat
        ];
@@ -46507,7 +47648,7 @@ self: {
        pname = "endo";
        version = "0.2.0.1";
        sha256 = "0szbv44sgsnbkcdmmsvbiy539iiyd608p513slfw1pbb240sabii";
-       buildDepends = [ base between transformers ];
+       libraryHaskellDepends = [ base between transformers ];
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -46522,7 +47663,7 @@ self: {
        pname = "engine-io";
        version = "1.2.10";
        sha256 = "02wc4fdwrnaw934bxk39bfndzn2rjdcaa3rifcj84ap750fx16h0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
          unordered-containers vector websockets
@@ -46542,7 +47683,7 @@ self: {
        pname = "engine-io-growler";
        version = "0.1.0.1";
        sha256 = "1yk7cpg89nsmd9kvmxdrxcgyr8wilara4kw35hyxl4l2b9c9pwjc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring engine-io growler http-types mtl pipes
          pipes-attoparsec pipes-wai socket-io text transformers
          unordered-containers wai wai-websockets websockets
@@ -46560,7 +47701,7 @@ self: {
        pname = "engine-io-snap";
        version = "1.0.3";
        sha256 = "0i2099b4drvzknz6ifi4dvgfibkqxfrz6w3a15k09nw3vxc14hbg";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec-enumerator base bytestring containers engine-io
          MonadCatchIO-transformers snap-core unordered-containers websockets
          websockets-snap
@@ -46578,7 +47719,7 @@ self: {
        pname = "engine-io-wai";
        version = "1.0.3";
        sha256 = "0p296y3xnpx0wj6yd152y7i765x0pwg8rg2bpcz92hkcmz57gdz7";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring either engine-io http-types mtl text
          transformers transformers-compat unordered-containers wai
          wai-websockets websockets
@@ -46596,7 +47737,7 @@ self: {
        pname = "engine-io-yesod";
        version = "1.0.2";
        sha256 = "15hjq128zn23kq5nlmpv7sbrhzhv1936psgf8aa7yxvx4xwy6baw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra engine-io http-types text
          unordered-containers wai wai-websockets websockets yesod-core
        ];
@@ -46609,7 +47750,7 @@ self: {
        pname = "engineering-units";
        version = "0.0.1";
        sha256 = "1jpipav3znxbj7ld5m53wv6pmv1nrcxprqm0m1p3ny9cmpnw3r9x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A numeric type for managing and automating engineering units";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46620,7 +47761,7 @@ self: {
        pname = "entropy";
        version = "0.3.7";
        sha256 = "1vzg9fi597dbrcbjsr71y47rvmhiih7lg5rjnb297fzdlbmj1w0z";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        homepage = "https://github.com/TomMD/entropy";
        description = "A platform independent entropy source";
        license = stdenv.lib.licenses.bsd3;
@@ -46632,7 +47773,7 @@ self: {
        pname = "enumerable";
        version = "0.0.3";
        sha256 = "1v94y0a3rlkg3qlbv70d1zj2vjhssf1f89xlgb5cnsy9az07517q";
-       buildDepends = [ base control-monad-omega tagged ];
+       libraryHaskellDepends = [ base control-monad-omega tagged ];
        description = "A typeclass for enumerating all values a type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46645,10 +47786,10 @@ self: {
        pname = "enumeration";
        version = "0.1.0";
        sha256 = "17d7vm2nkyhxw2f0wk6llrw9y5kqzgqlgswv98wrpnpsspwmx0bk";
-       buildDepends = [
+       libraryHaskellDepends = [
          arith-encode arithmoi base binary Cabal containers heap
        ];
-       testDepends = [
+       testHaskellDepends = [
          arith-encode arithmoi base binary Cabal containers heap HUnit-Plus
        ];
        homepage = "https://github.com/emc2/enumeration";
@@ -46663,7 +47804,9 @@ self: {
        pname = "enumerator";
        version = "0.4.20";
        sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
-       buildDepends = [ base bytestring containers text transformers ];
+       libraryHaskellDepends = [
+         base bytestring containers text transformers
+       ];
        homepage = "https://john-millikin.com/software/enumerator/";
        description = "Reliable, high-performance processing with left-fold enumerators";
        license = stdenv.lib.licenses.mit;
@@ -46675,7 +47818,7 @@ self: {
        pname = "enumerator-fd";
        version = "0.1.0.2";
        sha256 = "0xbrkv65m206qlvnjlbfb52kvjhw91rdnihwv3y31p2qj5zlz29p";
-       buildDepends = [ base enumerator mtl ];
+       libraryHaskellDepends = [ base enumerator mtl ];
        homepage = "https://john-millikin.com/software/enumerator/";
        description = "Enumerator instances for monads-fd classes";
        license = stdenv.lib.licenses.mit;
@@ -46687,7 +47830,7 @@ self: {
        pname = "enumerator-tf";
        version = "0.1.1";
        sha256 = "0s47j6pf05nwl105i2vwvsn18gis1v96gid85kj49ngb8ax0pjsp";
-       buildDepends = [ base enumerator monads-tf ];
+       libraryHaskellDepends = [ base enumerator monads-tf ];
        homepage = "https://john-millikin.com/software/enumerator/";
        description = "Enumerator instances for monads-tf classes";
        license = stdenv.lib.licenses.mit;
@@ -46699,7 +47842,7 @@ self: {
        pname = "enumfun";
        version = "0.5.1.0";
        sha256 = "1fq4zmhc825bmyslfm7kbsa29qq773cgrz4npj2bcfl0jkbl3ndc";
-       buildDepends = [ base enummapset-th ];
+       libraryHaskellDepends = [ base enummapset-th ];
        jailbreak = true;
        homepage = "https://github.com/liyang/enumfun";
        description = "Finitely represented /total/ EnumMaps";
@@ -46716,11 +47859,11 @@ self: {
        pname = "enummapmap";
        version = "0.7.0";
        sha256 = "17rlynm46i3y76ms8s5ajkz50cj5m1anw83dizj281887qg63iwr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base contravariant data-default deepseq ghc-prim lens safecopy
          semigroups
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cereal containers deepseq hspec hspec-expectations HUnit lens
          QuickCheck safecopy semigroups
        ];
@@ -46736,7 +47879,7 @@ self: {
        pname = "enummapset";
        version = "0.5.2.1";
        sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        homepage = "https://github.com/michalt/enummapset";
        description = "IntMap and IntSet with Enum keys/elements";
        license = stdenv.lib.licenses.bsd3;
@@ -46748,7 +47891,9 @@ self: {
        pname = "enummapset-th";
        version = "0.6.0.2";
        sha256 = "1g6z60qalyf8iv41xdl409kmcjm406zccljkgl658y1x9rdi08gr";
-       buildDepends = [ base containers deepseq template-haskell ];
+       libraryHaskellDepends = [
+         base containers deepseq template-haskell
+       ];
        homepage = "https://github.com/liyang/enummapset-th";
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
        license = stdenv.lib.licenses.bsd3;
@@ -46760,7 +47905,7 @@ self: {
        pname = "enumset";
        version = "0.0.4";
        sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w";
-       buildDepends = [ base data-accessor storable-record ];
+       libraryHaskellDepends = [ base data-accessor storable-record ];
        description = "Sets of enumeration values represented by machine words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46774,7 +47919,7 @@ self: {
        pname = "env-parser";
        version = "0.0.2.1";
        sha256 = "13d6yi5jbdi84nccn3ffiw96v5knbz4madjfg980izxfrnbsl1rr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring containers http-types mtl network old-locale text time
          transformers
@@ -46792,8 +47937,8 @@ self: {
        pname = "envparse";
        version = "0.2.1";
        sha256 = "1pkxlda74wpl3f4xd5h69bcbgrw6q045hkdfj98dqd6z2czr2wcg";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hspec ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers hspec ];
        homepage = "https://supki.github.io/envparse";
        description = "Parse environment variables";
        license = stdenv.lib.licenses.bsd2;
@@ -46807,10 +47952,10 @@ self: {
        pname = "envy";
        version = "0.2.0.0";
        sha256 = "0hi9nlrr2g32f4cp3ibmdvmqmqhbyps5d9f0v7612fbxhimqrkbq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec mtl QuickCheck quickcheck-instances text time
          transformers
        ];
@@ -46824,7 +47969,7 @@ self: {
        pname = "epanet-haskell";
        version = "2.0.12.4";
        sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://epanet.de/developer/haskell.html";
        description = "Haskell binding for EPANET";
@@ -46837,7 +47982,7 @@ self: {
        pname = "epass";
        version = "0.2.1";
        sha256 = "0sg5pipzc4s9xq83ari7rigjbvhyh76kqnp57i98bs3k54ba53ym";
-       buildDepends = [ base stm time ];
+       libraryHaskellDepends = [ base stm time ];
        jailbreak = true;
        homepage = "http://github.com/baldo/epass";
        description = "Baisc, Erlang-like message passing supporting sockets";
@@ -46845,22 +47990,21 @@ self: {
      }) {};
 
   "epic" = callPackage
-    ({ mkDerivation, array, base, boehmgc, Cabal, directory, gmp, happy
-     , mtl, process
-     }:
+    ({ mkDerivation, array, base, Cabal, directory, mtl, process }:
      mkDerivation {
        pname = "epic";
        version = "0.9.3.3";
        sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base Cabal directory mtl process ];
-       buildTools = [ happy ];
-       extraLibraries = [ boehmgc gmp ];
+       libraryHaskellDepends = [ array base Cabal directory mtl process ];
+       executableHaskellDepends = [
+         array base Cabal directory mtl process
+       ];
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) boehmgc;  inherit (pkgs) gmp;};
+     }) {};
 
   "epoll" = callPackage
     ({ mkDerivation, base, unix }:
@@ -46868,7 +48012,7 @@ self: {
        pname = "epoll";
        version = "0.2.2";
        sha256 = "0iz1x6lb5b71h4sgiacsnv5f8zj445v88a3rsra7vbza5g35nwnp";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/twittner/epoll/";
        description = "epoll bindings";
        license = "LGPL";
@@ -46881,10 +48025,9 @@ self: {
        pname = "eprocess";
        version = "1.7.2";
        sha256 = "190qgsqj41dbkphjrgljif7q0zjm9ddp8wawc9wx8qklb897jrvj";
-       buildDepends = [ base exceptions mtl ];
+       libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "epub" = callPackage
@@ -46897,7 +48040,7 @@ self: {
        sha256 = "0h9j9qqdllkng13w978fpd44zxni5v0mpywh7yxz259hlihwmw22";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring filepath old-time utf8-string xml zip-archive
        ];
        description = "EPUB E-Book construction support library";
@@ -46912,11 +48055,11 @@ self: {
        pname = "epub-metadata";
        version = "4.3";
        sha256 = "0gw5mfysvfqk9daa4807qq4xh190a1pzxmwwi2xbnpz7m4kyffyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath hxt mtl regex-compat
          zip-archive
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath HUnit hxt mtl regex-compat
          zip-archive
        ];
@@ -46935,11 +48078,11 @@ self: {
        sha256 = "17r7p68mdrc7mla65xwb5g8inh94hncqkg09igha9fyhnax4m3dk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory epub-metadata filepath mtl parsec process
          regex-compat zip-archive
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory epub-metadata filepath HUnit mtl parsec regex-compat
        ];
        homepage = "http://hub.darcs.net/dino/epub-tools";
@@ -46956,7 +48099,9 @@ self: {
        sha256 = "1l3vi5z46x4m5h3x97hgr9g76i4s5scmpmpjzf97c1kddw31hlh3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory epub-metadata mtl regex-compat ];
+       executableHaskellDepends = [
+         base directory epub-metadata mtl regex-compat
+       ];
        homepage = "http://ui3.info/d/proj/epubname.html";
        description = "Rename epub ebook files based on meta information";
        license = stdenv.lib.licenses.bsd3;
@@ -46969,7 +48114,7 @@ self: {
        pname = "eq";
        version = "4.0.4";
        sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4";
-       buildDepends = [ base semigroupoids ];
+       libraryHaskellDepends = [ base semigroupoids ];
        homepage = "http://github.com/ekmett/eq/";
        description = "Leibnizian equality";
        license = stdenv.lib.licenses.bsd3;
@@ -46985,7 +48130,7 @@ self: {
        sha256 = "07n9xdsi00nz9xwd0bqrdn2d03q7dzlrr13wlym5lgc15r7iwf8w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring explicit-exception filemanip transformers
          utility-ht
        ];
@@ -47000,7 +48145,7 @@ self: {
        pname = "equational-reasoning";
        version = "0.2.0.5";
        sha256 = "1i8c3wn0z7binnz9p62c2mrvzgb305h797pnf5pvj9zk0iqxg21k";
-       buildDepends = [ base singletons template-haskell void ];
+       libraryHaskellDepends = [ base singletons template-haskell void ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47015,10 +48160,10 @@ self: {
        pname = "equivalence";
        version = "0.3.1";
        sha256 = "0zi053l03r5qcnpsphnq8xqazd0cbgj9n44hn47s1hagdra3j1bs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl STMonadTrans transformers transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers mtl QuickCheck STMonadTrans template-haskell
          test-framework test-framework-quickcheck2 transformers
          transformers-compat
@@ -47038,7 +48183,9 @@ self: {
        sha256 = "00cf1q7472kkl12z48dwnhixvyk99451by577qmfj0vhlnl1dc09";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring containers graphviz parsec text ];
+       executableHaskellDepends = [
+         base bytestring containers graphviz parsec text
+       ];
        jailbreak = true;
        homepage = "https://github.com/BurntSushi/erd";
        description = "An entity-relationship diagram generator from a plain text description";
@@ -47051,7 +48198,7 @@ self: {
        pname = "erf";
        version = "2.0.0.0";
        sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The error function, erf, and related functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47062,7 +48209,7 @@ self: {
        pname = "erf-native";
        version = "1.0.0.1";
        sha256 = "0i031ws189rjl5gn44qpkfylx8kz7rdf3nzw9h0dmy2h86xbkckc";
-       buildDepends = [ base polynomial ];
+       libraryHaskellDepends = [ base polynomial ];
        homepage = "http://code.haskell.org/~mokus/erf-native";
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
@@ -47076,7 +48223,7 @@ self: {
        pname = "erlang";
        version = "0.1";
        sha256 = "14jvl8mqdaxavzlkwdxr227m4igmcckhakmy45h7bgcxi5qbkla4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring directory filepath nano-md5 network random
        ];
        homepage = "http://github.com/esessoms/haskell-interface";
@@ -47091,7 +48238,7 @@ self: {
        pname = "eros";
        version = "0.6.0.0";
        sha256 = "0nr0c2qq30ji50pyjrklrb6a73i6qkqws7ywbfpa4pcd176xwlrw";
-       buildDepends = [ aeson base bytestring containers text ];
+       libraryHaskellDepends = [ aeson base bytestring containers text ];
        jailbreak = true;
        description = "A text censorship library";
        license = stdenv.lib.licenses.bsd3;
@@ -47107,7 +48254,7 @@ self: {
        sha256 = "15pi4khibvfpxni4v3kz6f92s8s34kmkx4q7kwq1rxk5gb6p8rcb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers eros text
        ];
        jailbreak = true;
@@ -47126,7 +48273,7 @@ self: {
        sha256 = "1c7bwszjvbb3qnbvpjm0vin2x2z6dylplhs10hbhszkq2ypjjxyk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-html bytestring eros http-types markdown text wai
          warp
        ];
@@ -47141,7 +48288,7 @@ self: {
        pname = "errno";
        version = "0.1";
        sha256 = "0jix16b2c24pfbc3rig01nl68zdwpi28zzbciscalmq8lkpp10fa";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "a FFI utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47152,7 +48299,7 @@ self: {
        pname = "error-continuations";
        version = "0.1.0.0";
        sha256 = "0rv59fhlfr03qis957mjgl4gyk1i5axfyvr680z3ykbfd3k5gc1s";
-       buildDepends = [ base either mtl transformers ];
+       libraryHaskellDepends = [ base either mtl transformers ];
        jailbreak = true;
        homepage = "https://github.com/echatav/error-continuations";
        description = "Error Continuations";
@@ -47165,7 +48312,7 @@ self: {
        pname = "error-list";
        version = "0.1.0.3";
        sha256 = "0k0rpscg4h55215mgkd72yd5la3f2im21vlsgyg7v4pkrxd1cj1j";
-       buildDepends = [ base mtl text text-render ];
+       libraryHaskellDepends = [ base mtl text text-render ];
        homepage = "http://github.com/thinkpad20/error-list";
        description = "A useful type for collecting error messages";
        license = stdenv.lib.licenses.mit;
@@ -47177,7 +48324,7 @@ self: {
        pname = "error-loc";
        version = "0.1.0.0";
        sha256 = "0ch7c537fp52yg3qmc1v9rs4y70cc0zyb3g3i0bmmhgdhxd90bm5";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/error-loc";
        description = "An error replacement with call-site metadata";
@@ -47190,7 +48337,7 @@ self: {
        pname = "error-location";
        version = "0.1.5.5";
        sha256 = "1gfi3jvag662xbsiv75ndb8p9s3c7j6lny15a9gqk8wd4l71myid";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/gregwebs/ErrorLocation.hs";
        description = "error functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
@@ -47204,7 +48351,7 @@ self: {
        pname = "error-message";
        version = "1.1";
        sha256 = "0xnz5l3r9x81pmb6nddzrrws1yqzdqydqkr2g1ib4pwmdwazf7f9";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base containers either-unwrap InfixApplicative mtl
        ];
        jailbreak = true;
@@ -47220,8 +48367,8 @@ self: {
        pname = "errorcall-eq-instance";
        version = "0.3.0";
        sha256 = "0hqw82m8bbrxy5vgdwb83bhzdx070ibqrm9rshyja7cb808ahijm";
-       buildDepends = [ base base-orphans ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base base-orphans ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        description = "An orphan Eq instance for ErrorCall";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47232,7 +48379,7 @@ self: {
        pname = "errors";
        version = "1.4.7";
        sha256 = "09g53dylwsw1phxq5zhkbq8pnpwqzipvqclmcrdypzkpwkmfncl7";
-       buildDepends = [ base either safe transformers ];
+       libraryHaskellDepends = [ base either safe transformers ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47243,7 +48390,7 @@ self: {
        pname = "errors";
        version = "2.0.0";
        sha256 = "00s7vsqfvv23j3mpicrhspibbyzi5diqrdgajqx9n2snq8vxn9s5";
-       buildDepends = [ base safe transformers ];
+       libraryHaskellDepends = [ base safe transformers ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47256,16 +48403,19 @@ self: {
      mkDerivation {
        pname = "ersatz";
        version = "0.3";
-       revision = "3";
        sha256 = "1hq6cdw1rvwc0289saz36x2imwwnj203hqk2lsbkbhyghdvqmpbr";
+       revision = "3";
        editedCabalFile = "aafa6482bcf20d998dfc122b780b0378ec05187235252f4715e98bac02fc5b6c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring containers data-default lens mtl parsec
-         process temporary transformers unordered-containers
+       libraryHaskellDepends = [
+         array base bytestring containers data-default lens mtl process
+         temporary transformers unordered-containers
        ];
-       testDepends = [ base directory doctest filepath ];
+       executableHaskellDepends = [
+         array base containers lens mtl parsec
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
@@ -47283,7 +48433,7 @@ self: {
        sha256 = "1dpp4jl5mzc2z07f5670baxn95xvqgl9ynk0r0m83arpyp380fdq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ersatz toysolver transformers
        ];
        homepage = "https://github.com/msakai/ersatz-toysat";
@@ -47303,15 +48453,17 @@ self: {
        sha256 = "0ica7vir4ragcc3xrkzlmhncnn0ddx8ky61cj32z7ginybfjq2ig";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-expr base bytestring regex-compat text
-         unordered-containers vector yaml
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring yaml
        ];
        jailbreak = true;
        homepage = "https://bitbucket.org/kayo/ert";
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "esotericbot" = callPackage
@@ -47324,7 +48476,11 @@ self: {
        sha256 = "0r77y94ff210nqjga0xm2hrraa01dgjfaxs3ijrg11z6hfz523s7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers directory fgl mtl network stm
+         stream-fusion tuple unix
+       ];
+       executableHaskellDepends = [
          attoparsec base bytestring containers directory fgl mtl network stm
          stream-fusion tuple unix
        ];
@@ -47336,20 +48492,20 @@ self: {
      }) {};
 
   "esqueleto" = callPackage
-    ({ mkDerivation, base, conduit, containers, hspec, HUnit
-     , monad-control, monad-logger, persistent, persistent-sqlite
-     , persistent-template, QuickCheck, resourcet, tagged, text
-     , transformers, unordered-containers
+    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
+     , hspec, HUnit, monad-control, monad-logger, persistent
+     , persistent-sqlite, persistent-template, QuickCheck, resourcet
+     , tagged, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.2.11";
-       sha256 = "0ldgiim5d23avzqgzmpyb1nfp9xpxc51fc98f3ii8ic4mxn4bjvp";
-       buildDepends = [
-         base conduit monad-logger persistent resourcet tagged text
-         transformers unordered-containers
+       version = "2.4.0";
+       sha256 = "1lihililzzryy93lka06cyv60sjjk91jlymsj68rkzz4238vh4z0";
+       libraryHaskellDepends = [
+         base blaze-html bytestring conduit monad-logger persistent
+         resourcet tagged text transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit containers hspec HUnit monad-control monad-logger
          persistent persistent-sqlite persistent-template QuickCheck
          resourcet text transformers
@@ -47365,7 +48521,7 @@ self: {
        pname = "ess";
        version = "0.1.0.0";
        sha256 = "0pxrs9vr6gc61md9q4rxdc5fikvjandqw2rygs0xamrqlna51bcq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/michaelochurch/ess";
        description = "The type-level S combinator in Haskell";
@@ -47379,7 +48535,9 @@ self: {
        pname = "estimator";
        version = "1.1.0.1";
        sha256 = "1sf378qhmsxxazkk7nn1d7nvrq1ladsfvkzshqjwsnyl5pgj7sgq";
-       buildDepends = [ ad base distributive lens linear reflection ];
+       libraryHaskellDepends = [
+         ad base distributive lens linear reflection
+       ];
        jailbreak = true;
        homepage = "https://github.com/GaloisInc/estimator";
        description = "State-space estimation algorithms such as Kalman Filters";
@@ -47394,7 +48552,7 @@ self: {
        pname = "estimators";
        version = "0.1.4";
        sha256 = "0n7j2ay68m73f1mkfsxrrcs1rq0fpavwf58r50y7wirpm5f6agcy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers deepseq list-tries MonadRandom mtl pretty
          prettyclass QuickCheck text
        ];
@@ -47412,7 +48570,9 @@ self: {
        sha256 = "100pqygnwclmpzjhzpz3j34y8v75d8ldxg76f9jys90gb41kggpi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring containers random ];
+       executableHaskellDepends = [
+         base bio bytestring containers random
+       ];
        jailbreak = true;
        homepage = "http://blog.malde.org/";
        description = "Repeats from ESTs";
@@ -47427,11 +48587,13 @@ self: {
      mkDerivation {
        pname = "etcd";
        version = "1.0.5";
-       revision = "1";
        sha256 = "0bqz678mnpw2jpywz2m76923cyq864xn537a9zsqhm6c80gc0vwi";
+       revision = "1";
        editedCabalFile = "5cdbbc8d2aedc68e82e7c4d0cface390c3c68fb7ee7fb162d8123e42351f98fa";
-       buildDepends = [ aeson base bytestring http-conduit text time ];
-       testDepends = [ async base hspec MonadRandom mtl text ];
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit text time
+       ];
+       testHaskellDepends = [ async base hspec MonadRandom mtl text ];
        description = "Client for etcd, a highly-available key value store";
        license = "unknown";
      }) {};
@@ -47444,7 +48606,7 @@ self: {
        pname = "eternal";
        version = "0.1.1";
        sha256 = "151b9qcdyh0vixn0y4s9h54g1h0kk1hwcgh5xcx9qp7bgy0h8wv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols transformers utf8-string
        ];
        description = "everything breaking the Fairbairn threshold";
@@ -47461,11 +48623,11 @@ self: {
        pname = "ether";
        version = "0.3.0.0";
        sha256 = "1k8g01ypck0w6sp6f3w3asdakzjg6k8m1sz58c2r5iz3z1v9b04m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mmorph monad-control mtl newtype-generics template-haskell
          transformers transformers-base transformers-lift
        ];
-       testDepends = [
+       testHaskellDepends = [
          base mtl QuickCheck tasty tasty-quickcheck transformers
        ];
        homepage = "https://int-index.github.io/ether/";
@@ -47487,14 +48649,14 @@ self: {
        sha256 = "0dkvvs7bk4paqjmr1zihi14kp4cb28s33b18kd3a17lz1vd4qbfc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint array base base16-bytestring binary bytestring
          cmdargs containers cryptohash data-default directory either entropy
          ethereum-merkle-patricia-db ethereum-rlp filepath haskoin
          leveldb-haskell mtl network network-simple nibblestring resourcet
          time transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "A Haskell version of an Ethereum client";
@@ -47512,11 +48674,11 @@ self: {
        pname = "ethereum-merkle-patricia-db";
        version = "0.0.1";
        sha256 = "0pxncaam139nl99wm1i7fcnnsy683p6inasz10knfd2jsxcz8yr8";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring binary bytestring cryptohash
          data-default ethereum-rlp leveldb-haskell nibblestring resourcet
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-wl-pprint base base16-bytestring binary bytestring containers
          cryptohash data-default ethereum-rlp HUnit leveldb-haskell
          nibblestring resourcet test-framework test-framework-hunit
@@ -47535,10 +48697,10 @@ self: {
        pname = "ethereum-rlp";
        version = "0.0.1";
        sha256 = "1hx5nhdy27kx67mwi8zjgqfxir0z7bp47xsw3a6hz40hj716n9r5";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring HUnit
          test-framework test-framework-hunit
        ];
@@ -47556,7 +48718,10 @@ self: {
        sha256 = "165vwca1q001pa9f09vfhf724kq5jnsip907c9dr6fncj9yjdp2p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring curl random text-icu utf8-string xml
+       ];
+       executableHaskellDepends = [
          base bytestring curl random text-icu utf8-string xml
        ];
        description = "Random etymology online entry";
@@ -47571,10 +48736,11 @@ self: {
        pname = "euler";
        version = "0.9.2";
        sha256 = "14ghmy5qblfgacc6b07jja6pssglf393j5hjypz0l0azd9w56kh5";
-       buildDepends = [ base ];
-       testDepends = [
-         base directory happy hlint hspec process regex-posix xml
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory hlint hspec process regex-posix xml
        ];
+       testToolDepends = [ happy ];
        homepage = "https://github.com/decomputed/euler";
        description = "Mathematics utilities for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -47590,16 +48756,17 @@ self: {
        pname = "euphoria";
        version = "0.6.0.1";
        sha256 = "1bml75lj30y83bln5a7b36gcb9d6gci4vhmr8ins9nz6bc1l29m9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default deepseq elerea enummapset-th hashable
          HUnit transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
        homepage = "http://github.com/tsurucapital/euphoria";
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eurofxref" = callPackage
@@ -47610,7 +48777,7 @@ self: {
        pname = "eurofxref";
        version = "0.2.1";
        sha256 = "0zjf3rky2ww2nq4ryyz0069cv3ps1h29nwrgr2sk127bsik868x9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers failure hexpat http-conduit
          http-types monad-control mtl time
        ];
@@ -47626,7 +48793,9 @@ self: {
        pname = "event";
        version = "0.1.1";
        sha256 = "191d72dbaddxl2ql2860145iwfsrx2jrbcsylfq7028vmzzxqqm6";
-       buildDepends = [ base containers semigroups transformers ];
+       libraryHaskellDepends = [
+         base containers semigroups transformers
+       ];
        description = "Monoidal, monadic and first-class events";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47637,7 +48806,7 @@ self: {
        pname = "event-driven";
        version = "0.0.2";
        sha256 = "1jkrc1k0ixjs95fvj36gr08igpx5vqff5zc6bi9f04ldxqz4wbap";
-       buildDepends = [ base monads-tf yjtools ];
+       libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47649,7 +48818,7 @@ self: {
        pname = "event-handlers";
        version = "0.0.0.3";
        sha256 = "1515v1khdkr145z5inrm2ardhpzfsbncpl5wmfd9nmilw97da9ld";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~mokus/event-handlers";
        description = "Event handlers";
        license = stdenv.lib.licenses.publicDomain;
@@ -47663,10 +48832,10 @@ self: {
        pname = "event-list";
        version = "0.1.1.2";
        sha256 = "1nvc473rv9m6vr9l9d5x9v6h89819s822gwzilx8d5fj5i50nqzb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base non-negative QuickCheck transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          base non-negative QuickCheck random transformers utility-ht
        ];
        homepage = "http://code.haskell.org/~thielema/event-list/";
@@ -47682,7 +48851,7 @@ self: {
        pname = "event-monad";
        version = "0.0.3";
        sha256 = "1phs799i4da1nfgx530bp93n9xhzgnavilwlk8nz5vi3kd61gzf4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers event-handlers haskell98 monad-loops mtl pretty
          prettyclass priority-queue stateref
        ];
@@ -47700,7 +48869,7 @@ self: {
        pname = "eventloop";
        version = "0.4.1.1";
        sha256 = "0d870kzcb08pc0ngrdkfibi0yq4zs5vcgg8acqpa8gdjaiksm8jg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring network suspend text timers websockets
        ];
        jailbreak = true;
@@ -47718,7 +48887,7 @@ self: {
        pname = "eventstore";
        version = "0.8.0.0";
        sha256 = "0p1z7xs3412s2hnv7pc18y1gx65p5hf09038n96vl22kvc9d84ww";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base bytestring cereal containers network
          protobuf random sodium stm text time unordered-containers uuid
        ];
@@ -47733,7 +48902,7 @@ self: {
        pname = "every-bit-counts";
        version = "0.1";
        sha256 = "0r959iyd5nsw3sj7p0gwsccdgaald9lwisg0lvq9qynyz09kh4vj";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://research.microsoft.com/en-us/people/dimitris/pearl.pdf";
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
        license = stdenv.lib.licenses.bsd3;
@@ -47750,8 +48919,10 @@ self: {
        sha256 = "0v313l0akvw9b3zn7xffy4ixz2c70i40k6kh4vdlrw8dvyv7zxk3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl pretty transformers ];
-       buildTools = [ alex happy ];
+       executableHaskellDepends = [
+         array base containers mtl pretty transformers
+       ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://github.com/jfcmacro/ewe";
        description = "An language using in Programming Languages teaching";
        license = stdenv.lib.licenses.bsd3;
@@ -47766,7 +48937,7 @@ self: {
        pname = "ex-pool";
        version = "0.2";
        sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions hashable stm time transformers vector
        ];
        jailbreak = true;
@@ -47781,7 +48952,7 @@ self: {
        pname = "exact-combinatorics";
        version = "0.2.0.8";
        sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Efficient exact computation of combinatoric functions";
        license = stdenv.lib.licenses.bsd3;
@@ -47793,7 +48964,7 @@ self: {
        pname = "exact-pi";
        version = "0.2.1.1";
        sha256 = "1f8lxdaal7m4vw8akzwlhn0j3vw5bh983f02j842g1vzs3n47x3g";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
        license = stdenv.lib.licenses.mit;
@@ -47805,7 +48976,7 @@ self: {
        pname = "exception-mailer";
        version = "0.4.1";
        sha256 = "068zhr90gldin0f6xafqp1pncf6rhhm3gagnvn6r3p0kx060ia23";
-       buildDepends = [ base hslogger mime-mail text ];
+       libraryHaskellDepends = [ base hslogger mime-mail text ];
        homepage = "https://github.com/drpowell/exception-mailer";
        description = "Catch all runtime exceptions and send an email";
        license = stdenv.lib.licenses.bsd3;
@@ -47819,7 +48990,7 @@ self: {
        pname = "exception-monads-fd";
        version = "0.2";
        sha256 = "1wrhi9h2k068f0q0aqvpmlyx3318znm137xnvx7icf5shlpsilvi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exception-transformers monads-fd transformers
        ];
        jailbreak = true;
@@ -47836,7 +49007,7 @@ self: {
        pname = "exception-monads-tf";
        version = "0.4";
        sha256 = "0k9ada0g4nxwxggarpfcfdzg2zvxqdg9bkb4hv5v3qqanjmvb9hg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exception-transformers monads-tf transformers
        ];
        description = "Exception monad transformer instances for monads-tf classes";
@@ -47849,7 +49020,9 @@ self: {
        pname = "exception-mtl";
        version = "0.4";
        sha256 = "1ya2xxl25afj2rxl2vziifrc91nzyg47vs06s0b65qjd7yz533j3";
-       buildDepends = [ base exception-transformers mtl transformers ];
+       libraryHaskellDepends = [
+         base exception-transformers mtl transformers
+       ];
        description = "Exception monad transformer instances for mtl classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47862,8 +49035,10 @@ self: {
        pname = "exception-transformers";
        version = "0.4.0.1";
        sha256 = "1ay46wawrrsvii3b4kqxi2cg3b6r7wfw0l7d66il195qa6hh4sfq";
-       buildDepends = [ base stm transformers transformers-compat ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base stm transformers transformers-compat
+       ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit transformers
          transformers-compat
        ];
@@ -47877,7 +49052,7 @@ self: {
        pname = "exceptional";
        version = "0.3.0.0";
        sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns";
-       buildDepends = [ base exceptions ];
+       libraryHaskellDepends = [ base exceptions ];
        homepage = "https://github.com/";
        description = "Essentially the Maybe type with error messages";
        license = stdenv.lib.licenses.bsd2;
@@ -47891,8 +49066,10 @@ self: {
        pname = "exceptions";
        version = "0.8.0.2";
        sha256 = "1x1bk1jf42k1gigiqqmkkh38z2ffhx8rsqiszdq3f94m2h6kw2h7";
-       buildDepends = [ base mtl stm transformers transformers-compat ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base mtl stm transformers transformers-compat
+       ];
+       testHaskellDepends = [
          base mtl QuickCheck stm test-framework test-framework-quickcheck2
          transformers transformers-compat
        ];
@@ -47912,11 +49089,12 @@ self: {
        sha256 = "103s0095bb71wz3axhzw2w2nm5wfr01r9ypkdvbp22zhmq3xr1bj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cryptohash directory executable-path file-embed
          template-haskell
        ];
-       testDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/fpco/executable-hash";
        description = "Provides the SHA1 hash of the program executable";
        license = stdenv.lib.licenses.mit;
@@ -47928,7 +49106,7 @@ self: {
        pname = "executable-path";
        version = "0.0.3";
        sha256 = "1jg58qf19qz93c60ryglcavwdcysz4fd4qn8kpw5im9w9kniawlc";
-       buildDepends = [ base directory filepath unix ];
+       libraryHaskellDepends = [ base directory filepath unix ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Finding out the full path of the executable";
        license = stdenv.lib.licenses.publicDomain;
@@ -47941,7 +49119,9 @@ self: {
        pname = "exhaustive";
        version = "1.1.1";
        sha256 = "0bgzg2qhx91hd9711bxv6cr2qc7m23g29al4gb7yx20cs78bz1mg";
-       buildDepends = [ base generics-sop template-haskell transformers ];
+       libraryHaskellDepends = [
+         base generics-sop template-haskell transformers
+       ];
        homepage = "http://github.com/ocharles/exhaustive";
        description = "Compile time checks that a computation considers producing data through all possible constructors";
        license = stdenv.lib.licenses.bsd3;
@@ -47957,13 +49137,12 @@ self: {
        sha256 = "1i1p9pwzdf44cp8d1crq40g1hv84gpimywq5kdpz2nfgcnr17ans";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers haddock-library http-client
          pcre-light pretty
        ];
        description = "Exheres generator for cabal packages";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exif" = callPackage
@@ -47972,8 +49151,8 @@ self: {
        pname = "exif";
        version = "3000.0.0";
        sha256 = "0w0l4xk3qwfiw10880729mwfdkx4xpfn9ffdw7fi5swyhinjh6wi";
-       buildDepends = [ base ];
-       extraLibraries = [ exif ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47985,7 +49164,7 @@ self: {
        pname = "exists";
        version = "0.2";
        sha256 = "1f7v2f7jmqx0nkl2wla88mnb21nava74b73rvsmfbj4kxmwchsgy";
-       buildDepends = [ base contravariant ];
+       libraryHaskellDepends = [ base contravariant ];
        jailbreak = true;
        homepage = "http://github.com/glehel/exists";
        description = "Existential datatypes holding evidence of constraints";
@@ -48002,10 +49181,10 @@ self: {
        pname = "exp-pairs";
        version = "0.1.3.0";
        sha256 = "033sdkfg94m33qrkw0l3lbs6dm8ssxfdj3jg3p39w63q7va2c0hr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq generic-deriving ghc-prim memoize wl-pprint
        ];
-       testDepends = [
+       testHaskellDepends = [
          base matrix memoize QuickCheck random smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
@@ -48021,7 +49200,9 @@ self: {
        pname = "expand";
        version = "0.0.1";
        sha256 = "0i8agr9np8pg40z58z8jz1fvq3vqjk2sx247dn33mvqyd03hnbss";
-       buildDepends = [ AspectAG base HList murder uu-parsinglib ];
+       libraryHaskellDepends = [
+         AspectAG base HList murder uu-parsinglib
+       ];
        jailbreak = true;
        description = "Extensible Pandoc";
        license = "LGPL";
@@ -48036,7 +49217,7 @@ self: {
        pname = "expat-enumerator";
        version = "0.1.0.3";
        sha256 = "0alllaa9qj94jp99pyvbh4ckdvb43aba2l2jmigazqvbc9db03mx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator hexpat text transformers xml-types
        ];
        jailbreak = true;
@@ -48054,8 +49235,10 @@ self: {
        pname = "expiring-cache-map";
        version = "0.0.5.4";
        sha256 = "0wbx9qp9ki9gwrc9qafpflkmyj1yiryak1di163mz0i3dv2w73h8";
-       buildDepends = [ base containers hashable unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
+       testHaskellDepends = [
          base bytestring containers hashable time unordered-containers
        ];
        homepage = "https://github.com/elblake/expiring-cache-map";
@@ -48069,7 +49252,7 @@ self: {
        pname = "expiring-mvar";
        version = "0.1";
        sha256 = "0mkc7d346vdsjg83a253986w4pps53r262w1if91q16kx6qci7yy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Create values which expire after a period of time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48082,7 +49265,9 @@ self: {
        sha256 = "14n8ic5mg2819s9bk4czwfxrkyz96c2lvnksv1hq5vwr579rvjx2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ ansi-wl-pprint base haskell-src-exts ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base haskell-src-exts
+       ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/explain";
        description = "Show how expressions are parsed";
@@ -48096,7 +49281,7 @@ self: {
        pname = "explicit-determinant";
        version = "0.1.0.0";
        sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/jwaldmann/haskell-explicit-determinant";
        description = "explicit computation of determinant of small matrices";
@@ -48111,7 +49296,7 @@ self: {
        sha256 = "0f1p1llz6z4ag1wnf57mgm861cbw7va0g0m8klp6f6pnirdhlwz1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Exception";
        description = "Exceptions which are explicit in the type signature";
        license = stdenv.lib.licenses.bsd3;
@@ -48123,7 +49308,7 @@ self: {
        pname = "explicit-iomodes";
        version = "0.6.0.5";
        sha256 = "0irz1zy6iaipym73x343zvr6cqym6ci2vbjbyr564d29ymd6ldzd";
-       buildDepends = [ base base-unicode-symbols tagged ];
+       libraryHaskellDepends = [ base base-unicode-symbols tagged ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/explicit-iomodes/";
        description = "File handles with explicit IOModes";
@@ -48136,7 +49321,7 @@ self: {
        pname = "explicit-iomodes-bytestring";
        version = "0.2.0.2";
        sha256 = "0h3dlgkd2gx8zr3sh949nhqgrdg943dgpp4v1n599jjjpqpw16hj";
-       buildDepends = [ base bytestring explicit-iomodes ];
+       libraryHaskellDepends = [ base bytestring explicit-iomodes ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/explicit-iomodes-bytestring/";
        description = "Extends explicit-iomodes with ByteString operations";
@@ -48149,7 +49334,7 @@ self: {
        pname = "explicit-iomodes-text";
        version = "0.1.0.8";
        sha256 = "12ny5wa1j1wp8fbg5k8zkv4a3axmssxcvfvhg3frsm4dych6hmyg";
-       buildDepends = [ base explicit-iomodes text ];
+       libraryHaskellDepends = [ base explicit-iomodes text ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/explicit-iomodes-text/";
        description = "Extends explicit-iomodes with Text operations";
@@ -48162,7 +49347,9 @@ self: {
        pname = "explicit-sharing";
        version = "0.9";
        sha256 = "0jshv56i60mzlfddvfkcx0j7rzqdlhy6h09bmqci15wzisvpvjpq";
-       buildDepends = [ base containers derive mtl template-haskell ];
+       libraryHaskellDepends = [
+         base containers derive mtl template-haskell
+       ];
        jailbreak = true;
        homepage = "http://sebfisch.github.com/explicit-sharing";
        description = "Explicit Sharing of Monadic Effects";
@@ -48178,7 +49365,7 @@ self: {
        sha256 = "18x2gw9w2jzisyl2hsp2rlml6slnlbjpqbadqcbcm8pamnl7w1fc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base directory pngload ];
+       executableHaskellDepends = [ array base directory pngload ];
        homepage = "http://corsis.sourceforge.net/haskell/explore";
        description = "Experimental Plot data Reconstructor";
        license = stdenv.lib.licenses.bsd3;
@@ -48193,11 +49380,11 @@ self: {
      mkDerivation {
        pname = "exposed-containers";
        version = "0.5.5.1";
-       revision = "1";
        sha256 = "09ck4hadxgdlqpgxr45jxr261mzkzihmwd5b02xi05z8034bhqk7";
+       revision = "1";
        editedCabalFile = "25516f8a7288ce438b872a0d3054434c3ba48ce0ce8a57209ea6d78ce6e2665c";
-       buildDepends = [ array base deepseq ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ array base deepseq ghc-prim ];
+       testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -48213,7 +49400,7 @@ self: {
        pname = "expression-parser";
        version = "0.1";
        sha256 = "1ldp1f2c823byx4ag8jpmq9bhw26lq98fz7ljqslffs37pc098qs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generalization of parsec's expression parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48226,7 +49413,7 @@ self: {
        pname = "extcore";
        version = "1.0.2";
        sha256 = "1dpn4dbbn5d3zqrhxkg8nvb97vp9pf61gwa46yf218nvwgqvx437";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath mtl parsec
          pretty syb
        ];
@@ -48247,7 +49434,7 @@ self: {
        sha256 = "1vbazvs1ij4qfhzf38f7z75lx4mdxnkvcb79ngqc3h67844s90xy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers feed happstack-auth happstack-server
          happstack-state happstack-util HTTP MaybeT monad-parallel mtl
          network old-locale regex-tdfa smartGroup stringsearch time xhtml
@@ -48265,7 +49452,7 @@ self: {
        pname = "extended-categories";
        version = "0.2.0";
        sha256 = "1dg9zvqszlg5v3mygazzgm84qlkcmpryv3vv4x3zwrzi1g0idq72";
-       buildDepends = [ base constraints ghc-prim tagged ];
+       libraryHaskellDepends = [ base constraints ghc-prim tagged ];
        jailbreak = true;
        homepage = "github.com/ian-mi/extended-categories";
        description = "Extended Categories";
@@ -48282,8 +49469,8 @@ self: {
        pname = "extended-reals";
        version = "0.2.1.0";
        sha256 = "1a3vp51l07kj85p578y5bryalqv1a8b5766w0hrr85yp67y7wfdp";
-       buildDepends = [ base deepseq hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq hashable ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
@@ -48301,7 +49488,7 @@ self: {
        pname = "extensible";
        version = "0.3.5";
        sha256 = "0jff7vrmhj5sdd3migfi5p2bx35m6jbqlfai7rqpg0iqbxbp6pmy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints monad-skeleton profunctors tagged template-haskell
          transformers
        ];
@@ -48318,7 +49505,7 @@ self: {
        pname = "extensible-data";
        version = "0.1.0.4";
        sha256 = "143cl3w129mkvs410lx63v3x1dq2az8sk0hlcymaavnqik5maa6g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-lens hashable template-haskell unordered-containers
        ];
        jailbreak = true;
@@ -48336,10 +49523,10 @@ self: {
        pname = "extensible-effects";
        version = "1.11.0.0";
        sha256 = "14f8x6gyq28n3lpap4f5bn290llj57my1k28km9r1nh14kxl1lp9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base transformers transformers-base type-aligned void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th void
        ];
@@ -48354,7 +49541,7 @@ self: {
        pname = "extensible-exceptions";
        version = "0.1.1.4";
        sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Extensible exceptions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48365,7 +49552,9 @@ self: {
        pname = "external-sort";
        version = "0.2";
        sha256 = "1i7q3wh2c4fyv6wn4smws8r382hnnppj39xys43h9pkqfis786r9";
-       buildDepends = [ base binary bytestring EdisonAPI EdisonCore ];
+       libraryHaskellDepends = [
+         base binary bytestring EdisonAPI EdisonCore
+       ];
        description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48379,8 +49568,12 @@ self: {
        pname = "extra";
        version = "1.4.1";
        sha256 = "00fhy9l2cgfwj8873jf1iyz2fmhj1b3m0qlf38i4pd1yad8sfb70";
-       buildDepends = [ base directory filepath process time unix ];
-       testDepends = [ base directory filepath QuickCheck time unix ];
+       libraryHaskellDepends = [
+         base directory filepath process time unix
+       ];
+       testHaskellDepends = [
+         base directory filepath QuickCheck time unix
+       ];
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
@@ -48396,7 +49589,7 @@ self: {
        sha256 = "13wbzqw0iz7xkqdrwan9xxl8vwqvhvwzlypps964v1s1bgabmpqj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bytestring-mmap directory elf filepath
          optparse-applicative
        ];
@@ -48418,7 +49611,7 @@ self: {
        pname = "ez-couch";
        version = "0.7.0";
        sha256 = "023wrrk7slrg8p547saspfvp771zqwdh7mnvwg1sag4a2j20b660";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder bytestring
          classy-prelude classy-prelude-conduit containers ghc-prim hashable
          hslogger http-conduit http-types mtl neat-interpolation old-locale
@@ -48438,7 +49631,7 @@ self: {
        pname = "faceted";
        version = "0.0.2.0";
        sha256 = "0apgad2rqpgxypm10n98agmfrlxydcawvsvyafdwj8jhynfycx03";
-       buildDepends = [ base free ];
+       libraryHaskellDepends = [ base free ];
        jailbreak = true;
        homepage = "http://github.com/haskell-faceted/haskell-faceted";
        description = "Faceted computation for dynamic information flow security";
@@ -48456,10 +49649,10 @@ self: {
        sha256 = "07shidg02drvxpny0qgmshgliz0agw1app5xjs3d0z9zv3v5y1am";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal containers deepseq parallel primes QuickCheck
-         random toolshed
+       libraryHaskellDepends = [
+         array base containers deepseq parallel primes random toolshed
        ];
+       executableHaskellDepends = [ Cabal QuickCheck ];
        homepage = "http://functionalley.eu";
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
@@ -48474,7 +49667,7 @@ self: {
        pname = "factual-api";
        version = "0.6.1";
        sha256 = "1njijf5l277qndp5xmyqji0fcd84zxnn9vhz5v8nlqp3pfcilidp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers curl dataenc hoauth
          HTTP MissingH text unordered-containers utf8-string vector
        ];
@@ -48490,7 +49683,7 @@ self: {
        pname = "fad";
        version = "1.1.0.1";
        sha256 = "00n5m3fa14y882rnzw7pwc154bgp46rhvvj2cghldvybxmj61zgm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/bjornbm/fad";
        description = "Forward Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
@@ -48502,7 +49695,7 @@ self: {
        pname = "failable-list";
        version = "0.2";
        sha256 = "0bq0q9n4wnacjqs517i12kl56m16n5ff4gk8kamh87gqkd58w06x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48513,7 +49706,7 @@ self: {
        pname = "failure";
        version = "0.2.0.3";
        sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Failure";
        description = "A simple type class for success/failure computations. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -48525,7 +49718,7 @@ self: {
        pname = "fair-predicates";
        version = "0.1.1";
        sha256 = "1z0c83gfmvwhzsj2iz422mxcyxc8jnic25i1vz6yp4xzv41ibmj6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://sebfisch.github.com/fair-predicates";
        description = "Fair Predicates";
        license = stdenv.lib.licenses.publicDomain;
@@ -48537,7 +49730,7 @@ self: {
        pname = "faker";
        version = "0.0.0.2";
        sha256 = "1wl0jx3adibf7z8k3jadnr90jvkmf3zhkq34qpsifcl18zip8skq";
-       buildDepends = [ base gimlh random split ];
+       libraryHaskellDepends = [ base gimlh random split ];
        homepage = "https://github.com/gazay/faker";
        description = "Pure Haskell library for generating fake data";
        license = stdenv.lib.licenses.mit;
@@ -48553,7 +49746,7 @@ self: {
        sha256 = "035rjjjvwbjw4z6nlmiyxia5y91yiiw7902f9q6n5jimi5xk2hgk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base gloss gloss-raster JuicyPixels-repa QuickCheck random repa
          repa-algorithms vector
        ];
@@ -48573,7 +49766,9 @@ self: {
        sha256 = "18h5d33hd4cs6dc508mzl7c46pxwrk2q0daabvg8m4fiwk5wzlr0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers haskell98 SDL SDL-mixer SDL-ttf ];
+       executableHaskellDepends = [
+         base containers haskell98 SDL SDL-mixer SDL-ttf
+       ];
        jailbreak = true;
        homepage = "http://bencode.blogspot.com/2009/03/falling-blocks-tetris-clone-in-haskell.html";
        description = "A fun falling blocks game";
@@ -48589,7 +49784,7 @@ self: {
        pname = "family-tree";
        version = "0.5.1";
        sha256 = "0b2063f8yz7hwv7h0yisrgh6glr5h4s1cx0q75gfg2wgp2mr72s1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers hashable intervals lens tables text time
          unordered-containers
        ];
@@ -48605,8 +49800,8 @@ self: {
        pname = "farmhash";
        version = "0.1.0.3";
        sha256 = "0zqyp55grrkl4x4bhn13ng635zpsnd7g6vj2dqmvn3dg4zhyigf6";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
@@ -48620,8 +49815,8 @@ self: {
        pname = "fast-builder";
        version = "0.0.0.2";
        sha256 = "07fnn282ldfmgkfnsdnjr11hx89jhw7waz573a7nx2a329r1p4pf";
-       buildDepends = [ base bytestring ghc-prim ];
-       testDepends = [ base bytestring process QuickCheck stm ];
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [ base bytestring process QuickCheck stm ];
        homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
@@ -48635,8 +49830,8 @@ self: {
        pname = "fast-digits";
        version = "0.1.0.0";
        sha256 = "1dhvlsjbp4qrgcr9xlzbaps59160j2zl98xl5nrz6rffypz0gi72";
-       buildDepends = [ base integer-gmp ];
-       testDepends = [
+       libraryHaskellDepends = [ base integer-gmp ];
+       testHaskellDepends = [
          base digits QuickCheck smallcheck tasty tasty-quickcheck
          tasty-smallcheck
        ];
@@ -48652,14 +49847,14 @@ self: {
      mkDerivation {
        pname = "fast-logger";
        version = "2.4.0";
-       revision = "3";
        sha256 = "1hh5rll2q4dpshplyk0hciknvypx3v2hd102hf0f2z5h70d4xzsc";
+       revision = "3";
        editedCabalFile = "af5edf5e05ecd782e1d87b9d5730c5a9eb1016ac01fb1a377dda1cd8e88a274b";
-       buildDepends = [
+       libraryHaskellDepends = [
          array auto-update base bytestring bytestring-builder directory
          filepath text
        ];
-       testDepends = [ base bytestring directory hspec ];
+       testHaskellDepends = [ base bytestring directory hspec ];
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48670,7 +49865,7 @@ self: {
        pname = "fast-math";
        version = "1.0.2";
        sha256 = "15dyw88z9abiv6n40fz4g3jpj9v6qbxvqaf0ds32wh46igf1s425";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Non IEEE-754 compliant compile-time floating-point optimisations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48685,10 +49880,13 @@ self: {
        sha256 = "1m6v9jdla0r36l45gs3swycfgisl48hjq7x9rvfc08h4kd5mcmay";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers cpphs deepseq directory filepath text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory filepath text
+       ];
+       testHaskellDepends = [
          base bytestring containers directory filepath tasty tasty-hunit
          text
        ];
@@ -48704,7 +49902,7 @@ self: {
        pname = "fast-tagsoup";
        version = "1.0.7";
        sha256 = "089karddj08z0lfr83r2x070j67i2s0aq2s1qi5i66vw335y91d8";
-       buildDepends = [ base bytestring tagsoup text text-icu ];
+       libraryHaskellDepends = [ base bytestring tagsoup text text-icu ];
        homepage = "https://github.com/vshabanov/fast-tagsoup";
        description = "Fast parser for tagsoup package";
        license = stdenv.lib.licenses.bsd3;
@@ -48716,7 +49914,7 @@ self: {
        pname = "fast-tagsoup-utf8-only";
        version = "1.0.5";
        sha256 = "10svhgjvp1802jawr1s5chkincl2xhh6k0grm60f216jpasbvff4";
-       buildDepends = [ base bytestring tagsoup text ];
+       libraryHaskellDepends = [ base bytestring tagsoup text ];
        homepage = "https://github.com/exbb2/fast-tagsoup";
        description = "Fast parser for tagsoup package";
        license = stdenv.lib.licenses.bsd3;
@@ -48730,7 +49928,7 @@ self: {
        pname = "fasta";
        version = "0.7.2.1";
        sha256 = "1jwx8h3z3zlrnandqgmgrkam4y0awm3k1mfzljf7pn9acq6nxhs4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers foldl lens parsec pipes pipes-bytestring
          pipes-group pipes-text split text
        ];
@@ -48746,7 +49944,7 @@ self: {
        pname = "fastbayes";
        version = "0.2.0.0";
        sha256 = "1nqrfrhw8gd3blfzrwbf7pm4wwqbxfaw640bzx62kwh7x2h6v3cm";
-       buildDepends = [ base hmatrix vector ];
+       libraryHaskellDepends = [ base hmatrix vector ];
        jailbreak = true;
        homepage = "https://github.com/cscherrer/fastbayes";
        description = "Bayesian modeling algorithms accelerated for particular model structures";
@@ -48758,11 +49956,11 @@ self: {
      mkDerivation {
        pname = "fastcgi";
        version = "3001.0.2.4";
-       revision = "1";
        sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr";
+       revision = "1";
        editedCabalFile = "74cd87692a90492171802f25c034ef047f0b68aaa1b53303d4e50ce3ec30e98a";
-       buildDepends = [ base bytestring cgi ];
-       extraLibraries = [ fcgi ];
+       libraryHaskellDepends = [ base bytestring cgi ];
+       librarySystemDepends = [ fcgi ];
        description = "A Haskell library for writing FastCGI programs";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) fcgi;};
@@ -48776,11 +49974,11 @@ self: {
        pname = "fastedit";
        version = "0.1.0.0";
        sha256 = "0ax5wnbf75n39crd9bw0xf3g83zlh29pbhwapbc5q7315rjdfxfj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude bytestring containers hashable safe
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-prelude bytestring edit-distance file-embed hspec
          QuickCheck
        ];
@@ -48797,7 +49995,7 @@ self: {
        pname = "fastirc";
        version = "0.2.0";
        sha256 = "0ddacpw19kh304j8js9ybwclkgyh8n5yy1r2xh48z9h3gas2zim4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-show containers monadLib
          network-fancy
        ];
@@ -48812,7 +50010,7 @@ self: {
        pname = "fault-tree";
        version = "0.0.0";
        sha256 = "04m6hfj0sqhmq89fwfq4igz1rc0p3rzkhfg6fzsw5kyda2c8bbz0";
-       buildDepends = [ base yices ];
+       libraryHaskellDepends = [ base yices ];
        homepage = "http://tomahawkins.org";
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
@@ -48833,14 +50031,14 @@ self: {
        sha256 = "1772gdqka5hcgs2bq76bba9pca5xx32q3fg9vvkjqd5249rk5gv6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default data-lens-light
          directory filepath ghc-paths haskell-src-exts language-ecmascript
-         mtl mtl-compat optparse-applicative process safe sourcemap split
-         spoon syb text time transformers transformers-compat
-         traverse-with-class type-eq uniplate unordered-containers
-         utf8-string vector
+         mtl mtl-compat process safe sourcemap split spoon syb text time
+         transformers transformers-compat traverse-with-class type-eq
+         uniplate unordered-containers utf8-string vector
        ];
+       executableHaskellDepends = [ base mtl optparse-applicative split ];
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
@@ -48852,7 +50050,7 @@ self: {
        pname = "fay-base";
        version = "0.20.0.1";
        sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr";
-       buildDepends = [ base fay ];
+       libraryHaskellDepends = [ base fay ];
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48866,7 +50064,7 @@ self: {
        pname = "fay-builder";
        version = "0.2.0.5";
        sha256 = "18ii5dnzk866q79h43fspdz8dzg17mzfrykh3pl4p0q4qdnylv8i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal data-default directory fay filepath safe split text
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
@@ -48879,7 +50077,7 @@ self: {
        pname = "fay-dom";
        version = "0.5.0.1";
        sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0";
-       buildDepends = [ fay-base ];
+       libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-dom";
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48891,7 +50089,7 @@ self: {
        pname = "fay-geoposition";
        version = "0.1.0.1";
        sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q";
-       buildDepends = [ fay-base fay-text ];
+       libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/victoredwardocallaghan/fay-geoposition";
        description = "W3C compliant implementation of GeoPosition API";
        license = stdenv.lib.licenses.bsd3;
@@ -48903,7 +50101,7 @@ self: {
        pname = "fay-hsx";
        version = "0.2.0";
        sha256 = "1mzjna8yc7jczgggpcgh9i6akiy72d60jczvmzxngh778z3g5zmi";
-       buildDepends = [ fay-base fay-jquery ];
+       libraryHaskellDepends = [ fay-base fay-jquery ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Clientside HTML generation for fay";
@@ -48917,7 +50115,7 @@ self: {
        pname = "fay-jquery";
        version = "0.6.0.3";
        sha256 = "1x6i8y6xbz4nyzw59j3cqkhmjvgx9l4vdyh7jr0l1vv396ssnghf";
-       buildDepends = [ fay-base fay-text ];
+       libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/faylang/fay-jquery";
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48929,7 +50127,7 @@ self: {
        pname = "fay-ref";
        version = "0.1.0.0";
        sha256 = "1dcifraih13zqwmm4xn57wfg63rdkiac81avyymid308r6p1x9cn";
-       buildDepends = [ fay-base ];
+       libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48941,7 +50139,7 @@ self: {
        pname = "fay-text";
        version = "0.3.2.2";
        sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans";
-       buildDepends = [ fay fay-base text ];
+       libraryHaskellDepends = [ fay fay-base text ];
        homepage = "https://github.com/faylang/fay-text";
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
@@ -48953,7 +50151,7 @@ self: {
        pname = "fay-uri";
        version = "0.2.0.0";
        sha256 = "1vv4jgkz9cx8inbn6g6sn3a0nf1ak81qlj5li21sk2isj0yws1nr";
-       buildDepends = [ fay-base ];
+       libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48971,14 +50169,14 @@ self: {
        pname = "fb";
        version = "1.0.11";
        sha256 = "19kvsc6ap56b3h1z6wnjqmxgnqs7jqlhd3zx08h6nxkip3ddnzh5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cereal conduit conduit-extra crypto-api cryptohash
          cryptohash-cryptoapi data-default http-conduit http-types
          lifted-base monad-control monad-logger old-locale resourcet text
          time transformers transformers-base unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring conduit containers data-default hspec
          http-conduit HUnit lifted-base monad-control QuickCheck resourcet
          text time transformers
@@ -48995,7 +50193,7 @@ self: {
        pname = "fb-persistent";
        version = "0.3.5";
        sha256 = "0idxwm4brbn73s8azxsys6lxg9c4vzs0b123h9lg4qs4ks5451hh";
-       buildDepends = [ base cereal fb persistent text time ];
+       libraryHaskellDepends = [ base cereal fb persistent text time ];
        homepage = "https://github.com/prowdsponsor/fb-persistent";
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
@@ -49009,7 +50207,7 @@ self: {
        pname = "fca";
        version = "0.1.0.2";
        sha256 = "1c38524r3mhy4m7s1cvfcn539xvf50x0z8a9fzk4x4pz5yq9c1vp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers cryptohash hashable text
          unordered-containers
        ];
@@ -49028,10 +50226,11 @@ self: {
        sha256 = "1z3vphn3vgvsq0mshhvsks03v79wnj9g6r8mmrwkiax126aqzqn6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base directory process text unix vty vty-ui
        ];
-       testDepends = [ base tasty tasty-hunit ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/Neki/fcd";
        description = "A faster way to navigate directories using the command line";
        license = stdenv.lib.licenses.mit;
@@ -49044,7 +50243,7 @@ self: {
        pname = "fckeditor";
        version = "0.1";
        sha256 = "1yvsnk9awik143jh2268w1l5x70kmky60gac10fy2y1450dcn65x";
-       buildDepends = [ base cgi HaXml xhtml ];
+       libraryHaskellDepends = [ base cgi HaXml xhtml ];
        jailbreak = true;
        homepage = "http://peteg.org/";
        description = "Server-Side Integration for FCKeditor";
@@ -49059,8 +50258,10 @@ self: {
        pname = "fclabels";
        version = "2.0.2.2";
        sha256 = "0jvmmmky2h4i6lh0zj67j8rf1r1r1plv1s9y67jbs821266ffra8";
-       buildDepends = [ base mtl template-haskell transformers ];
-       testDepends = [ base HUnit mtl template-haskell transformers ];
+       libraryHaskellDepends = [ base mtl template-haskell transformers ];
+       testHaskellDepends = [
+         base HUnit mtl template-haskell transformers
+       ];
        homepage = "https://github.com/sebastiaanvisser/fclabels";
        description = "First class accessor labels implemented as lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -49072,7 +50273,7 @@ self: {
        pname = "fclabels-monadlib";
        version = "0.2.1";
        sha256 = "1j15fxrpwnjnbjkswsy6jxn8f0bj2nhcdsf5976i7rka7gsjzr3d";
-       buildDepends = [ base fclabels monadLib ];
+       libraryHaskellDepends = [ base fclabels monadLib ];
        jailbreak = true;
        description = "MonadLib monadic interface for the \"fclabels\" package";
        license = stdenv.lib.licenses.bsd3;
@@ -49084,7 +50285,7 @@ self: {
        pname = "fdo-notify";
        version = "0.3.1";
        sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh";
-       buildDepends = [ base containers dbus ];
+       libraryHaskellDepends = [ base containers dbus ];
        homepage = "http://bitbucket.org/taejo/fdo-notify/";
        description = "Desktop Notifications client";
        license = stdenv.lib.licenses.bsd3;
@@ -49100,7 +50301,10 @@ self: {
        sha256 = "04y29wmndyvrlrixj57m7jgx3z8qld0nvlggmg0rvia4p2dv82bk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Diff directory filepath old-locale parsec time unix url
+       ];
+       executableHaskellDepends = [
          base Diff directory filepath old-locale parsec time unix url
        ];
        homepage = "https://github.com/jkarlson/fdo-trash";
@@ -49115,7 +50319,7 @@ self: {
        pname = "feature-flags";
        version = "0.1.0.1";
        sha256 = "1lssjgksq0k2dd7l5lmzxnr9f5zk3gbh386zfmcqgc4iczdzfk0f";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/iand675/feature-flags";
        description = "A simple library for dynamically enabling and disabling functionality";
        license = stdenv.lib.licenses.mit;
@@ -49127,7 +50331,7 @@ self: {
        pname = "fec";
        version = "0.1.1";
        sha256 = "04ryd1c06l45af6627vjvprhs0rk1rwl0k9gq0byr95ghvc6mk6d";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://allmydata.org/source/zfec";
        description = "Forward error correction of ByteStrings";
        license = "GPL";
@@ -49140,14 +50344,14 @@ self: {
      mkDerivation {
        pname = "fedora-packages";
        version = "0.0.3";
-       revision = "1";
        sha256 = "14fpv76ndp755mysgbya2hgr35rg2hb6dsagmrq2j2mn06xmngqk";
+       revision = "1";
        editedCabalFile = "b09d857e6d91527f8c9fbb8626e1610c5c7b994a6fcf30cd3328c668a6e8d33a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers HsOpenSSL http-streams io-streams
          lens text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers hlint HsOpenSSL hspec http-streams
          io-streams lens text
        ];
@@ -49165,10 +50369,10 @@ self: {
        pname = "feed";
        version = "0.3.9.7";
        sha256 = "01ssy7a1525cw72igpk1xksyafs7can68gmb81kvlzw8fddl4s0l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit old-locale old-time test-framework test-framework-hunit
          time time-locale-compat utf8-string xml
        ];
@@ -49187,7 +50391,7 @@ self: {
        sha256 = "0gql641jmbldx6vhk37i2v41j2nq22lrihm48f97wirrxw7yjn61";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory feed old-locale old-time time xml
        ];
        jailbreak = true;
@@ -49205,7 +50409,7 @@ self: {
        pname = "feed-crawl";
        version = "0.1.2.0";
        sha256 = "0d3yfkiazzlypp3s85fqikwlli28ss27h0i215114vxsswmx1g7c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit connection http-conduit http-types hxt
          network-uri text transformers
        ];
@@ -49225,7 +50429,7 @@ self: {
        sha256 = "0ym4f6d8fxl6j9kfqmp3ds36qj35nypxjmmqv6w96yz5y8ia3ynv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base curl directory feed haskell98 HTTP old-locale pureMD5
          regex-posix tagsoup time utf8-string
        ];
@@ -49243,7 +50447,9 @@ self: {
        sha256 = "1zhl7f5zlyv0l5h0zay66p532n1vywnirwxbc1c9fjaia7yv0rij";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring download-curl feed hs-twitter ];
+       libraryHaskellDepends = [
+         base bytestring download-curl feed hs-twitter
+       ];
        homepage = "http://github.com/tomlokhorst/feed2twitter";
        description = "Send posts from a feed to Twitter";
        license = stdenv.lib.licenses.bsd3;
@@ -49261,16 +50467,16 @@ self: {
        pname = "feldspar-compiler";
        version = "0.7";
        sha256 = "0kkxjnbx4yn3k2s1gdxg4jj06fhdd2jprq8s4zyaybs8xcddgvhh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers data-default directory feldspar-language
          filepath ghc-paths mtl plugins plugins-multistage pretty process
          storable-record storable-tuple syntactic template-haskell
        ];
-       testDepends = [
+       librarySystemDepends = [ gcc_s ];
+       testHaskellDepends = [
          base bytestring Cabal feldspar-language mtl process QuickCheck
          tasty tasty-golden tasty-quickcheck
        ];
-       extraLibraries = [ gcc_s ];
        jailbreak = true;
        homepage = "http://feldspar.github.com";
        description = "Compiler for the Feldspar language";
@@ -49288,12 +50494,12 @@ self: {
        pname = "feldspar-language";
        version = "0.7";
        sha256 = "0gzs2qdvpzcx4w89wpmwk2jnambvyl08afpk16989vcviq5ri51n";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-default data-hash data-lens deepseq
          monad-par mtl patch-combinators QuickCheck random syntactic tagged
          tuple
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck random tasty tasty-golden
          tasty-quickcheck tasty-th utf8-string
        ];
@@ -49313,7 +50519,7 @@ self: {
        pname = "feldspar-signal";
        version = "0.0.1.0";
        sha256 = "147y0fy5pzagk8pm8way8qnxv42mn5qh8kmzjf02laydzxrwvpxd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat feldspar-compiler feldspar-compiler-shim
          feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv
        ];
@@ -49334,8 +50540,15 @@ self: {
        sha256 = "01111rxpdd9pqpjs54krx4z67k3abjglw9zbvn5j97z9zdj5qr81";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ api-opentheory-unicode base opentheory-unicode ];
-       testDepends = [ api-opentheory-unicode base opentheory-unicode ];
+       libraryHaskellDepends = [
+         api-opentheory-unicode base opentheory-unicode
+       ];
+       executableHaskellDepends = [
+         api-opentheory-unicode base opentheory-unicode
+       ];
+       testHaskellDepends = [
+         api-opentheory-unicode base opentheory-unicode
+       ];
        description = "Converting a chess position from FEN notation to text";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -49346,7 +50559,7 @@ self: {
        pname = "fences";
        version = "0.1.1";
        sha256 = "16qzqczr6nlbng16vby1c12a0apfjm4lmm0pgybi5xaziaq4c4db";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "To be written";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49362,10 +50575,10 @@ self: {
        sha256 = "0sq4g0sdayk1lqzdhggwshl22gny5cjbv70cmr1p27q0wfwfbfff";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo gtk harp HaXml mtl template-haskell unix
        ];
-       extraLibraries = [ raptor ];
+       executableSystemDepends = [ raptor ];
        homepage = "http://fenfire.org/";
        description = "Graph-based notetaking system";
        license = "GPL";
@@ -49378,7 +50591,7 @@ self: {
        pname = "fez-conf";
        version = "1.0.3";
        sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b";
-       buildDepends = [ base containers regex-compat ];
+       libraryHaskellDepends = [ base containers regex-compat ];
        homepage = "http://ui3.info/d/proj/fez-conf.html";
        description = "Simple functions for loading config files";
        license = stdenv.lib.licenses.bsd3;
@@ -49392,7 +50605,8 @@ self: {
        sha256 = "1976v5m050lwp8v2vh1cm08pn6q9lbdkxhq10pql6fyzysn6qz62";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HTTP json network pretty utf8-string ];
+       libraryHaskellDepends = [ base HTTP json network utf8-string ];
+       executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49408,14 +50622,13 @@ self: {
        pname = "fficxx";
        version = "0.2.1";
        sha256 = "1vjkwp0krs2762ww7vkl1g0dpaw6ifba7acjndmqbnvm3yl0ha0d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal containers data-default directory either
          errors filepath hashable HStringTemplate lens mtl process pureMD5
          split template-haskell transformers unordered-containers
        ];
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fficxx-runtime" = callPackage
@@ -49424,7 +50637,7 @@ self: {
        pname = "fficxx-runtime";
        version = "0.2.1";
        sha256 = "0hcpc0db4mh3yx8yzbkllq9b04dd1qvr63ppz2qa9nq5zydb5pxk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Runtime for fficxx-generated library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49439,10 +50652,15 @@ self: {
        sha256 = "13pkdsjsw1h6gscpp2jwly1w81jj3rpb27ssa0w7gi2qhjcg1inw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base either exceptions JuicyPixels mtl transformers vector
        ];
-       pkgconfigDepends = [ ffmpeg libavcodec libavformat libswscale ];
+       libraryPkgconfigDepends = [
+         ffmpeg libavcodec libavformat libswscale
+       ];
+       executableHaskellDepends = [
+         base JuicyPixels mtl transformers vector
+       ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ffmpeg;  libavcodec = null;
@@ -49457,7 +50675,9 @@ self: {
        sha256 = "134czpbzxw0mpnc5mz6j1l6vavdbhw5w3l4lg5zbc2gq1qg9ikqv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring haskell98 hs-ffmpeg SDL stm ];
+       executableHaskellDepends = [
+         base bytestring haskell98 hs-ffmpeg SDL stm
+       ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/VasylPasternak/ffmpeg-tutorials";
        description = "Tutorials on ffmpeg usage to play video/audio";
@@ -49473,11 +50693,11 @@ self: {
        pname = "fft";
        version = "0.1.8.1";
        sha256 = "00q1j6swi5y740n5dnbc73aw1nphsgyx7qnv59snqd48fcllhcww";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base carray ix-shapable storable-complex syb
        ];
-       testDepends = [ base carray QuickCheck storable-complex ];
-       pkgconfigDepends = [ fftw fftwFloat ];
+       libraryPkgconfigDepends = [ fftw fftwFloat ];
+       testHaskellDepends = [ base carray QuickCheck storable-complex ];
        jailbreak = true;
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
@@ -49489,8 +50709,8 @@ self: {
        pname = "fftwRaw";
        version = "0.1.0.0";
        sha256 = "1dkkn72g4arjamv647ba05j7aj95vvjy2wdd6g9xcc5w2ix45kr4";
-       buildDepends = [ base ];
-       extraLibraries = [ fftw ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ fftw ];
        homepage = "https://github.com/adamwalker/haskell-fftw-simple";
        description = "Low level bindings to FFTW";
        license = stdenv.lib.licenses.bsd3;
@@ -49504,8 +50724,10 @@ self: {
        pname = "fgl";
        version = "5.5.2.1";
        sha256 = "1nfm3gkr6cccqhi1g46k2d0l99yw2vq7xjd1hxxzcci5gidp8bhc";
-       buildDepends = [ array base containers deepseq transformers ];
-       testDepends = [ base containers hspec QuickCheck ];
+       libraryHaskellDepends = [
+         array base containers deepseq transformers
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49516,11 +50738,10 @@ self: {
        pname = "fgl-arbitrary";
        version = "0.2.0.0";
        sha256 = "1116c4r1ick3xjhwwq9b6i1082njmxj2aymgkqppabj3d0hv43c4";
-       buildDepends = [ base fgl QuickCheck ];
-       testDepends = [ base containers fgl hspec QuickCheck ];
+       libraryHaskellDepends = [ base fgl QuickCheck ];
+       testHaskellDepends = [ base containers fgl hspec QuickCheck ];
        description = "QuickCheck support for fgl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fgl-extras-decompositions" = callPackage
@@ -49529,7 +50750,7 @@ self: {
        pname = "fgl-extras-decompositions";
        version = "0.1.1.0";
        sha256 = "0p9dv7hq312wjqzm2ha4rafnmd1vplzwd5vk5fmzypgl2a1cz42s";
-       buildDepends = [ base containers fgl ];
+       libraryHaskellDepends = [ base containers fgl ];
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Graph decomposition algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -49541,7 +50762,7 @@ self: {
        pname = "fgl-visualize";
        version = "0.1.0.1";
        sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq";
-       buildDepends = [ base dotgen fgl ];
+       libraryHaskellDepends = [ base dotgen fgl ];
        description = "Convert FGL graphs to dot (graphviz) files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49558,7 +50779,7 @@ self: {
        sha256 = "1jkawf65gdmyzmdw4xfk3jihahi3x7vsavjfy6rnl96bj15q4vzl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring bytestring-lexing Cabal cereal
          containers directory filepath hslogger mtl old-locale old-time
          process regex-compat statistics syb tabular time vector
@@ -49576,7 +50797,7 @@ self: {
        pname = "fibonacci";
        version = "0.2.0.1";
        sha256 = "18jqb4ynjsnpvydzpqzh7l5wyrjb3s3kxgc6a6ipwb6w2hygyf7k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/sebfisch/fibonacci";
        description = "Fast computation of Fibonacci numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -49590,7 +50811,7 @@ self: {
        pname = "fields";
        version = "0.1.0";
        sha256 = "0xxri0a3y75ppywcm6py9zbffaawcycrv8gabflbl1m1z8n6jq6v";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers fclabels monads-fd transformers
        ];
        homepage = "http://github.com/AstraFIN/fields";
@@ -49607,7 +50828,7 @@ self: {
        pname = "fields-json";
        version = "0.2.2.3";
        sha256 = "0wqci95ad339nd3lfbhc6v55c7zdkq714hw8igq5fwvbd8kq11d0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring containers json mtl utf8-string
        ];
        description = "Abusing monadic syntax JSON objects generation";
@@ -49620,8 +50841,8 @@ self: {
        pname = "fieldwise";
        version = "0.1.0.0";
        sha256 = "1mmlw5nk09w829gjp8lc0p280vdkh68rv05b1j55x99l7xywgvj7";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
        license = stdenv.lib.licenses.bsd2;
@@ -49634,7 +50855,7 @@ self: {
        pname = "fig";
        version = "1.4.0";
        sha256 = "03bxiicvfwia5g0whg454ph2s34n8firjcqhn6d7qvbim338hkxq";
-       buildDepends = [ base containers parsec pretty ];
+       libraryHaskellDepends = [ base containers parsec pretty ];
        homepage = "http://www.bergsoe.org/fig";
        description = "Manipulation of FIG files";
        license = stdenv.lib.licenses.bsd3;
@@ -49646,7 +50867,9 @@ self: {
        pname = "file-collection";
        version = "0.1.1.9";
        sha256 = "06bcj143j85p8m519zn88z6qn4bg5ifrw5pv5yva5x49gc3jq6gc";
-       buildDepends = [ base bytestring clock directory zip-archive ];
+       libraryHaskellDepends = [
+         base bytestring clock directory zip-archive
+       ];
        jailbreak = true;
        homepage = "https://github.com/joelwilliamson/file-collection";
        description = "Provide a uniform interface over file archives and directories";
@@ -49661,7 +50884,7 @@ self: {
        pname = "file-command-qq";
        version = "0.1.0.5";
        sha256 = "06bi4nnz1f3i79wza6bxbnglqzddpq3r4w581wdl3bq26b52d3ab";
-       buildDepends = [
+       libraryHaskellDepends = [
          base parsec process system-filepath template-haskell text
        ];
        jailbreak = true;
@@ -49678,10 +50901,10 @@ self: {
        pname = "file-embed";
        version = "0.0.8.2";
        sha256 = "1gdxz9244wjhfigpsyaan81gyx6vanb8574xxi7944sj9pcgi74y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath template-haskell
        ];
-       testDepends = [ base filepath HUnit ];
+       testHaskellDepends = [ base filepath HUnit ];
        homepage = "https://github.com/snoyberg/file-embed";
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
@@ -49695,11 +50918,11 @@ self: {
        pname = "file-location";
        version = "0.4.9";
        sha256 = "1p0lz02pvlvq2781542ims3x5vcck35dw4g58bv16y96qarxwady";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HUnit lifted-base template-haskell th-orphans
          transformers
        ];
-       testDepends = [ base lifted-base process ];
+       testHaskellDepends = [ base lifted-base process ];
        homepage = "https://github.com/gregwebs/FileLocation.hs";
        description = "common functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
@@ -49714,11 +50937,13 @@ self: {
        pname = "filecache";
        version = "0.2.8";
        sha256 = "0dkdjj29dqgdywzxc24l54v8xqxrqy65l43ig2qr3l381mqi87lf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions hashable hinotify lens mtl stm strict-base-types
          unordered-containers
        ];
-       testDepends = [ base directory temporary unordered-containers ];
+       testHaskellDepends = [
+         base directory temporary unordered-containers
+       ];
        homepage = "http://lpuppet.banquise.net/";
        description = "A Linux-only cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
@@ -49733,12 +50958,12 @@ self: {
        pname = "filediff";
        version = "2.0.0";
        sha256 = "15a02dya0qhgxq98whxza268vqsrkw6b1ipdskw3hwnjp02hnc9p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default data-memocombinators directory either
          hashmap mtl rainbow tasty tasty-hunit text threads time
          transformers Zora
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory either mtl tasty tasty-hunit text time transformers
        ];
        jailbreak = true;
@@ -49753,7 +50978,7 @@ self: {
        pname = "filelock";
        version = "0.1.0.1";
        sha256 = "0qypjnbkfayqyaymx8qrq4abddlrlzanf6lqhfn9cqzcgzr6735d";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/takano-akio/filelock";
        description = "Portable interface to file locking (flock / LockFileEx)";
        license = stdenv.lib.licenses.publicDomain;
@@ -49767,7 +50992,7 @@ self: {
        pname = "filemanip";
        version = "0.3.6.3";
        sha256 = "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath mtl unix-compat
        ];
        homepage = "https://github.com/bos/filemanip";
@@ -49781,8 +51006,8 @@ self: {
        pname = "filepath";
        version = "1.4.0.0";
        sha256 = "0a5hhgfxh91clkk6c9iipdd0y3wb9y6lx2hhraaaa73b8y83afx4";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/haskell/filepath#readme";
        description = "Library for manipulating FilePaths in a cross platform way";
@@ -49795,7 +51020,7 @@ self: {
        pname = "filepath-io-access";
        version = "0.1.0.0";
        sha256 = "08rb2nafnh5vx7i6i3ddhq4h1s2ffgz8ailap5knr1xl7izgyywp";
-       buildDepends = [ base base-io-access filepath ];
+       libraryHaskellDepends = [ base base-io-access filepath ];
        jailbreak = true;
        description = "IO Access for filepath";
        license = stdenv.lib.licenses.gpl2;
@@ -49809,7 +51034,7 @@ self: {
        pname = "filepather";
        version = "0.3.0";
        sha256 = "1gqnanmnhrpdw5iryf757qwj7j9izyzx1j4y74ydivxafz8w469v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad comonad-transformers data-lens directory filepath mtl
          transformers
        ];
@@ -49827,11 +51052,13 @@ self: {
        pname = "filestore";
        version = "0.6.1";
        sha256 = "0mfllnnb1mqix1v65fyhd9jsvnrjbawd6l4h4012jk8401zwj280";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
        ];
-       testDepends = [ base Diff directory filepath HUnit mtl time ];
+       testHaskellDepends = [
+         base Diff directory filepath HUnit mtl time
+       ];
        description = "Interface for versioning file stores";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49845,11 +51072,11 @@ self: {
        pname = "filesystem-conduit";
        version = "1.0.0.2";
        sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers system-fileio system-filepath
          text transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring conduit hspec QuickCheck text
          transformers
        ];
@@ -49868,7 +51095,7 @@ self: {
        pname = "filesystem-enumerator";
        version = "0.1.1";
        sha256 = "04cs5kz390g5qanwqps5kx1pd70b9vzaykn4c0yc0kxi16xlxyrc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base enumerator system-fileio system-filepath transformers unix
        ];
        homepage = "https://john-millikin.com/software/haskell-filesystem/";
@@ -49885,7 +51112,7 @@ self: {
        pname = "filesystem-trees";
        version = "0.1.0.6";
        sha256 = "1bnxhf9ppqwgcnpcanxj6ji8yi1i0pspzhjh3p3zyf57d7y6p8sh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cond containers data-lens-light deepseq directory dlist
          filepath mtl unix
        ];
@@ -49900,7 +51127,7 @@ self: {
        pname = "filtrable";
        version = "0.1.0.2";
        sha256 = "0dfw08pqw4wlja1iavb8zz0rkr97hd7fg1v2akng8n7shmjhgbl5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
        license = "unknown";
@@ -49912,7 +51139,7 @@ self: {
        pname = "final";
        version = "0.1";
        sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://github.com/errge/final";
        description = "utility to add extra safety to monadic returns";
        license = stdenv.lib.licenses.bsd3;
@@ -49931,13 +51158,18 @@ self: {
        sha256 = "15p1aj8lckmvnrq8a8wz6sbs0d2qbcjgachf5sgpf2lv57hzxksz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base conduit conduit-combinators conduit-extra either
+         exceptions filepath mmorph monad-control mtl regex-posix semigroups
+         streaming-commons text time transformers transformers-base
+         unix-compat
+       ];
+       executableHaskellDepends = [
          attoparsec base conduit conduit-combinators conduit-extra either
          exceptions filepath mmorph monad-control mtl regex-posix semigroups
          streaming-commons text time transformers transformers-base unix
-         unix-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base conduit conduit-combinators directory doctest
          either exceptions filepath hspec mmorph monad-control mtl
          regex-posix semigroups streaming-commons text time transformers
@@ -49956,8 +51188,8 @@ self: {
        pname = "fingertree";
        version = "0.1.1.0";
        sha256 = "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -49971,7 +51203,7 @@ self: {
        pname = "fingertree-psqueue";
        version = "0.3";
        sha256 = "14kc0ijx44q7whniickjj3h9ag1pixn51dlxjs6n2ypaclcjz34z";
-       buildDepends = [ base fingertree ];
+       libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49982,7 +51214,7 @@ self: {
        pname = "fingertree-tf";
        version = "0.1.0.0";
        sha256 = "1ja8cqxpqhvssbcywph3zna946g1li5hlzsqab9lhg6vw0baakdn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49997,10 +51229,10 @@ self: {
        pname = "finite-field";
        version = "0.8.0";
        sha256 = "0wlbq7dpb4545xdnqjqppp0cmjx9m8g1p6lydkvn7pj7dwar8lni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq hashable template-haskell type-level-numbers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit primes QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          type-level-numbers
@@ -50015,11 +51247,10 @@ self: {
        pname = "first-class-patterns";
        version = "0.3.2.2";
        sha256 = "0da7mayn8lcizwjv06rafkgrsj257fhkj5xsxk7nx00n3aazzr68";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/reinerp/first-class-patterns";
        description = "First class patterns and pattern matching, using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "firstify" = callPackage
@@ -50032,7 +51263,7 @@ self: {
        sha256 = "1g851dgsxq9gfbsx4qas9vm844ay3g5vhfd1493fgpay0j7i5fnd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath homeomorphic mtl Safe yhccore
        ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/firstify/";
@@ -50051,7 +51282,7 @@ self: {
        sha256 = "0bmp24mgg9y7ysnb1rig26cwgz1l40ca1fckzxh0yly0j9if062k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers factory mtl QuickCheck toolshed unix
        ];
        homepage = "http://functionalley.eu";
@@ -50067,10 +51298,10 @@ self: {
        pname = "fit";
        version = "0.5.1";
        sha256 = "0y7jvczi0ldzjw9y102z1k4nyj7z8f6p8w368x5v0m308d0jw6db";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers contravariant mtl text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers hspec hspec-attoparsec mtl
          QuickCheck text
        ];
@@ -50085,8 +51316,8 @@ self: {
        pname = "fitsio";
        version = "0.2";
        sha256 = "07zsd05ncq8rnrswk4kzg97sam8czibw2nhlrqxg8q1a5canisag";
-       buildDepends = [ base filepath mtl ];
-       extraLibraries = [ cfitsio ];
+       libraryHaskellDepends = [ base filepath mtl ];
+       librarySystemDepends = [ cfitsio ];
        homepage = "http://github.com/esessoms/fitsio";
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
@@ -50103,7 +51334,7 @@ self: {
        sha256 = "0j8yqqf61f2m4zri844gp6k80vkfzk1rby2miv90niz3hbciknj6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers cpphs directory filepath haskell-src-exts process
          split text uniplate
        ];
@@ -50117,7 +51348,7 @@ self: {
        pname = "fix-parser-simple";
        version = "15320.3";
        sha256 = "0ls5fxwq2lnb0rjqih4isfwiv0603ga12gxnf7w3rpqp5qhrhas8";
-       buildDepends = [ base mmtl ];
+       libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50129,7 +51360,7 @@ self: {
        pname = "fix-symbols-gitit";
        version = "0.1.0";
        sha256 = "01fxzhd2wqzp0paba64q5psfc4qvc4b8i88rdkn6mxlkm21gkp6y";
-       buildDepends = [ base containers gitit ];
+       libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50141,7 +51372,7 @@ self: {
        pname = "fixed";
        version = "0.2.1.1";
        sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/fixed";
        description = "Signed 15.16 precision fixed point arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -50153,7 +51384,7 @@ self: {
        pname = "fixed-length";
        version = "0.1";
        sha256 = "115j7bc6s45qn87hamy4w1ih247cxhyhrzaz244sw4qfkxypigkj";
-       buildDepends = [ base non-empty utility-ht ];
+       libraryHaskellDepends = [ base non-empty utility-ht ];
        homepage = "http://code.haskell.org/~thielema/fixed-length/";
        description = "Lists with statically known length based on non-empty package";
        license = stdenv.lib.licenses.bsd3;
@@ -50165,7 +51396,7 @@ self: {
        pname = "fixed-list";
        version = "0.1.6";
        sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jvranish/FixedList/tree/master";
        description = "A fixed length list type";
        license = stdenv.lib.licenses.bsd3;
@@ -50177,7 +51408,7 @@ self: {
        pname = "fixed-point";
        version = "0.5.0.1";
        sha256 = "010gx32av4cn5bqq1zrrcah50ay528vw01fvv1xhfpkrx1ll9wka";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Binary fixed-point arithmetic";
        license = stdenv.lib.licenses.mit;
@@ -50190,7 +51421,7 @@ self: {
        pname = "fixed-point-vector";
        version = "0.5.0.1";
        sha256 = "029mn44d1i794b1pbpa0zmf6b20zl0cvsf77mbfdkqnyx8986883";
-       buildDepends = [ base fixed-point vector ];
+       libraryHaskellDepends = [ base fixed-point vector ];
        jailbreak = true;
        description = "Unbox instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
@@ -50203,7 +51434,7 @@ self: {
        pname = "fixed-point-vector-space";
        version = "0.5.0.1";
        sha256 = "10b29gqy3rpwd5wf2b65p0llm8ksyp1p7k43rm1n5g5z67wkd7dx";
-       buildDepends = [ base fixed-point vector-space ];
+       libraryHaskellDepends = [ base fixed-point vector-space ];
        jailbreak = true;
        description = "vector-space instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
@@ -50218,7 +51449,7 @@ self: {
        pname = "fixed-precision";
        version = "0.4.0";
        sha256 = "1akgiark8svzkqx764iic10qpfixm0js8vwga0134d81ppcp58f6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hmpfr integer-gmp reflection tagged template-haskell
        ];
        jailbreak = true;
@@ -50234,7 +51465,7 @@ self: {
        pname = "fixed-storable-array";
        version = "0.3.1.1";
        sha256 = "0vb5h2v2qx19d7xibf7ksv2cha2pngh49mfpkh43f9vrwc6042ph";
-       buildDepends = [ array base tagged ];
+       libraryHaskellDepends = [ array base tagged ];
        jailbreak = true;
        description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
        license = stdenv.lib.licenses.bsd3;
@@ -50247,8 +51478,8 @@ self: {
        pname = "fixed-vector";
        version = "0.8.0.0";
        sha256 = "1hlg0rbi2phk7qr7nvjnazg344jqp5p13c3m8v5n01vw9bvjbnir";
-       buildDepends = [ base deepseq primitive ];
-       testDepends = [ base doctest filemanip primitive ];
+       libraryHaskellDepends = [ base deepseq primitive ];
+       testHaskellDepends = [ base doctest filemanip primitive ];
        jailbreak = true;
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
@@ -50262,8 +51493,10 @@ self: {
        pname = "fixed-vector-binary";
        version = "0.6.0.0";
        sha256 = "1yjyw9wc92laiwd9w8ng3456azicvf9a9wqk2v6liiksj3flw7hy";
-       buildDepends = [ base binary fixed-vector ];
-       testDepends = [ base binary fixed-vector tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base binary fixed-vector ];
+       testHaskellDepends = [
+         base binary fixed-vector tasty tasty-quickcheck
+       ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50276,8 +51509,10 @@ self: {
        pname = "fixed-vector-cereal";
        version = "0.6.0.0";
        sha256 = "1kf3d0pfaif5fish1vc5z7d5ym23bwl80l8bg4bgpdw75cg2dnn6";
-       buildDepends = [ base cereal fixed-vector ];
-       testDepends = [ base cereal fixed-vector tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base cereal fixed-vector ];
+       testHaskellDepends = [
+         base cereal fixed-vector tasty tasty-quickcheck
+       ];
        description = "Cereal instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50290,7 +51525,7 @@ self: {
        pname = "fixed-vector-hetero";
        version = "0.3.1.0";
        sha256 = "0x5fjggm0licrdd442pr1968zlzfb0ah4ib8s9yxcb2p6vc39lzv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq fixed-vector ghc-prim primitive transformers
        ];
        homepage = "http://github.org/Shimuuar/fixed-vector-hetero";
@@ -50304,7 +51539,7 @@ self: {
        pname = "fixedprec";
        version = "0.2.2.1";
        sha256 = "0s921nhkmdglmcwzyr048r04dswc6hz7kvh9p4lvd8i2mxq0szgi";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        description = "A fixed-precision real number type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50317,7 +51552,10 @@ self: {
        sha256 = "0k4lidf95nb4a735331xdr77643b1yb15xllplxknbxxq9r2z3px";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson attoparsec base bytestring text ];
+       libraryHaskellDepends = [ aeson attoparsec base bytestring text ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring text
+       ];
        homepage = "https://github.com/michaelochurch/fixedwidth-hs";
        description = "Quick parsing of fixed-width data formats";
        license = stdenv.lib.licenses.mit;
@@ -50334,11 +51572,15 @@ self: {
        sha256 = "0kxfx3k2d8xy75s7cln3l1hiia5vjcr6k5almbpys63dkr3svcz2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring containers deepseq
          dlist enumerator HaXml MissingH network old-time parallel
          QuickCheck text
        ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist HaXml MissingH
+         old-time QuickCheck text
+       ];
        homepage = "http://github.com/urv/fixhs";
        description = "FIX (co)parser";
        license = stdenv.lib.licenses.lgpl21;
@@ -50350,7 +51592,7 @@ self: {
        pname = "fixplate";
        version = "0.1.5";
        sha256 = "0mmkkydvdiw4nawgw3w7a9gpcxc3wzzlhz2083hqa6sxhx8x3b29";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
        license = stdenv.lib.licenses.bsd3;
@@ -50363,7 +51605,7 @@ self: {
        pname = "fixpoint";
        version = "0.1.1";
        sha256 = "05h1cw1gpnwk1qjlia4l27j375cva8pp75fzn99w2rxsv6khszpb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cse.unsw.edu.au/~rl/code/fixpoint.html";
        description = "Data types as fixpoints";
        license = stdenv.lib.licenses.bsd3;
@@ -50375,7 +51617,7 @@ self: {
        pname = "fixtime";
        version = "1.5.0.2";
        sha256 = "1walxcyi1wrv28vgy318c88z3mprz6mc8qfhbjgxb156iwfv80w5";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "https://github.com/pharpend/fixtime";
        description = "Some fixes to the time package";
        license = stdenv.lib.licenses.bsd2;
@@ -50387,7 +51629,7 @@ self: {
        pname = "fizz-buzz";
        version = "0.1.0.1";
        sha256 = "169xaj7iczz0mnvd03pf95dcvy918jscpzap6z9y62kb0daskg4p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Functional Fizz/Buzz";
        license = stdenv.lib.licenses.bsd3;
@@ -50403,7 +51645,7 @@ self: {
        sha256 = "0vx4fn1d8i2qh0q20vijhp7yc0zcvjdwk1v7f7ra0kbm4ygmi38h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary deepseq HTTP optparse-applicative process
        ];
        homepage = "http://noaxiom.org/flAccurateRip";
@@ -50417,7 +51659,7 @@ self: {
        pname = "flamethrower";
        version = "0.0.5.1";
        sha256 = "10kfy1cnp721hgz6lbc28y7hkjhbv6gpk2jff6nk2avrfbaqqd8x";
-       buildDepends = [ base template-haskell text ];
+       libraryHaskellDepends = [ base template-haskell text ];
        jailbreak = true;
        homepage = "https://charmander.me/flamethrower/";
        description = "A template engine for HTML";
@@ -50432,7 +51674,10 @@ self: {
        sha256 = "1yfqgbjam33vrkic5xnb8pp76215jnacr6sj1xw1xqcbcs02bn3v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base either optparse-applicative pipes ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base either optparse-applicative pipes
+       ];
        description = "FlameGraphs of profiling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50445,7 +51690,7 @@ self: {
        pname = "flat-mcmc";
        version = "0.1.0.0";
        sha256 = "1fp5jga82kbkj77xhy4m4vsn7zqf6fr9fwram3a2ybqssicgs3z5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-par monad-par-extras mtl mwc-random primitive vector
        ];
        jailbreak = true;
@@ -50462,7 +51707,7 @@ self: {
        pname = "flexible-defaults";
        version = "0.0.1.1";
        sha256 = "0cbp8hb7y29xz3hl780173cs6ca4df0r98fz7v3drqr46aq55ipl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers template-haskell th-extras transformers
        ];
        homepage = "https://github.com/mokus0/flexible-defaults";
@@ -50476,7 +51721,7 @@ self: {
        pname = "flexible-time";
        version = "0.1.0.3";
        sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l";
-       buildDepends = [ base bytestring unix-time ];
+       libraryHaskellDepends = [ base bytestring unix-time ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/flexible-time";
        description = "simple extension of Data.UnixTime.";
@@ -50491,7 +51736,8 @@ self: {
        sha256 = "0jwsa2qfzw4rdj55axy7cw1p82314i28c16f7p7pjp53cwnsp02a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base text ];
+       executableHaskellDepends = [ base bytestring text ];
        description = "A configurable reimplementation of unlit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50502,7 +51748,7 @@ self: {
        pname = "flexiwrap";
        version = "0.1.0";
        sha256 = "0vvl9w3i374k720sscbcsbha89fcfk1hcvdr0nk4y7gkp13xwdba";
-       buildDepends = [ base data-type mtl QuickCheck ];
+       libraryHaskellDepends = [ base data-type mtl QuickCheck ];
        jailbreak = true;
        description = "Flexible wrappers";
        license = stdenv.lib.licenses.bsd3;
@@ -50515,7 +51761,9 @@ self: {
        pname = "flexiwrap-smallcheck";
        version = "0.0.1";
        sha256 = "1dara0az10fxx46jmplf2l6a6x8qqjk00fxjzb9n10ndd4lxcsm3";
-       buildDepends = [ base data-type flexiwrap mtl smallcheck ];
+       libraryHaskellDepends = [
+         base data-type flexiwrap mtl smallcheck
+       ];
        jailbreak = true;
        description = "SmallCheck (Serial) instances for flexiwrap";
        license = stdenv.lib.licenses.bsd3;
@@ -50532,9 +51780,10 @@ self: {
        sha256 = "12fi34zl2ggbxf5gmfldplzi1pk9byf8rpn58ljw2fvz3qb8x6yl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base filepath HTTP mime network random utf8-string xhtml xml
+       libraryHaskellDepends = [
+         base filepath HTTP mime network random utf8-string xml
        ];
+       executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50545,10 +51794,10 @@ self: {
      mkDerivation {
        pname = "flippers";
        version = "1.0.1";
-       revision = "1";
        sha256 = "1swyj1f67giq7h9xcl6dzsw4ywk1jbl6avpihbv0q9g9hp6yzqp3";
+       revision = "1";
        editedCabalFile = "e908ada5c891a6ac39cefb7e41648606d1a5f1b1048281f93bd496c5f22d73b4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Variations on flip for multiple arguments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50561,7 +51810,10 @@ self: {
        sha256 = "0ck44icwg6gzi9x5h5iszk59qnr0fhsj95ghk0lxm8aygavwq44d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers haskell98 parsec ];
+       libraryHaskellDepends = [ array base containers haskell98 parsec ];
+       executableHaskellDepends = [
+         array base containers haskell98 parsec
+       ];
        jailbreak = true;
        homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "f-lite compiler, interpreter and libraries";
@@ -50578,7 +51830,12 @@ self: {
        sha256 = "1hxzdgnsfxallmw7z07hs4ax8pfn57hk55kyjxg8vnrj7i07bp9l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl parsec regex-compat text ];
+       libraryHaskellDepends = [
+         base bytestring mtl parsec regex-compat text
+       ];
+       executableHaskellDepends = [
+         base bytestring mtl parsec regex-compat text
+       ];
        description = "Generate flow charts from your code base";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50592,8 +51849,8 @@ self: {
        pname = "float-binstring";
        version = "0.2";
        sha256 = "0dcxk1s13ppslqxd378yh92pzmxnmnhk1q07wl5ifcnfy5zamzdq";
-       buildDepends = [ attoparsec base split text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base split text ];
+       testHaskellDepends = [
          attoparsec base hspec HUnit QuickCheck split text
        ];
        homepage = "https://github.com/llelf/float-binstring";
@@ -50607,8 +51864,8 @@ self: {
        pname = "floating-bits";
        version = "0.3.0.0";
        sha256 = "1cp2k9rks0g8i6lf6j3zrz7wxh42qmsqwvf26dkdqnnzi0aqkkxj";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50620,7 +51877,7 @@ self: {
        pname = "floatshow";
        version = "0.2.4";
        sha256 = "1zsxjwgm8nkphnmsbz03yvplc2r02qybb387n910j4j6vya98khc";
-       buildDepends = [ array base integer-gmp ];
+       libraryHaskellDepends = [ array base integer-gmp ];
        homepage = "https://bitbucket.org/dafis/floatshow";
        description = "Alternative faster String representations for Double and Float, String representations for more general numeric types";
        license = stdenv.lib.licenses.bsd3;
@@ -50634,7 +51891,7 @@ self: {
        pname = "flock";
        version = "0.3.1.8";
        sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control transformers unix
        ];
        homepage = "http://github.com/hesselink/flock";
@@ -50648,8 +51905,8 @@ self: {
        pname = "flow";
        version = "1.0.1";
        sha256 = "11i0p2f8zxpcpssga279hx8vy6a14xykmb8qxyfrrpvd6qg42i8y";
-       buildDepends = [ base ];
-       testDepends = [ base doctest QuickCheck template-haskell ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        homepage = "http://taylor.fausak.me/flow/";
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
@@ -50665,7 +51922,7 @@ self: {
        sha256 = "1pf60wpwsvxxgqkz3zh2qlcyz9pyd8axi41y5y6pn77n9x8p2613";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl parsec QuickCheck utf8-string
        ];
        homepage = "http://adept.linux.kiev.ua:8080/repos/flow2dot";
@@ -50684,7 +51941,7 @@ self: {
        pname = "flowdock";
        version = "0.3.0.1";
        sha256 = "1az9wwdng7i3jrjwizzz3690506b3vk1m8h2b96wf59r51qnpr6i";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring http-client http-client-tls
          lens lens-action mtl network pipes pipes-aeson pipes-http
          pipes-parse template-haskell text unordered-containers uuid
@@ -50692,7 +51949,6 @@ self: {
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock-api" = callPackage
@@ -50709,13 +51965,19 @@ self: {
        sha256 = "0p0b0pabyykvli9l0jrcbfgpyq7dna3zilb4z0s1hb6mamfdn7ng";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring data-default
+         HsOpenSSL http-streams http-types io-streams monad-logger
+         MonadCatchIO-transformers text time transformers
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring data-default
          directory filepath HsOpenSSL http-streams http-types io-streams
-         monad-logger MonadCatchIO-transformers optparse-applicative split
-         text time transformers unordered-containers vector
+         MonadCatchIO-transformers optparse-applicative split text time
+         transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring data-default
          heredoc HsOpenSSL hspec http-streams http-types io-streams
          monad-logger MonadCatchIO-transformers template-haskell text time
@@ -50737,7 +51999,7 @@ self: {
        sha256 = "0r9l3b91kyhf4ab8m2qv5jsfqf3k7x639bq1wjbf852imzl6138b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bio bytestring cmdargs containers mtl random
        ];
        jailbreak = true;
@@ -50753,8 +52015,8 @@ self: {
        pname = "flowlocks-framework";
        version = "0.1.3.1";
        sha256 = "1v9z302fg2fx6k9k7ci5128gxrrcgdqp40r7axk0yhrzc06b9wa8";
-       buildDepends = [ base containers syb ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base containers syb ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50770,7 +52032,7 @@ self: {
        sha256 = "0l3222a2r2khhrfhzvd0iikqq1rlcwhvf785bwnwqygq35i1w6j3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base biocore biofasta biosff bytestring cmdargs containers
          directory MonadRandom mtl random
        ];
@@ -50788,8 +52050,9 @@ self: {
        sha256 = "11p957d12ivrf9r76zf2khjd736fdnhaj7qp0x6fbwmda2ifrij3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring directory process ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base bytestring ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base bytestring directory process ];
        homepage = "http://github.com/deech/fltkhs";
        description = "FLTK bindings";
        license = stdenv.lib.licenses.mit;
@@ -50805,11 +52068,11 @@ self: {
        pname = "fluent-logger";
        version = "0.2.3.1";
        sha256 = "0m97hljfrs5mh5pjbwvnw7b581y7w96qfyjr3d9p1aqbj6nsa6dp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers messagepack network
          network-socket-options random stm text time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring cereal cereal-conduit conduit
          conduit-extra containers exceptions hspec messagepack network text
          time transformers
@@ -50826,7 +52089,7 @@ self: {
        pname = "fluent-logger-conduit";
        version = "0.3.0.0";
        sha256 = "0z21dg1y0rqfgvpvgci5kp3jh0kdx5v5paxdidwp8dd6v7y3ag9q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit fluent-logger resourcet transformers
        ];
        description = "Conduit interface for fluent-logger";
@@ -50841,8 +52104,8 @@ self: {
        pname = "fluidsynth";
        version = "0.2.0.0";
        sha256 = "18r7q7sh35sr71ays0c9ic6f7vmrblpw25mz1y5v9sbk5x2lh64s";
-       buildDepends = [ base bindings-DSL containers directory ];
-       extraLibraries = [ fluidsynth ];
+       libraryHaskellDepends = [ base bindings-DSL containers directory ];
+       librarySystemDepends = [ fluidsynth ];
        jailbreak = true;
        homepage = "https://github.com/MostAwesomeDude/hsfluidsynth";
        description = "Haskell bindings to FluidSynth";
@@ -50858,7 +52121,9 @@ self: {
        sha256 = "1bjkkd90mw1nbm5pyjh52dwhqa6xx3i3hhl2ys3qpk08mrw5r09l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath mtl process Unixutils ];
+       executableHaskellDepends = [
+         base directory filepath mtl process Unixutils
+       ];
        jailbreak = true;
        homepage = "http://github.com/jabolopes/fmark";
        description = "A Friendly Markup language without syntax";
@@ -50871,7 +52136,7 @@ self: {
        pname = "fmlist";
        version = "0.9";
        sha256 = "1gzwmsrbxk22v7syf8zfvxphm23dmjzfpysz6qww3qvib8wm64aq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/sjoerdvisscher/fmlist";
        description = "FoldMap lists";
        license = stdenv.lib.licenses.bsd3;
@@ -50883,7 +52148,7 @@ self: {
        pname = "focus";
        version = "0.1.4";
        sha256 = "0h6q48ybcch1p15f4x56ya4d8mn4dwzbfjx573dy6z3x12v7qi2n";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/focus";
        description = "A general abstraction for manipulating elements of container data structures";
        license = stdenv.lib.licenses.mit;
@@ -50895,8 +52160,8 @@ self: {
        pname = "fold-debounce";
        version = "0.2.0.0";
        sha256 = "1nq0729wy3v29liwhy5rp706cpspv9jygh0pvxf398ng2plgfjmb";
-       buildDepends = [ base data-default stm stm-delay time ];
-       testDepends = [ base hspec stm time ];
+       libraryHaskellDepends = [ base data-default stm stm-delay time ];
+       testHaskellDepends = [ base hspec stm time ];
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
@@ -50910,11 +52175,13 @@ self: {
        pname = "fold-debounce-conduit";
        version = "0.1.0.0";
        sha256 = "0d5yw44zbkissnw7f0zssrr3f3m8ymkskizvjp6rhsiyx3iafj5k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit fold-debounce resourcet stm transformers
          transformers-base
        ];
-       testDepends = [ base conduit hspec resourcet stm transformers ];
+       testHaskellDepends = [
+         base conduit hspec resourcet stm transformers
+       ];
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
@@ -50928,7 +52195,7 @@ self: {
        pname = "foldl";
        version = "1.1.1";
        sha256 = "01zqlb3hh5jsq49ax08nkwvysqq4fgkxpz4sdcman9y9fnxgwjgg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mwc-random primitive profunctors text
          transformers vector
        ];
@@ -50945,10 +52212,10 @@ self: {
        pname = "foldl-incremental";
        version = "0.2.0.0";
        sha256 = "09xf9cba3j49z4bwfmad6q9gdnp3f1zn817q4px7hky2gln3bhzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq foldl histogram-fill vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers foldl histogram-fill mwc-random pipes
          QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck vector
        ];
@@ -50968,14 +52235,14 @@ self: {
        pname = "folds";
        version = "0.6.3";
        sha256 = "1p8vr71vqzn0h4j5rz3wh7fsvsaaig52ds7sx8r2c8klbdf91zd4";
-       buildDepends = [
+       configureFlags = [ "-f-test-hlint" ];
+       libraryHaskellDepends = [
          base comonad contravariant lens pointed profunctors reflection
          semigroupoids tagged transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring deepseq directory doctest filepath mtl semigroups
        ];
-       configureFlags = [ "-f-test-hlint" ];
        homepage = "http://github.com/ekmett/folds";
        description = "Beautiful Folding";
        license = stdenv.lib.licenses.bsd3;
@@ -50989,8 +52256,8 @@ self: {
        pname = "folds-common";
        version = "0.2.0.0";
        sha256 = "1dcyh798ijq4ms8xr0jwfp4fy5i5l4czl7m3yvk2z6rkha9w1zmc";
-       buildDepends = [ base containers folds ];
-       testDepends = [ base containers tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base containers folds ];
+       testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51006,7 +52273,7 @@ self: {
        sha256 = "0iy8q06fpc03n4z6dcrl95vji67dia6bp30q42rrlqw6s9cwigsm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base cmdargs directory filepath hs-twitter
          old-locale strict time
        ];
@@ -51022,8 +52289,8 @@ self: {
        pname = "foma";
        version = "0.1.1.0";
        sha256 = "1aiy4bizzx5g87lvlx8xy24rxvzh093mlaavxkcr542fq9ki8yb3";
-       buildDepends = [ base ];
-       extraLibraries = [ foma ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ foma ];
        homepage = "http://github.com/joom/foma.hs";
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
@@ -51038,7 +52305,8 @@ self: {
        sha256 = "0myjb8g3mis887l0jmr88nb757x0zcvhnanx02hxjbfb5iqx3cx9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base GLFW-b OpenGL ];
+       libraryHaskellDepends = [ base OpenGL ];
+       executableHaskellDepends = [ base GLFW-b OpenGL ];
        jailbreak = true;
        description = "Basic4x6 font for OpenGL";
        license = stdenv.lib.licenses.publicDomain;
@@ -51053,7 +52321,9 @@ self: {
        sha256 = "1f1abijdfvnmkgbvw9q94k4p39pbqslmg9am1j1sjyxrag5y0vv8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers GLUT haskell98 OpenGL ];
+       executableHaskellDepends = [
+         base containers GLUT haskell98 OpenGL
+       ];
        homepage = "http://sourceforge.net/projects/fooengine/?abmode=1";
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
@@ -51068,7 +52338,7 @@ self: {
        pname = "for-free";
        version = "0.1";
        sha256 = "048m95sg8jq7kpr55iq5h93c7zbaqp5v340phb13v9yw2hv50sql";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad comonad-transformers containers contravariant
          transformers
        ];
@@ -51086,11 +52356,11 @@ self: {
        pname = "forbidden-fruit";
        version = "0.1.0";
        sha256 = "0sxaa2lpz6j0ljz8kjxifvp4lk5x12w0ka9wjws4w7r8q9bld8dd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base control-monad-loop hashable hashtables primitive transformers
          transformers-base vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base control-monad-loop hashable hashtables hspec primitive
          transformers vector
        ];
@@ -51107,7 +52377,9 @@ self: {
        pname = "force-layout";
        version = "0.4.0.2";
        sha256 = "0lncciqizp55if5ivlcbv5lqj21hlp2vfi40iagjswf2apxi0w0g";
-       buildDepends = [ base containers data-default-class lens linear ];
+       libraryHaskellDepends = [
+         base containers data-default-class lens linear
+       ];
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51120,7 +52392,7 @@ self: {
        sha256 = "0vlh5rfn3n8vi3gbfmpbw20jgv5skvcw187walgv6dns39pagsar";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process transformers ];
+       executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51132,7 +52404,7 @@ self: {
        pname = "forecast-io";
        version = "0.2.0.0";
        sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby";
-       buildDepends = [ aeson base text ];
+       libraryHaskellDepends = [ aeson base text ];
        homepage = "https://github.com/stormont/forecast-io";
        description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
@@ -51144,7 +52416,7 @@ self: {
        pname = "foreign-storable-asymmetric";
        version = "0.0.1";
        sha256 = "1pj30p7z5nq8j95z9c4kjv6spandfch3r0dvx3n8wsbh3270dvxj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Types and instances for implementing a Storable with different peek and poke";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51155,7 +52427,7 @@ self: {
        pname = "foreign-store";
        version = "0.2";
        sha256 = "1p436dn6l5zjzizcsj0hn10s2n907gr7c8y89i4sm3h69lhqlw86";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chrisdone/foreign-store";
        description = "Store a stable pointer in a foreign context to be retrieved later";
        license = stdenv.lib.licenses.bsd3;
@@ -51166,10 +52438,10 @@ self: {
      mkDerivation {
        pname = "foreign-var";
        version = "0.1";
-       revision = "1";
        sha256 = "1rxfmzq9npj1170i85qhq5fhvvzb9j1wdi5lzmj57k4hlyxcwqjd";
+       revision = "1";
        editedCabalFile = "f9c906434533279cfa8e2897c6eed6ed9c279f373efc5180bda76b704601fa1c";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://github.com/ekmett/foreign-var/";
        description = "Encapsulating mutatable state in external libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -51183,7 +52455,8 @@ self: {
        sha256 = "1bykssfas1fz46qmiwhxs09xnnwp104hlmq08z9g1xh7qv8bh7iy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/sfischer13/haskell-forger";
        description = "Library for generating fake placeholder data";
@@ -51196,7 +52469,7 @@ self: {
        pname = "forkable-monad";
        version = "0.1.1";
        sha256 = "0nxcjx3cf8bkl0cwkpgz5c6byld13kw2601q4157fmfa370bi11h";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://code.google.com/p/forkable-monad/";
        description = "An implementation of forkIO for monad stacks";
@@ -51215,7 +52488,7 @@ self: {
        sha256 = "0z8a5a9w7mg69c1x6h8825bhkll63gz6j85lbc0w59w1ag2x8865";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring containers directory file-embed HTTP
          indents interpolatedstring-perl6 jmacro MissingH mtl network pandoc
          parsec process text transformers urlencoded wl-pprint-text
@@ -51232,8 +52505,8 @@ self: {
        pname = "format";
        version = "0.1.0.0";
        sha256 = "1vv9b0hif5hi3jkd1n6j85b5mkfkjyixldblm2l4qfgrj95igmph";
-       buildDepends = [ haskell2010 parsec ];
-       testDepends = [ haskell2010 parsec QuickCheck ];
+       libraryHaskellDepends = [ haskell2010 parsec ];
+       testHaskellDepends = [ haskell2010 parsec QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/bytbox/hs-format";
        description = "Rendering from and scanning to format strings";
@@ -51251,7 +52524,7 @@ self: {
        sha256 = "0dfmjp307c8685cdw41nmjmisf3aplyf177r973wyqcrifabvs2q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base data-concurrent-queue old-locale stm text time
        ];
        jailbreak = true;
@@ -51268,7 +52541,7 @@ self: {
        pname = "formatting";
        version = "6.2.2";
        sha256 = "04ilp8zkzkab3x4v5kczpa58k5jr67yg9fq4prj7xrj81kixgp2g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clock old-locale scientific text text-format time
        ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
@@ -51288,7 +52561,7 @@ self: {
        sha256 = "1bqfw3h06mbznivg37840qnzjygflzp90wkyssnb1kjxi4bj1vbv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cereal containers directory
          file-embed ghc-prim GraphSCC hslogger HTTP indents
          interpolatedstring-perl6 jmacro MissingH mtl network pandoc parsec
@@ -51309,7 +52582,7 @@ self: {
        pname = "formlets";
        version = "0.8";
        sha256 = "0jx56vhrzcwca33rgp738plmssw95nv20rrzw5xrxcmdv26zp1w9";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base blaze-html bytestring haskell98 syb
          transformers xhtml
        ];
@@ -51328,10 +52601,10 @@ self: {
        pname = "formlets-hsp";
        version = "2.3.1";
        sha256 = "19m0nryrksh1cgsz7sx3gamjczw36hqfsbml05p6j7li3bk0fpw2";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base formlets haskell98 hsp hsx mtl
        ];
-       buildTools = [ trhsx ];
+       libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51343,7 +52616,7 @@ self: {
        pname = "forth-hll";
        version = "0.1.0.0";
        sha256 = "1hmcicxnxcl99chidkbg1kspjzpxxcw8qh4lrwvmlpz2knzf11g3";
-       buildDepends = [ array-forth base free mtl ];
+       libraryHaskellDepends = [ array-forth base free mtl ];
        jailbreak = true;
        description = "A simple eDSL for generating arrayForth code";
        license = stdenv.lib.licenses.gpl3;
@@ -51356,7 +52629,7 @@ self: {
        pname = "fountain";
        version = "0.1";
        sha256 = "0mxzrvrag2qwn22llklmdkcf4icd8n9ifg1awd9q7ffll8a1a67p";
-       buildDepends = [ base containers random ];
+       libraryHaskellDepends = [ base containers random ];
        homepage = "http://tomahawkins.org";
        description = "A fountain codec";
        license = stdenv.lib.licenses.bsd3;
@@ -51380,15 +52653,19 @@ self: {
        sha256 = "1r80a6vimpy4nviskl62c4ivp2l8wrg3vhzgdg53nnfa5j6lmha2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
          cereal containers data-default deepseq deepseq-generics directory
-         failure fay filepath ghc-prim hashable http-conduit http-types ini
+         failure fay filepath ghc-prim hashable http-conduit http-types
          lifted-async lifted-base monad-control monad-extras monad-logger
-         mtl network optparse-applicative persistent persistent-template
-         pretty-show process random resourcet safe semigroups shakespeare
-         shakespeare-i18n stm syb template-haskell text time transformers
-         transformers-base unordered-containers vector yesod-core
+         mtl network persistent persistent-template pretty-show random
+         resourcet safe semigroups shakespeare shakespeare-i18n stm syb
+         template-haskell text time transformers transformers-base
+         unordered-containers vector yesod-core
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring data-default directory filepath ini network
+         optparse-applicative process safe text unordered-containers
        ];
        homepage = "https://www.fpcomplete.com/page/api";
        description = "Simple interface to the FP Complete IDE API";
@@ -51402,7 +52679,7 @@ self: {
        pname = "fpipe";
        version = "0.0.1";
        sha256 = "1b6r19yy9wh5w8xb0ajjxsd2qyzjnkgyav1975qv92wwxslyxwr8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "F#-style composition and application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51413,7 +52690,7 @@ self: {
        pname = "fpnla";
        version = "0.1.1";
        sha256 = "15qpfi3b9vnpm17q3y64nsrhlj5vi9rgrgysjfk98aw1gkj9mvv4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for NLA operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51428,11 +52705,11 @@ self: {
        pname = "fpnla-examples";
        version = "0.1.1";
        sha256 = "1p305r0jgcqrbny22ic1ziyav9yjy6v02wgna0sgh4p0c1wi7pb2";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate array base deepseq fpnla hmatrix linear-algebra-cblas
          monad-par parallel repa vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          accelerate array base data-default deepseq fpnla hmatrix HUnit
          linear-algebra-cblas monad-par parallel QuickCheck random repa
          tagged test-framework test-framework-hunit
@@ -51454,11 +52731,11 @@ self: {
        sha256 = "1wqca640h9qcrnwkqdw1pyl73c4nraglgwqgimkrgbkjlwpyn824";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HUnit parsec parsec3-numbers QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest Glob hlint HUnit parsec parsec3-numbers process
          QuickCheck regex-compat test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -51479,7 +52756,7 @@ self: {
        sha256 = "1v1qrbr5kz17haawrh0ksmjw7j4ks0x4kqzss5z1fbldl6axw97i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory extensible-exceptions hashtables parsec process
          regex-compat unix
        ];
@@ -51495,7 +52772,7 @@ self: {
        sha256 = "0iw5454mi0ms3w62m118rlqr6lr1j9mbxwfj26mlc5p38bq9k7ds";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Draw Newton, Julia and Mandelbrot fractals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51506,7 +52783,7 @@ self: {
        pname = "fraction";
        version = "0.1.0.4";
        sha256 = "0blvvsc1rbn45nwgmkhd28bdz0awi5mk6h48yqbqy3ajm2gvpvdf";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/fraction";
        description = "Fractions";
        license = stdenv.lib.licenses.bsd3;
@@ -51520,7 +52797,7 @@ self: {
        sha256 = "1xgnp4cls8i61hyl4kcf3afri77jlcahwjvww498xl5d5frdiv90";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base GLUT OpenGL random ];
+       executableHaskellDepends = [ array base GLUT OpenGL random ];
        homepage = "http://haskell.org/haskellwiki/Frag";
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
@@ -51539,12 +52816,13 @@ self: {
        sha256 = "0ldncqifcnk4d50qivgw62hcdy4nc23zr64q787azid0vb9vsdja";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory ghc-binary happstack-fastcgi
          happstack-server haskell98 haskelldb haskelldb-hdbc
          haskelldb-hdbc-odbc HDBC HDBC-odbc HTTP MissingH mtl old-time
-         pretty utf8-string
+         utf8-string
        ];
+       executableHaskellDepends = [ pretty ];
        jailbreak = true;
        description = "A simple web framework";
        license = stdenv.lib.licenses.bsd3;
@@ -51557,7 +52835,7 @@ self: {
        pname = "frame-markdown";
        version = "0.1";
        sha256 = "0wy1c9xgd6ykymqciga1sla83wfdwy17p88bygfp6pflbc0rw57g";
-       buildDepends = [ base frame pandoc ];
+       libraryHaskellDepends = [ base frame pandoc ];
        jailbreak = true;
        description = "A markdown to Frame GUI writer for Pandoc";
        license = stdenv.lib.licenses.bsd3;
@@ -51569,7 +52847,7 @@ self: {
        pname = "franchise";
        version = "0.0.6";
        sha256 = "144fywp5fcix5i06wvwvzwsr19bgxpajx7bi7jw43hnm3rlcj4vr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51584,7 +52862,7 @@ self: {
        pname = "free";
        version = "4.12.1";
        sha256 = "0sr8phvrb4ny8j1wzq55rdn8q4br23q4pw2j276npr844825jr9p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors comonad distributive exceptions mtl prelude-extras
          profunctors semigroupoids semigroups template-haskell transformers
        ];
@@ -51601,7 +52879,7 @@ self: {
        pname = "free-functors";
        version = "0.6.4.1";
        sha256 = "1mc5y29j4khl222dwb9xcnfmn2jh3v47rkvkzwvlgrbg5bh81kzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          algebraic-classes base comonad constraints template-haskell
          transformers void
        ];
@@ -51621,7 +52899,7 @@ self: {
        pname = "free-game";
        version = "1.1.81";
        sha256 = "1z8l9k70rbcc9jbrnh7xhrnny6wd5l0jfb1a6ki7dnq6m5klivyp";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base boundingboxes colors containers control-bool directory
          filepath free freetype2 GLFW-b hashable JuicyPixels
          JuicyPixels-util lens linear mtl OpenGL OpenGLRaw random reflection
@@ -51642,7 +52920,7 @@ self: {
        pname = "free-http";
        version = "0.1.1.3";
        sha256 = "1gmafmi0mrmbm7a08cxiz96s43k4sc38wvzrnmcrqcl44a1n38fm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring free http-client http-types mtl QuickCheck text
          time transformers
        ];
@@ -51659,7 +52937,7 @@ self: {
        pname = "free-operational";
        version = "0.5.0.0";
        sha256 = "0gim4m0l76sxxg6a8av1gl6qjpwxwdzyviij86d06v1150r08dmb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad-transformers free kan-extensions mtl transformers
        ];
        jailbreak = true;
@@ -51676,7 +52954,7 @@ self: {
        pname = "free-theorems";
        version = "0.3.2.0";
        sha256 = "1r0qz8h8fjb9akkhd3impr30gd0s5ky51dj667x0pf155b4lvx2w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src haskell-src-exts mtl pretty syb
        ];
        description = "Automatic generation of free theorems";
@@ -51694,10 +52972,10 @@ self: {
        sha256 = "1wq5lvnylw92qzv1q93liz4i3q2j8sbgwgaw8nw79q0x0cdvbbb3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base cgi containers free-theorems haskell-src haskell-src-exts
-         HUnit mtl pretty syb utf8-string xhtml
+       libraryHaskellDepends = [
+         base containers haskell-src haskell-src-exts HUnit mtl pretty syb
        ];
+       executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51712,7 +52990,7 @@ self: {
        pname = "free-theorems-seq";
        version = "1.0";
        sha256 = "1scqjv6hc2y0w1x9f8v8bwrl1dnz64hf5jgrdam12dxbsk6qjs6g";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers free-theorems haskell-src mtl
          old-locale old-time parsec pretty syb utf8-string xhtml
        ];
@@ -51732,7 +53010,7 @@ self: {
        sha256 = "1bx7fg1ddycl9pgrlh2qij5vb6fqx79gl6lbm248c95xyygi3iy5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cgi containers free-theorems-seq mtl network pretty syb
          utf8-string xhtml
        ];
@@ -51751,7 +53029,7 @@ self: {
        sha256 = "1qxdfbzr52dw0qww03l86vpgmylznifqzvjarmgpkfr129szl7ba";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cgi csv dataenc directory filepath free-theorems
          process time xhtml
        ];
@@ -51771,7 +53049,7 @@ self: {
        sha256 = "1ybmffs05hgzn81szcd8nrz4f94qc64d9y2d2hkyq57djb87503j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers directory EdisonCore
          filepath FTGL haskell98 mtl OpenGL pngload random SDL
          template-haskell
@@ -51788,8 +53066,8 @@ self: {
        pname = "freenect";
        version = "1.2";
        sha256 = "11ggp90npdyfdmf8zhjk442zl0j0lni6hizhgc0409za9i6s1l5g";
-       buildDepends = [ base vector ];
-       extraLibraries = [ freenect freenect_sync ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ freenect freenect_sync ];
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
@@ -51806,7 +53084,7 @@ self: {
        sha256 = "150ch1xmx3slmq7hb74z8sjrqhrsc9kl1zjn030fj6k6kphrwd88";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base cpphs directory mtl parallel pretty random syb
        ];
        jailbreak = true;
@@ -51826,7 +53104,7 @@ self: {
        sha256 = "0a34qc62sjc355qfr3qz92nh27gmcyqk2jlhq77pjfdzv0ivigcy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring curl data-accessor data-accessor-template directory
          mtl xml
        ];
@@ -51843,7 +53121,9 @@ self: {
        pname = "freetype-simple";
        version = "0.1.0.1";
        sha256 = "1qhiy896a10af9fnzcp4y0ra1c9l6fbcclrr3k74pn2qvvfybnss";
-       buildDepends = [ base boundingboxes bytestring freetype2 linear ];
+       libraryHaskellDepends = [
+         base boundingboxes bytestring freetype2 linear
+       ];
        jailbreak = true;
        homepage = "https://github.com/capsjac/freetype-simple";
        description = "Single line text rendering for OpenGL ES";
@@ -51858,7 +53138,7 @@ self: {
        sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell binding for FreeType 2 library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51869,7 +53149,7 @@ self: {
        pname = "fresh";
        version = "0.1.1";
        sha256 = "1441yv55bwmiwnr6jsccq91anq8vhc2a4ka0irn3i2i9cjzw0gkw";
-       buildDepends = [ base containers haskell-src-exts syb ];
+       libraryHaskellDepends = [ base containers haskell-src-exts syb ];
        homepage = "https://github.com/davidlazar/fresh";
        description = "Introduce fresh variables into Haskell source code";
        license = stdenv.lib.licenses.mit;
@@ -51884,10 +53164,10 @@ self: {
        pname = "friday";
        version = "0.2.2.0";
        sha256 = "0cw8mghygbd76l2nf0s1n0n1a7ymh2hv4dfm11hkv0gcdrqrp9fr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base convertible deepseq primitive ratio-int transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        homepage = "https://github.com/RaphaelJ/friday";
@@ -51903,10 +53183,10 @@ self: {
        pname = "friday-devil";
        version = "0.1.1.1";
        sha256 = "19g1h7palsaycv81fks9zbq979jdn7fqapxd6igxhkgzw73n69aj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring convertible deepseq friday transformers vector
        ];
-       extraLibraries = [ libdevil ];
+       librarySystemDepends = [ libdevil ];
        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;
@@ -51918,8 +53198,8 @@ self: {
        pname = "friendly-time";
        version = "0.4";
        sha256 = "1x73jk9smga912nfyxa77j6yz74kyx8zdr4q6xj3sirp46qm5nh5";
-       buildDepends = [ base old-locale time ];
-       testDepends = [ base hspec old-locale time ];
+       libraryHaskellDepends = [ base old-locale time ];
+       testHaskellDepends = [ base hspec old-locale time ];
        description = "Print time information in friendly ways";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51930,7 +53210,7 @@ self: {
        pname = "frisby";
        version = "0.2";
        sha256 = "0isj9p7j33va1a4q78vnq32j9jdbjww596rxja235z4whicraf53";
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
        homepage = "http://repetae.net/computer/frisby/";
        description = "Linear time composable parser for PEG grammars";
        license = stdenv.lib.licenses.bsd3;
@@ -51942,7 +53222,7 @@ self: {
        pname = "frp-arduino";
        version = "0.1.0.3";
        sha256 = "00659x5f5dq4lb25ss880cqggqc63i7wqik04qvzk1kq3dl9six5";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/frp-arduino/frp-arduino";
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
@@ -51955,7 +53235,7 @@ self: {
        pname = "frpnow";
        version = "0.13";
        sha256 = "13dvyf1zwzvcpal7zp1jx5ns49a01jsjn3pz0iqdrph7qgll2aqr";
-       buildDepends = [ base containers mtl transformers ];
+       libraryHaskellDepends = [ base containers mtl transformers ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
        license = stdenv.lib.licenses.bsd3;
@@ -51968,7 +53248,9 @@ self: {
        pname = "frpnow-gloss";
        version = "0.12";
        sha256 = "1xywqcif16r3x4qckz3n6k5mp2pya4vj35h0jrh4rd1sspnhi99i";
-       buildDepends = [ base containers frpnow gloss mtl transformers ];
+       libraryHaskellDepends = [
+         base containers frpnow gloss mtl transformers
+       ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
@@ -51982,7 +53264,7 @@ self: {
        pname = "frpnow-gtk";
        version = "0.11";
        sha256 = "0yq9pgjlmzg5pzcky7z7n2ks82x92dp5pjacr6h3w8mdrhhhk80c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers frpnow glib gtk mtl transformers
        ];
        homepage = "https://github.com/atzeus/FRPNow";
@@ -51998,7 +53280,8 @@ self: {
        sha256 = "0s5cb0m6xgf9zfch75nzk9b8lvghl4nc5dk35xkakq6ys3zizw6c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Lexical extension for Quasi-Quotations using French-Quotes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52009,7 +53292,7 @@ self: {
        pname = "fs-events";
        version = "0.1";
        sha256 = "0jw6cx9fzzs8r20acjq8nq8zjhwiwnvg1b0kc97c2sij1bhw6pw4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/nkpart/fs-events";
        description = "A haskell binding to the FSEvents API";
        license = stdenv.lib.licenses.bsd3;
@@ -52022,7 +53305,7 @@ self: {
        pname = "fsharp";
        version = "0.0.4";
        sha256 = "1scmvhbsn988x6j4a94ibg1c7adrxf8lzn06n9n1iv62bjd450m3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "some F# operators, high priority pipes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52035,7 +53318,7 @@ self: {
        pname = "fsmActions";
        version = "0.4.4";
        sha256 = "05713wj1s1307brqkbnapqi42dva55kcjgb8n3x6yirpfp6lhdsc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fgl filepath graphviz MissingH mtl parsec pretty
        ];
        homepage = "http://projects.haskell.org/fsmActions/";
@@ -52053,11 +53336,11 @@ self: {
        pname = "fsnotify";
        version = "0.2.1";
        sha256 = "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers directory filepath hinotify text time
          unix-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base directory filepath tasty tasty-hunit temporary-rc
          unix-compat
        ];
@@ -52076,8 +53359,11 @@ self: {
        sha256 = "190a89445fv006m5nv8g58h569rpw9s8jadqdy6m3ik43mnggzpy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base haskeline mtl transformers ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ array base mtl ];
+       executableHaskellDepends = [
+         array base haskeline mtl transformers
+       ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.cse.chalmers.se/alumni/markus/fstStudio/";
        description = "Finite state transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -52089,7 +53375,7 @@ self: {
        pname = "fsutils";
        version = "0.1.2";
        sha256 = "07lx4928d1fnjbpfmky4jhhk7sqj98b11vdbv4f67p3bwfn5lrp8";
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
        jailbreak = true;
        homepage = "https://github.com/Raynes/fsutils";
        description = "File system utilities for Haskell that are missing from built in libraries";
@@ -52106,12 +53392,13 @@ self: {
        sha256 = "1b6pm3jfyi5lbrpjv8n6z970xs11h61hj1g5ph54fhsqd2wvmpc2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory fsnotify process system-filepath unix
        ];
        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
@@ -52124,7 +53411,7 @@ self: {
        sha256 = "1gnfbngn3jwva6nvrcrzmi2n2vy4k55yh41zvg0kyb61w7kgm4m8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bytestring safe transformers usb
        ];
        jailbreak = true;
@@ -52141,7 +53428,7 @@ self: {
        pname = "ftp-conduit";
        version = "0.0.5";
        sha256 = "0gb65g46nr9haysy3dbrylka08fsz81yn7aiwwingc6wlp7d76dg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteorder bytestring conduit MissingH network transformers
          utf8-string
        ];
@@ -52162,7 +53449,7 @@ self: {
        sha256 = "1whvawaifhi5xgmiagdayjf7m6p6vs71mvc4a4csd4vzzjr0a2yf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hslogger MissingH mtl network parsec regex-compat
        ];
        homepage = "http://software.complete.org/ftphs";
@@ -52176,7 +53463,7 @@ self: {
        pname = "ftree";
        version = "0.1.3";
        sha256 = "1ma87jnwsgzlr7z6ac303i0qy9i2lywvjgb2zjv9qgnbkf18pg3m";
-       buildDepends = [ base ShowF type-unary ];
+       libraryHaskellDepends = [ base ShowF type-unary ];
        homepage = "https://github.com/conal/ftree/";
        description = "Depth-typed functor-based trees, both top-down and bottom-up";
        license = stdenv.lib.licenses.bsd3;
@@ -52192,7 +53479,7 @@ self: {
        sha256 = "1jrpb6dzq47xy6xvsisc7g1y53dc97s4l826f9sscxpdsrx3yp8r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers free-theorems mtl pretty Shellac Shellac-readline
        ];
        jailbreak = true;
@@ -52207,7 +53494,7 @@ self: {
        pname = "fugue";
        version = "0.1";
        sha256 = "0g0qy0lcixbjm5srmfl1dnci4m09zwqcs5dpknpnsdc4b4l3925r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A recapitulated prelude with minimal dependencies and profligate exports";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52218,7 +53505,7 @@ self: {
        pname = "full-sessions";
        version = "0.6.2.1";
        sha256 = "0irm1zrggjl9zrapzxfl3kj32d81k30c8nbmr3bf9ramjg65xm90";
-       buildDepends = [ base ghc network ];
+       libraryHaskellDepends = [ base ghc network ];
        homepage = "http://www.agusa.i.is.nagoya-u.ac.jp/person/sydney/full-sessions.html";
        description = "a monad for protocol-typed network programming";
        license = stdenv.lib.licenses.bsd3;
@@ -52235,11 +53522,11 @@ self: {
        sha256 = "0s537hzb21w506bp4i6v7k5sbk905s9950gihh99r0b7id185ppk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers text vector ];
-       testDepends = [
+       libraryHaskellDepends = [ array base containers text vector ];
+       executableToolDepends = [ alex happy ];
+       testHaskellDepends = [
          array base containers QuickCheck tasty tasty-quickcheck text vector
        ];
-       buildTools = [ alex happy ];
        jailbreak = true;
        description = "In-memory full text search engine";
        license = stdenv.lib.licenses.bsd3;
@@ -52255,8 +53542,9 @@ self: {
        sha256 = "10452kdl98igk2y48bb2ligj8nk7gpjcsf0nsiifvpjbfxv4gakc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base split ];
-       testDepends = [
+       libraryHaskellDepends = [ base split ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "http://hub.darcs.net/kowey/fullstop";
@@ -52271,7 +53559,7 @@ self: {
        pname = "funcmp";
        version = "1.8";
        sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k";
-       buildDepends = [ base filepath process ];
+       libraryHaskellDepends = [ base filepath process ];
        homepage = "http://savannah.nongnu.org/projects/funcmp/";
        description = "Functional MetaPost";
        license = stdenv.lib.licenses.gpl3;
@@ -52283,7 +53571,7 @@ self: {
        pname = "function-combine";
        version = "0.1.0";
        sha256 = "1m8bmqxb9kar3y8zv22qs2a6kzd636m5li1r2q4y6pps0nglv9i9";
-       buildDepends = [ base data-type ];
+       libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52295,7 +53583,7 @@ self: {
        pname = "function-instances-algebra";
        version = "0.1";
        sha256 = "0dxym6xrylngw8r5spi246nmi8fvvxxx776qismcr04zqshv7ygw";
-       buildDepends = [ base numeric-prelude ];
+       libraryHaskellDepends = [ base numeric-prelude ];
        jailbreak = true;
        homepage = "github.com/kreuzschlitzschraubenzieher/function-instances-algebra";
        description = "Instances of the Algebra.* classes for functions";
@@ -52308,7 +53596,7 @@ self: {
        pname = "functional-arrow";
        version = "0.0";
        sha256 = "1la9xqm5gs6a6cb18wyx9wr0nx6p5ryhczvb72d0zm6xrjrf0r5s";
-       buildDepends = [ base HList ];
+       libraryHaskellDepends = [ base HList ];
        jailbreak = true;
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
        license = stdenv.lib.licenses.bsd3;
@@ -52335,7 +53623,7 @@ self: {
        pname = "functor-combo";
        version = "0.3.6";
        sha256 = "1jlva6imjjpj9iww7dxiplw60vszjiw6456yq30zsqrb63sz2lk1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans containers data-inttrie lub type-unary
          TypeCompose
        ];
@@ -52349,11 +53637,10 @@ self: {
        pname = "functor-infix";
        version = "0.0.3";
        sha256 = "1hpk1q58kwxdpva57hylpqj4ywk6grsi4ks2cqg6lspprqfi60gy";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/fmap/functor-infix";
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functor-monadic" = callPackage
@@ -52362,7 +53649,7 @@ self: {
        pname = "functor-monadic";
        version = "0.1.0.3";
        sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ombocomp/FunctorMonadic/";
        description = "Monad-style combinators for functors";
        license = stdenv.lib.licenses.asl20;
@@ -52374,7 +53661,7 @@ self: {
        pname = "functorm";
        version = "1.0.1";
        sha256 = "1aa4f6yp4vrrrs3rswhjxw2gij3mwn8yf299kgv42wd03xazyxrs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52386,7 +53673,7 @@ self: {
        pname = "functors";
        version = "0.1";
        sha256 = "0nfnjxihn0nhj0rhi1wvqax1f95wskr3fwb7c2clz4lvsma6bfg6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/aristidb/functors";
        description = "(.:) and friends, syntax for Functor and Applicative.";
        license = stdenv.lib.licenses.bsd3;
@@ -52402,7 +53689,7 @@ self: {
        sha256 = "0pgl4fg29xg7g2pdyjqmi7qlpzcs25ggwg6d9y4fzbc7fzh31wxv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath haskell98 HFuse unix
        ];
        jailbreak = true;
@@ -52418,7 +53705,7 @@ self: {
        pname = "funpat";
        version = "0.1";
        sha256 = "0zblrfg8mfbc1hzxb36hk2lb3c167xmpcvg8h595m9kjpdmj4ayw";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "A generalization of pattern matching";
        license = stdenv.lib.licenses.bsd3;
@@ -52434,7 +53721,10 @@ self: {
        sha256 = "1hyyx3ivrhw5svklyl36qzbcd0wwx4978znvn42lsl53273ds5n3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bimap bitset containers fgl mtl parse-dimacs pretty
+       ];
+       executableHaskellDepends = [
          array base bimap bitset containers fgl mtl parse-dimacs pretty
          QuickCheck random time
        ];
@@ -52453,7 +53743,7 @@ self: {
        sha256 = "1vfi30mlr0lds975wgq3197sv1qdwy6lvm6xaqwk28h5flmk28k1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring network unix ];
+       executableHaskellDepends = [ base bytestring network unix ];
        jailbreak = true;
        description = "Simple IP-over-UDP tunnel using TUNTAP";
        license = stdenv.lib.licenses.gpl3;
@@ -52465,7 +53755,7 @@ self: {
        pname = "future";
        version = "2.0.0";
        sha256 = "1gvv1m6sfxdc28h4rzp5dh6hrz6nfh031nhs192606v8wg78m3ri";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/future";
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
        license = stdenv.lib.licenses.bsd3;
@@ -52478,7 +53768,7 @@ self: {
        pname = "future-resource";
        version = "0.4.0.0";
        sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "realtime resource handling with manual concurrency";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -52491,10 +53781,12 @@ self: {
        pname = "fuzzcheck";
        version = "0.1.1";
        sha256 = "0qfr4f0b50l368b45yzwhqd4g2y1kvfrfj4hr84cdxcwdrwn9mpc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control QuickCheck random transformers
        ];
-       testDepends = [ base hspec hspec-expectations HUnit QuickCheck ];
+       testHaskellDepends = [
+         base hspec hspec-expectations HUnit QuickCheck
+       ];
        homepage = "https://github.com/fpco/fuzzcheck";
        description = "A simple checker for stress testing monadic code";
        license = stdenv.lib.licenses.bsd3;
@@ -52506,8 +53798,8 @@ self: {
        pname = "fuzzy";
        version = "0.1.0.0";
        sha256 = "1jz9arrg33x64ygipk0115b7jfchxh20cy14177iwg0na8mpl2l2";
-       buildDepends = [ base monoid-subclasses ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "http://github.com/joom/fuzzy";
        description = "Filters a list based on a fuzzy string search";
        license = stdenv.lib.licenses.mit;
@@ -52522,8 +53814,10 @@ self: {
        pname = "fuzzy-timings";
        version = "0.0.1";
        sha256 = "1sm4g04y9n8r61q2sqa91n87hh32kpcn2r5zjlvdy7qxc11lrmj7";
-       buildDepends = [ base containers glpk-hs mtl random time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers glpk-hs mtl random time
+       ];
+       testHaskellDepends = [
          base containers HUnit mtl QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
@@ -52531,7 +53825,6 @@ self: {
        homepage = "https://github.com/tlaitinen/fuzzy-timings";
        description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzytime" = callPackage
@@ -52542,7 +53835,10 @@ self: {
        sha256 = "16ybyzki390g2172d3f48vyr1gr27grkvs1jjb6cblws34n5g2pr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs directory old-time process ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base cmdargs directory old-time process
+       ];
        description = "A 'ten past six' style clock";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52556,7 +53852,7 @@ self: {
        pname = "fwgl";
        version = "0.1.2.2";
        sha256 = "1s4j1wgnncn6cmsarsc989zxz1qsqhsa722h7bv2k43093ww0nnh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable transformers unordered-containers vector Yampa
        ];
        jailbreak = true;
@@ -52573,7 +53869,7 @@ self: {
        pname = "fwgl-glfw";
        version = "0.1.0.5";
        sha256 = "1y30mqayih5cd74dm90y7mbb9a0fw9sirzjlrmayvcm7aniyvmql";
-       buildDepends = [
+       libraryHaskellDepends = [
          base fwgl gl GLFW-b hashable JuicyPixels transformers
          unordered-containers vector Yampa
        ];
@@ -52591,7 +53887,7 @@ self: {
        pname = "fwgl-javascript";
        version = "0.1.0.6";
        sha256 = "0fxnnjp7403c29pjks739j0j92a1sldrrxg3sp4nrjb1ax01nia9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base fwgl ghcjs-base hashable unordered-containers Yampa
        ];
        jailbreak = true;
@@ -52609,7 +53905,7 @@ self: {
        sha256 = "1blr3xbqn8fa59av4kgfp2y3szky40v5qmw3k9gsr2barrvkjqz0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HTTP json ];
+       executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52625,7 +53921,7 @@ self: {
        sha256 = "0p1rb24yldkjnkrygjb43g63vfgzq2bix7rrmiqyrdwb37s65ixq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base biopsl bytestring cmdargs hashable unordered-containers
        ];
        description = "General Alignment Clustering Tool";
@@ -52641,7 +53937,7 @@ self: {
        sha256 = "1d2hy2bb3dgzf3bj0p97hchsznzckirgws8cjm9qh5ba5mk0wl2z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base hscurses random text ];
+       executableHaskellDepends = [ array base hscurses random text ];
        jailbreak = true;
        homepage = "http://github.com/marcusbuffett/game-of-life";
        description = "Conway's Game of Life";
@@ -52655,7 +53951,7 @@ self: {
        pname = "game-probability";
        version = "1.1";
        sha256 = "1wl29h702g79kwy4ca35x1q37aaj3rphf1i9vdm2hmd44bzrwvkk";
-       buildDepends = [ base containers probability random ];
+       libraryHaskellDepends = [ base containers probability random ];
        jailbreak = true;
        description = "Simple probability library for dice rolls, card games and similar";
        license = stdenv.lib.licenses.bsd3;
@@ -52667,7 +53963,7 @@ self: {
        pname = "game-tree";
        version = "0.1.0.0";
        sha256 = "1g8gkp4g18dr6m0scilhgdwg0zh0f9a2q3b1sk0gh4m3jw6gj4m5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Searching game trees with alpha-beta pruning";
        license = "GPL";
      }) {};
@@ -52680,7 +53976,7 @@ self: {
        sha256 = "192rn2d8bil8wqilnaqxba8nzq0fjlbf0innv6rdcjs1kxw1ga0l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo containers glib gtk time ];
+       executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52694,7 +53990,7 @@ self: {
        pname = "gamma";
        version = "0.9.0.2";
        sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base continued-fractions converge template-haskell vector
        ];
        homepage = "https://github.com/mokus0/gamma";
@@ -52708,7 +54004,7 @@ self: {
        pname = "gang-of-threads";
        version = "3.2.1";
        sha256 = "0gj7ln0xq1a7zzxhyl636z854xfq714kmh2ld30ll0dskr701l1p";
-       buildDepends = [ base containers mtl stm transformers ];
+       libraryHaskellDepends = [ base containers mtl stm transformers ];
        description = "Non-deterministic parallelism with bags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52721,7 +54017,8 @@ self: {
        sha256 = "1cylwaj62gmcjczw5g44k9x6g5bamgk88h2arbbripzphhaf7cm7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskeline transformers ];
+       libraryHaskellDepends = [ base haskeline transformers ];
+       executableHaskellDepends = [ base haskeline transformers ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/mekeor/Garepinoh/text/README.md";
        description = "reverse prefix notation calculator and calculation library";
@@ -52734,7 +54031,7 @@ self: {
        pname = "garsia-wachs";
        version = "1.2";
        sha256 = "0mks5nwc19i0wsc5hhxh0ji2bh0224y3r89b3p9dfzzn64n3za6v";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A Functional Implementation of the Garsia-Wachs Algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52747,7 +54044,7 @@ self: {
        pname = "gbu";
        version = "0.1";
        sha256 = "0zqgq5hr3vmajijf1vmc1s1lwilnymwvv493rra4fl0zy28k5cz6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fgl Graphalyze haskell98 mtl regex-posix
        ];
        homepage = "http://www.daneel0yaitskov.000space.com";
@@ -52763,7 +54060,7 @@ self: {
        pname = "gc-monitoring-wai";
        version = "0.1.2";
        sha256 = "04i86mngz0s6x5j36vs2nrxivqayqjfa2ppk016r4ffs4mi7i4va";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder conduit http-types text transformers
          unordered-containers wai
        ];
@@ -52779,9 +54076,9 @@ self: {
        pname = "gconf";
        version = "0.13.0.2";
        sha256 = "0xyxia19bfpi4pd118d33z8gi5cnyygs3idrby7zrmj69rnwj2lk";
-       buildDepends = [ base glib text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ GConf ];
+       libraryHaskellDepends = [ base glib text ];
+       libraryPkgconfigDepends = [ GConf ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
@@ -52795,8 +54092,8 @@ self: {
        pname = "gd";
        version = "3000.7.3";
        sha256 = "1dkzv6zs00qi0jmblkw05ywizc8y3baz7pnz0lcqn1cs1mhcpbhl";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [
          expat fontconfig freetype gd libjpeg libpng zlib
        ];
        description = "A Haskell binding to a subset of the GD graphics library";
@@ -52812,7 +54109,7 @@ self: {
        pname = "gdiff";
        version = "1.1";
        sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/eelco/gdiff";
        description = "Generic diff and patch";
        license = stdenv.lib.licenses.bsd3;
@@ -52826,7 +54123,7 @@ self: {
        pname = "gdiff-ig";
        version = "0.1.1";
        sha256 = "1ma9w9ypk078vvqwlfgkwcw962xha1g1fx4abji1b7km09p58jm2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base ghc-prim instant-generics template-haskell
        ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
@@ -52843,10 +54140,10 @@ self: {
        pname = "gdiff-th";
        version = "0.1.0.7";
        sha256 = "1ihbz95k01giqbpbp1hddx71pkhz63pz5q4b71gv6z2vvvh34s2w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers gdiff mtl template-haskell th-expand-syns uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers gdiff mtl template-haskell th-expand-syns uniplate
        ];
        jailbreak = true;
@@ -52864,7 +54161,7 @@ self: {
        sha256 = "1j68vrb0fxschslh3q5i1afv0vx8q6qgv1bipfr3p77cqazp26zx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT OpenGLRaw Vec ];
+       executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
        jailbreak = true;
        homepage = "http://code.mathr.co.uk/gearbox";
        description = "zooming rotating fractal gears graphics demo";
@@ -52881,7 +54178,7 @@ self: {
        pname = "geek";
        version = "1.1.1.0";
        sha256 = "0n52s5azqqx06flfhsgbp5a63mpd4vd60y4rzrpa4jx13bydlp50";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty air air-extra air-th base bytestring containers
          curl data-default directory filepath fsnotify Glob hack2
          hack2-contrib miku moe mtl process random safe system-filepath text
@@ -52903,7 +54200,11 @@ self: {
        sha256 = "1951jw8la59c7qvjpx8x898l7hnwc51c4264mmw0h402ik233bp2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         air base bytestring data-default geek hack2
+         hack2-handler-snap-server pandoc text
+       ];
+       executableHaskellDepends = [
          air base bytestring data-default geek hack2
          hack2-handler-snap-server pandoc text
        ];
@@ -52922,7 +54223,7 @@ self: {
        pname = "gemstone";
        version = "0.3.0.1";
        sha256 = "0y9ilxpkyb42iddks31k1f6vjkm78z6yaj2yd9ppis42r2advg40";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bitmap bitmap-opengl containers FTGL lens linear OpenGL
          random SDL SDL-image stb-image transformers
        ];
@@ -52941,7 +54242,7 @@ self: {
        pname = "gencheck";
        version = "0.1.1";
        sha256 = "1fa1p13zmqqhlcakcy73ypasn4ircg1x5p3q1p5mklvfjifphfir";
-       buildDepends = [
+       libraryHaskellDepends = [
          base combinat containers ieee754 memoize random template-haskell
          transformers
        ];
@@ -52959,7 +54260,8 @@ self: {
        sha256 = "0sfl3729v03s5ykd8ijv4yrf8lzja5hyaphsfgk96gcx3zvd1a0q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base text ];
+       libraryHaskellDepends = [ attoparsec base text ];
+       executableHaskellDepends = [ attoparsec base text ];
        jailbreak = true;
        homepage = "https://github.com/womfoo/gender";
        description = "Identify a persons gender by their first name";
@@ -52975,9 +54277,9 @@ self: {
        pname = "genders";
        version = "0.1.0.1";
        sha256 = "0jl1sqj9syp31qcn3x6c0pjwj5ligirsc67ahzw2chgpf09bwh8g";
-       buildDepends = [ base bytestring filepath vector ];
-       testDepends = [ base bytestring hspec network vector ];
-       extraLibraries = [ genders ];
+       libraryHaskellDepends = [ base bytestring filepath vector ];
+       librarySystemDepends = [ genders ];
+       testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52990,7 +54292,9 @@ self: {
        pname = "general-prelude";
        version = "0.1.2";
        sha256 = "0km8nrd7pili8s5fz68xpb6nw9mfk0phgwaxnflk6a78vz9ic76d";
-       buildDepends = [ base lens pointless-fun strict system-filepath ];
+       libraryHaskellDepends = [
+         base lens pointless-fun strict system-filepath
+       ];
        description = "Prelude replacement using generalized type classes where possible";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53002,7 +54306,7 @@ self: {
        pname = "generator";
        version = "0.5.5";
        sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd";
-       buildDepends = [ base List transformers ];
+       libraryHaskellDepends = [ base List transformers ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "Python-generators notation for creation of monadic lists";
        license = stdenv.lib.licenses.bsd3;
@@ -53014,7 +54318,7 @@ self: {
        pname = "generators";
        version = "1.0.3";
        sha256 = "0i51xx2hhjqjdvyzy2jza921jcfhy37azyp1cfaakvrj9kxl2w2q";
-       buildDepends = [ base mtl random ];
+       libraryHaskellDepends = [ base mtl random ];
        jailbreak = true;
        homepage = "http://liamoc.net/pdf/Generator.pdf";
        description = "Actually useful monadic random value generators";
@@ -53030,8 +54334,8 @@ self: {
        pname = "generic-accessors";
        version = "0.4.1";
        sha256 = "1qhik496296v42pjmlxxlimnw4z9p451ndc2fjvrid4g0knfzvg0";
-       buildDepends = [ base linear spatial-math ];
-       testDepends = [
+       libraryHaskellDepends = [ base linear spatial-math ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
        ];
        description = "stringly-named getters for generic data";
@@ -53045,10 +54349,10 @@ self: {
      mkDerivation {
        pname = "generic-aeson";
        version = "0.2.0.7";
-       revision = "1";
        sha256 = "06qczarf6vzd9wr9ad685v69hvd88zfv5lhry0zkka2bcdqc5wqz";
+       revision = "1";
        editedCabalFile = "f14b6017d6c92b2fc7a585bc81fd2ee286c8d73338cf1eb5964006bffeb70abd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
        ];
@@ -53062,7 +54366,7 @@ self: {
        pname = "generic-binary";
        version = "1.0.1";
        sha256 = "1h6xs56c351137mjc3hdba7yfcw8jy9dvzj0vdrgwm0dprn0xh29";
-       buildDepends = [ base binary bytestring ghc-prim ];
+       libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        jailbreak = true;
        description = "Generic Data.Binary derivation using GHC generics.";
        license = stdenv.lib.licenses.bsd3;
@@ -53075,8 +54379,10 @@ self: {
        pname = "generic-church";
        version = "0.3.0.0";
        sha256 = "1cw48dnw2nbnm3vr5xcsz7nma6g8dxvwvv7hwm63jikd9jgisnac";
-       buildDepends = [ base ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53087,10 +54393,10 @@ self: {
      mkDerivation {
        pname = "generic-deepseq";
        version = "2.0.1.1";
-       revision = "1";
        sha256 = "1yajkzp79ri5i7n5ynv0i6spxyg6kyi6qvqj46brlgjag98526iv";
+       revision = "1";
        editedCabalFile = "58ed9aeb48cc2a00e3122780fcbf2732c4d6fc46198434926a8b1bcc91d4a29b";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53101,7 +54407,7 @@ self: {
        pname = "generic-deriving";
        version = "1.8.0";
        sha256 = "1kc6lhdanls6kgpk8xv5xi14lz1sngcd8xn930hkf7ilq4kxkcr6";
-       buildDepends = [ base ghc-prim template-haskell ];
+       libraryHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53112,7 +54418,7 @@ self: {
        pname = "generic-lucid-scaffold";
        version = "0.0.1";
        sha256 = "13lry3hqqrqgk5z9dc6q6hr70iqky4ssra2l71y51gnrg1kprkrz";
-       buildDepends = [ base lucid text ];
+       libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53127,8 +54433,8 @@ self: {
        pname = "generic-maybe";
        version = "0.3.0.4";
        sha256 = "1gs89wzs3288l2p24pj5yi68xyy2kj3aczj31zk6v9xi3bwb73x1";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath
          generic-deriving hlint mtl nats parallel semigroups simple-reflect
          split text unordered-containers vector
@@ -53147,10 +54453,10 @@ self: {
        pname = "generic-pretty";
        version = "0.1.0";
        sha256 = "0mg7mdbxf3va0xl2j0kz5wzy3mg6nvxv68axfjvx1zij1yjlamn7";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bytestring containers text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers tasty tasty-hunit text vector
        ];
        homepage = "https://github.com/tanakh/generic-pretty";
@@ -53164,7 +54470,7 @@ self: {
        pname = "generic-server";
        version = "0.1";
        sha256 = "0bl3gfqdw6sdwcailzkzmpz433cpxf6np9w9qnkwwa05xhcpd2k6";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        description = "Simple generic TCP/IP server";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53175,8 +54481,8 @@ self: {
        pname = "generic-storable";
        version = "0.1.0.0";
        sha256 = "016gg232r453i7grbjg2hb69ww8jqgafnq32f38lv7l81dgzwfxj";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [ base ghc-prim hspec QuickCheck ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base ghc-prim hspec QuickCheck ];
        jailbreak = true;
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
@@ -53189,7 +54495,7 @@ self: {
        pname = "generic-tree";
        version = "15329.2";
        sha256 = "1frwwa45kahflnw2cgs8nb8jfxgrxw0n9i7h9cakpqzgbywy9b28";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
      }) {};
@@ -53200,7 +54506,7 @@ self: {
        pname = "generic-trie";
        version = "0.3.0.1";
        sha256 = "09f4rasw8q2yi7dakcr21igy02vhgiasylw6lzsz225kl58vjwz7";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        homepage = "http://github.com/glguy/tries";
        description = "A map, where the keys may be complex structured data";
        license = stdenv.lib.licenses.bsd3;
@@ -53213,7 +54519,9 @@ self: {
        pname = "generic-xml";
        version = "0.1";
        sha256 = "08fy9wc90wcnr74wbr7q3pfr0bigrzhchx158p1ji3gagb2n2njd";
-       buildDepends = [ base HaXml mtl syb-with-class template-haskell ];
+       libraryHaskellDepends = [
+         base HaXml mtl syb-with-class template-haskell
+       ];
        description = "Marshalling Haskell values to/from XML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53227,8 +54535,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.3";
        sha256 = "11vbfsws5agqiv9x6pfh0z6kbvjx6i27wnp5dcjh40z4bz6bjdgy";
-       buildDepends = [ base generic-deriving hxt text ];
-       testDepends = [
+       libraryHaskellDepends = [ base generic-deriving hxt text ];
+       testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
        ];
        homepage = "http://github.com/silkapp/generic-xmlpickler";
@@ -53242,7 +54550,7 @@ self: {
        pname = "generics-sop";
        version = "0.1.1.2";
        sha256 = "1r9icxwyh4pg952yaywk4nfj4j21klzf361z9z24avd6vw89p6v7";
-       buildDepends = [ base ghc-prim template-haskell ];
+       libraryHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Generic Programming using True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53253,7 +54561,7 @@ self: {
        pname = "genericserialize";
        version = "0.1";
        sha256 = "0zpb5rq2zvfsb0wlp9q4cckjkz6sdrngpir49d0sr06pivh8s6cl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53267,7 +54575,7 @@ self: {
        sha256 = "0rq1m7psvs2r35mnz7gwmsvzyd3jv44bqp0zhq8l7mq2pq2x7dhv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base random-fu ];
+       executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53284,10 +54592,11 @@ self: {
        sha256 = "1kng7bv8amch6bswhica6xhmavc0r5phg402lg76xwz7ywrsc6y3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cabal-macosx containers directory filepath GenI graphviz
          hslogger json mtl process text transformers wx wxcore yaml-light
        ];
+       executableHaskellDepends = [ base GenI ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/GenI";
        description = "GenI graphical user interface";
@@ -53306,9 +54615,12 @@ self: {
        sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-html blaze-markup bytestring cmdargs directory filepath
-         GenI geniserver HTTP http-streams io-streams json text
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring directory filepath GenI
+         geniserver HTTP http-streams io-streams json text
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs directory filepath GenI json text
        ];
        jailbreak = true;
        homepage = "http://kowey.github.io/GenI";
@@ -53327,7 +54639,7 @@ self: {
        sha256 = "0brnh6f8zdpn37fjdmnpbdvb75vmaf6iq7i9vpv4a8g7asc425wd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary containers GenI haskell98 HaXml HUnit mtl parsec
          QuickCheck utf8-string
        ];
@@ -53344,8 +54656,8 @@ self: {
        pname = "genifunctors";
        version = "0.3";
        sha256 = "16jsy5dyp1hqnk40nzjprkw3bfdbc92vkgzmwdds67ljh0jn6815";
-       buildDepends = [ base containers mtl template-haskell ];
-       testDepends = [ base containers mtl template-haskell ];
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
+       testHaskellDepends = [ base containers mtl template-haskell ];
        homepage = "https://github.com/danr/genifunctors";
        description = "Generate generalized fmap, foldMap and traverse";
        license = stdenv.lib.licenses.bsd3;
@@ -53357,7 +54669,7 @@ self: {
        pname = "geniplate";
        version = "0.6.0.5";
        sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        jailbreak = true;
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
@@ -53369,7 +54681,7 @@ self: {
        pname = "geniplate-mirror";
        version = "0.7.1";
        sha256 = "0wz7fp0cgf7xn37mmy91scacihnr0fcd6lpbi28yx4qss2hb1m30";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
@@ -53385,9 +54697,12 @@ self: {
        sha256 = "1597ah64rqag20qx8dvjmdhhhsjzsfdq2f43y3jyy2cnzssj953c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cmdargs GenI http-types json snap-core snap-server
-         text transformers utf8-string
+       libraryHaskellDepends = [
+         base bytestring cmdargs GenI http-types json snap-core text
+         transformers utf8-string
+       ];
+       executableHaskellDepends = [
+         base GenI snap-core snap-server text
        ];
        jailbreak = true;
        description = "Simple HTTP server for GenI results";
@@ -53401,7 +54716,7 @@ self: {
        pname = "genprog";
        version = "0.1.0.2";
        sha256 = "1a9b2h4swfwx5zwcyr2zdhxdxi9f68pwpglijxhxb5javjc4dppr";
-       buildDepends = [ base MonadRandom syb syz ];
+       libraryHaskellDepends = [ base MonadRandom syb syz ];
        jailbreak = true;
        homepage = "http://github.com/jsnajder/genprog";
        description = "Genetic programming library";
@@ -53414,8 +54729,8 @@ self: {
        pname = "gentlemark";
        version = "1.0.0";
        sha256 = "1cb9si5axwqi1d893vp6n2mr68isdxc9qp6dfygy0v6hci2spnmm";
-       buildDepends = [ base parsec transformers ];
-       testDepends = [ base HUnit parsec transformers ];
+       libraryHaskellDepends = [ base parsec transformers ];
+       testHaskellDepends = [ base HUnit parsec transformers ];
        jailbreak = true;
        homepage = "http://github.com/andriyp/gentlemark";
        description = "Gentle markup language";
@@ -53428,7 +54743,7 @@ self: {
        pname = "geocalc";
        version = "1.0.0";
        sha256 = "1bvbvrkxh8dvm796ilpp294qlacid6aap2ljdi9pmz1lkf20fxjg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Libary for calculating distances between two coordinates in WSG84";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53441,8 +54756,8 @@ self: {
        pname = "geodetic";
        version = "0.1.4";
        sha256 = "07l6yha31l0ahd6jhlj09vclms8km4q82xq2mfx2a3lbv2kffcfz";
-       buildDepends = [ base coordinate lens optional radian ];
-       testDepends = [
+       libraryHaskellDepends = [ base coordinate lens optional radian ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/geodetic";
@@ -53458,8 +54773,8 @@ self: {
        pname = "geodetics";
        version = "0.0.3";
        sha256 = "15ax0cj6q2zhlxl0fjxb434v1npq6w7n8bdqsw3vz3s9ngsvbldg";
-       buildDepends = [ array base dimensional ];
-       testDepends = [
+       libraryHaskellDepends = [ array base dimensional ];
+       testHaskellDepends = [
          array base dimensional HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -53476,7 +54791,7 @@ self: {
        pname = "geohash";
        version = "1.0.1";
        sha256 = "1pdx4pnq893kkjmgg0bgh9bfvfqdvzfq5fi02zfyhw3h8h4k05v4";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Geohash latitudes and longitudes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53489,7 +54804,7 @@ self: {
        pname = "geoip2";
        version = "0.1.0.1";
        sha256 = "0h6iivpxkc1k463cj5npzagzd01xddinpnbv8357d40617gihgrg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bytestring-mmap containers iproute
          reinterpret-cast text
        ];
@@ -53507,10 +54822,10 @@ self: {
        pname = "geojson";
        version = "1.3.0";
        sha256 = "18fr5n3nmxlr97b7s9a5x1dx91fcg2fjfhlpxpcglkpwpkhabnqs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base lens semigroups text transformers validation vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory doctest filepath hlint QuickCheck
          template-haskell
        ];
@@ -53518,7 +54833,6 @@ self: {
        homepage = "https://github.com/domdere/hs-geojson";
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geom2d" = callPackage
@@ -53527,11 +54841,10 @@ self: {
        pname = "geom2d";
        version = "0.1.3.1";
        sha256 = "1kz0cdxfc27412vzqv7vcywg9pba177ds6mpwknxlh049vcfrvh5";
-       buildDepends = [ base ieee754 QuickCheck ];
-       testDepends = [ base ieee754 QuickCheck ];
+       libraryHaskellDepends = [ base ieee754 QuickCheck ];
+       testHaskellDepends = [ base ieee754 QuickCheck ];
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "getemx" = callPackage
@@ -53544,7 +54857,7 @@ self: {
        sha256 = "1qgq465ck4z0mix3ari9n7a5qx5xc1zii4hmfsp093vx3qlc5nwm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base curl directory filepath haskell98 hxt mtl old-locale process
          time
        ];
@@ -53560,7 +54873,7 @@ self: {
        pname = "getflag";
        version = "1.0";
        sha256 = "0jsr8cmbnllcswdvf1rp11sc6cpjhwr22x7kx9sk3dw8bv772jjc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Command-line parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53575,10 +54888,10 @@ self: {
        pname = "getopt-generics";
        version = "0.10.0.1";
        sha256 = "0x8vh0sng1m05blxr24ijrz16bsyvryxkk70jqkdvq173x5fj8lf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat base-orphans generics-sop tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-compat base-orphans directory filepath generics-sop hspec
          process QuickCheck silently tagged temporary
        ];
@@ -53593,7 +54906,7 @@ self: {
        pname = "getopt-simple";
        version = "0.1.0.2";
        sha256 = "1pf40nc3jzprv4wn9h8mr0nhzxzilffgkapxg3k0qksfxydzv7pp";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://bitbucket.org/dpwiz/getopt-simple";
        description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy.";
        license = stdenv.lib.licenses.bsd3;
@@ -53612,14 +54925,17 @@ self: {
        sha256 = "13y01s94pq466jjzb3czxr93bdfh43mvypqp176n0zfp2v9496nb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cgi containers directory exceptions filepath
-         haskeline httpd-shed json lifted-base mtl network network-uri
-         old-locale parallel pretty process random terminfo time time-compat
-         unix utf8-string
+         haskeline httpd-shed json mtl network network-uri old-locale
+         parallel pretty process random terminfo time time-compat unix
+         utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base containers lifted-base mtl ];
+       testHaskellDepends = [
+         base Cabal directory filepath HTF HUnit process
        ];
-       testDepends = [ base Cabal directory filepath HTF HUnit process ];
-       buildTools = [ alex happy ];
        doCheck = false;
        postPatch = ''
          sed -i "s|\"-s\"|\"\"|" ./Setup.hs
@@ -53639,7 +54955,7 @@ self: {
        sha256 = "0k5in0r3lwjr5yn4ayw5ssdvinh7zwzsx6pfjdj246ngx1r7ydxj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parsec ];
+       executableHaskellDepends = [ base containers parsec ];
        homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/";
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
@@ -53656,7 +54972,7 @@ self: {
        sha256 = "11byidxq2mcqams9a7df0hwwlzir639mr1s556sw5rrbi7jz6d7c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base colorize-haskell directory filepath pcre-light process
        ];
        homepage = "https://github.com/shachaf/ghc-core";
@@ -53674,7 +54990,7 @@ self: {
        sha256 = "1yx22p9572zg2nvmlilbmraqjmws2x47hmin2l9xd0dnck5qhy35";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html bytestring containers mtl parsec process
        ];
        homepage = "https://github.com/vincenthz/ghc-core-html";
@@ -53688,7 +55004,7 @@ self: {
        pname = "ghc-datasize";
        version = "0.1.2";
        sha256 = "0bjdcfrk3q0rsy9wmw0b01q0vmbi9jsw1bxl4l78azs7xpk9yl03";
-       buildDepends = [ base ghc-heap-view ];
+       libraryHaskellDepends = [ base ghc-heap-view ];
        homepage = "http://felsin9.de/nnis/ghc-datasize";
        description = "Determine the size of data structures in GHC's memory";
        license = stdenv.lib.licenses.bsd3;
@@ -53700,7 +55016,7 @@ self: {
        pname = "ghc-dup";
        version = "0.1";
        sha256 = "0aw4wnbzfw031xqmq0lpi4zz2md1f43nj921ni91mhdl5xgqcajm";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        jailbreak = true;
        description = "Explicitly prevent sharing";
        license = stdenv.lib.licenses.bsd3;
@@ -53716,8 +55032,15 @@ self: {
        sha256 = "0vagr03rivl5ymcnkxnzb1x5b4cr6xknnkwmfliqfrc1hhjgcaxb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base binary bytestring containers mtl ];
-       testDepends = [ array base binary bytestring containers mtl ];
+       libraryHaskellDepends = [
+         array base binary bytestring containers mtl
+       ];
+       executableHaskellDepends = [
+         array base binary bytestring containers mtl
+       ];
+       testHaskellDepends = [
+         array base binary bytestring containers mtl
+       ];
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53733,7 +55056,7 @@ self: {
        sha256 = "0lf063p2wj2d1hxb5hx4bcid3a3ni3g9x8sglm5q5kfbmdk7awj4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers diagrams-lib diagrams-svg filepath ghc-events lens
          mtl optparse-applicative parsec SVGFonts template-haskell th-lift
          transformers
@@ -53754,10 +55077,13 @@ self: {
        sha256 = "181qnh6mm3pmlalf17g2g87gj7hyzf5pxzvix1cmap2f31x4p6by";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base binary bytestring containers transformers
+       ];
+       testHaskellDepends = [
          array base binary bytestring containers transformers
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
@@ -53775,14 +55101,13 @@ self: {
        sha256 = "07kyifdh8s7jjp1jsm9f823hr0axgpxv54fr0vg8k3ibhdrw5dj1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath free ghc ghc-paths mtl syb
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filemanip filepath ghc ghc-paths HUnit
          mtl silently syb
        ];
-       jailbreak = true;
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53796,7 +55121,7 @@ self: {
        sha256 = "0ghp3f86m91zi6kl8zq157717s2p73nwdgln4aiclq830m72ys9w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base directory filepath process ];
        homepage = "http://code.haskell.org/~dons/code/ghc-gc-tune";
        description = "Graph performance of Haskell programs with different GC flags";
        license = stdenv.lib.licenses.bsd3;
@@ -53808,7 +55133,7 @@ self: {
        pname = "ghc-generic-instances";
        version = "0.1.0.0";
        sha256 = "0264ma0w85fwypnagd0l4zfs1wi1yk16rygn6fhpzgsxycwmg47h";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        homepage = "https://github.com/alanz/ghc-generic-instances";
        description = "Derived instances of GHC.Generic of the GHC AST";
        license = stdenv.lib.licenses.publicDomain;
@@ -53822,14 +55147,10 @@ self: {
        pname = "ghc-heap-view";
        version = "0.5.4";
        sha256 = "02n414m1lb6lilrkmjss2pd1s7hd4lf2sga7ql2ahib69kygzhx1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers ghc template-haskell transformers
        ];
-       testDepends = [ base deepseq ];
-       postInstall = ''
-         ensureDir "$out/share/ghci"
-         ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
-       '';
+       testHaskellDepends = [ base deepseq ];
        description = "Extract the heap representation of Haskell values and thunks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53845,12 +55166,17 @@ self: {
        sha256 = "0y9gln7lbp8xqg5apfwfs95z3faawd236wqz69q8j7riwfra9bqm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath ghc ghc-mod ghc-paths
+         ghc-syb-utils mtl optparse-applicative parsec process safe syb
+         transformers
+       ];
+       executableHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-mod ghc-paths
          ghc-syb-utils hspec mtl optparse-applicative parsec process safe
          syb transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-mod ghc-paths
          ghc-syb-utils hspec mtl optparse-applicative parsec process safe
          syb transformers
@@ -53869,7 +55195,9 @@ self: {
        sha256 = "10vbibmgssb1ichxha92q5mqlaglhkcv4xxiikq4mh3l3bgzw6bj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process shake unordered-containers ];
+       executableHaskellDepends = [
+         base process shake unordered-containers
+       ];
        homepage = "https://github.com/ndmitchell/ghc-make#readme";
        description = "Accelerated version of ghc --make";
        license = stdenv.lib.licenses.bsd3;
@@ -53883,7 +55211,7 @@ self: {
        sha256 = "08qyn6mpmkq1vdfrqhckfqc096jv21scss76x9zcss4hfbljfa0p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec process ];
+       executableHaskellDepends = [ base parsec process ];
        jailbreak = true;
        description = "Generate a bash completion from the GHC manpage";
        license = stdenv.lib.licenses.bsd3;
@@ -53891,10 +55219,10 @@ self: {
 
   "ghc-mod" = callPackage
     ({ mkDerivation, async, base, Cabal, containers, data-default
-     , deepseq, directory, djinn-ghc, doctest, emacs, filepath, ghc
-     , ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec
-     , io-choice, monad-control, monad-journal, mtl, old-time, pretty
-     , process, split, syb, temporary, text, time, transformers
+     , deepseq, directory, djinn-ghc, doctest, filepath, ghc, ghc-paths
+     , ghc-syb-utils, haskell-src-exts, hlint, hspec, io-choice
+     , monad-control, monad-journal, mtl, old-time, pretty, process
+     , split, syb, temporary, text, time, transformers
      , transformers-base
      }:
      mkDerivation {
@@ -53903,33 +55231,26 @@ self: {
        sha256 = "11wnrdb6blw169w6kd49ax9h1r9qkka5329lmdhimvki8amv8riv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base Cabal containers data-default deepseq directory
-         djinn-ghc filepath ghc ghc-paths ghc-syb-utils haskell-src-exts
-         hlint io-choice monad-control monad-journal mtl old-time pretty
-         process split syb temporary text time transformers
-         transformers-base
+       libraryHaskellDepends = [
+         base Cabal containers deepseq directory djinn-ghc filepath ghc
+         ghc-paths ghc-syb-utils haskell-src-exts hlint io-choice
+         monad-control monad-journal mtl old-time pretty process split syb
+         temporary text time transformers transformers-base
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         async base containers data-default directory filepath ghc mtl
+         old-time pretty process split time
+       ];
+       testHaskellDepends = [
          base Cabal containers deepseq directory djinn-ghc doctest filepath
          ghc ghc-paths ghc-syb-utils haskell-src-exts hlint hspec io-choice
          monad-control monad-journal mtl old-time pretty process split syb
          temporary text time transformers transformers-base
        ];
-       buildTools = [ emacs ];
-       configureFlags = "--datasubdir=ghc-mod-5.2.1.2";
-       postInstall = ''
-         cd $out/share/ghc-mod-5.2.1.2
-         make
-         rm Makefile
-         cd ..
-         ensureDir "$out/share/emacs"
-         mv ghc-mod-5.2.1.2 emacs/site-lisp
-       '';
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) emacs;};
+     }) {};
 
   "ghc-mtl" = callPackage
     ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl
@@ -53938,7 +55259,9 @@ self: {
        pname = "ghc-mtl";
        version = "1.2.1.0";
        sha256 = "0h6r6gip9nsjlsq88wj105hhqliy7ac2dmmndsfzbjz07b03cklk";
-       buildDepends = [ base exceptions extensible-exceptions ghc mtl ];
+       libraryHaskellDepends = [
+         base exceptions extensible-exceptions ghc mtl
+       ];
        homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";
        description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -53955,10 +55278,13 @@ self: {
        sha256 = "089ma8mjyvz61hr2907aihz8bh7h1pdmjrpm9smqmz8j5x72bsfc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath process temporary
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base containers directory filepath process temporary
+       ];
+       testHaskellDepends = [
          base directory filepath HUnit process QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -53975,15 +55301,11 @@ self: {
        pname = "ghc-parser";
        version = "0.1.7.0";
        sha256 = "0cb0d9szrimlflxh67ad74cqfi6yc2cr1bcl17c6b23ccnyqbq73";
-       buildDepends = [ base ghc ];
-       buildTools = [ cpphs happy ];
-       patchPhase = ''
-         substituteInPlace build-parser.sh --replace "/bin/bash" "$SHELL"
-       '';
+       libraryHaskellDepends = [ base ghc ];
+       libraryToolDepends = [ cpphs happy ];
        homepage = "https://github.com/gibiansky/IHaskell";
        description = "Haskell source parser from GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-paths" = callPackage
@@ -53992,8 +55314,7 @@ self: {
        pname = "ghc-paths";
        version = "0.1.0.9";
        sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
-       buildDepends = [ base ];
-       patches = [ ./ghc-paths-nix.patch ];
+       libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54008,7 +55329,7 @@ self: {
        sha256 = "0rm7vksfzwkpby1b8k2v745d7bylxbgspjhhfvdxc40a3rix8sz7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal cmdargs filepath parsec process split
        ];
        jailbreak = true;
@@ -54024,7 +55345,9 @@ self: {
        pname = "ghc-pkg-lib";
        version = "0.3";
        sha256 = "1m2ny3f5i1ihvpq0vigpzj701gzrbzdz5h7f41qn37ikp9a6kd5a";
-       buildDepends = [ base Cabal directory filepath ghc ghc-paths ];
+       libraryHaskellDepends = [
+         base Cabal directory filepath ghc ghc-paths
+       ];
        homepage = "https://github.com/JPMoresmau/ghc-pkg-lib";
        description = "Provide library support for ghc-pkg information";
        license = stdenv.lib.licenses.bsd3;
@@ -54037,7 +55360,7 @@ self: {
        pname = "ghc-prim";
        version = "0.4.0.0";
        sha256 = "1w3hkl1xyfi67kh65gqn99pinxrfqjl2s08yg0010r907w3qys31";
-       buildDepends = [ rts ];
+       libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54050,7 +55373,8 @@ self: {
        sha256 = "0nzk3h65iqnmva7n2m00kknllqbmg95xav4g5rpizhridpivg9hb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Generates data to be used with flamegraph.pl from .prof files.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -54072,7 +55396,7 @@ self: {
        pname = "ghc-simple";
        version = "0.1.2.1";
        sha256 = "0hk3sii5d6mjry28gaipl45c6si82rhdsd43cq130fk9m0xzl9hf";
-       buildDepends = [ base ghc ghc-paths ];
+       libraryHaskellDepends = [ base ghc ghc-paths ];
        homepage = "https://github.com/valderman/ghc-simple";
        description = "Simplified interface to the GHC API";
        license = stdenv.lib.licenses.mit;
@@ -54084,7 +55408,7 @@ self: {
        pname = "ghc-srcspan-plugin";
        version = "0.2.1.0";
        sha256 = "1cb669zhgibv9x7c924333kyzqa728031invr0smdnv0a2mgi2wi";
-       buildDepends = [ array base containers ghc hpc ];
+       libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54095,7 +55419,7 @@ self: {
        pname = "ghc-syb";
        version = "0.2.0.0";
        sha256 = "0rwx7l89r5yfi1187c0zgx1ph2rsagyvrizb1c0vnbyrwhpbslh0";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Data and Typeable instances for the GHC API";
@@ -54109,7 +55433,7 @@ self: {
        pname = "ghc-syb-utils";
        version = "0.2.3";
        sha256 = "0rxwdivpcppwzbqglbrz8rm9f4g1gmba9ij7p7aj3di9x37kzxky";
-       buildDepends = [ base ghc syb ];
+       libraryHaskellDepends = [ base ghc syb ];
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
@@ -54121,8 +55445,7 @@ self: {
        pname = "ghc-tcplugins-extra";
        version = "0.1";
        sha256 = "1lr3x3vg5aw8fjwz7skcisqg2hsls16abxp8p4w4940qnw5zznkf";
-       buildDepends = [ base ghc ];
-       jailbreak = true;
+       libraryHaskellDepends = [ base ghc ];
        homepage = "http://www.clash-lang.org/";
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
@@ -54136,7 +55459,8 @@ self: {
        sha256 = "0a3800pngsbjc0fxpbqps9caa7gp5956wfyh18ybarlpi0ah7d7r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base containers text time ];
+       libraryHaskellDepends = [ attoparsec base containers text time ];
+       executableHaskellDepends = [ attoparsec base containers text ];
        homepage = "https://github.com/maoe/ghc-time-alloc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
@@ -54149,9 +55473,8 @@ self: {
        pname = "ghc-typelits-natnormalise";
        version = "0.3";
        sha256 = "169imqq6hch4lamsgz8s3cnszysvxvw9xlgd5bjldq09zvpy7i8r";
-       buildDepends = [ base ghc ghc-tcplugins-extra ];
-       testDepends = [ base tasty tasty-hunit ];
-       jailbreak = true;
+       libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
@@ -54166,15 +55489,11 @@ self: {
        pname = "ghc-vis";
        version = "0.7.2.7";
        sha256 = "0kxkmbp71yx5mskzpcyjd8s2yq01q1q6dxmqzmwg6naalcpcbswv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers deepseq fgl ghc-heap-view graphviz gtk mtl
          svgcairo text transformers xdot
        ];
        jailbreak = true;
-       postInstall = ''
-         ensureDir "$out/share/ghci"
-         ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
-       '';
        homepage = "http://felsin9.de/nnis/ghc-vis";
        description = "Live visualization of data structures in GHCi";
        license = stdenv.lib.licenses.bsd3;
@@ -54186,7 +55505,7 @@ self: {
        pname = "ghci-diagrams";
        version = "0.1.1";
        sha256 = "1jlym5k2d43avkgw7ff3pdaad5j2q5yq803cy74bgy0z69x77v1w";
-       buildDepends = [ base cairo colour diagrams gtk ];
+       libraryHaskellDepends = [ base cairo colour diagrams gtk ];
        jailbreak = true;
        description = "Display simple diagrams from ghci";
        license = stdenv.lib.licenses.bsd3;
@@ -54202,7 +55521,7 @@ self: {
        sha256 = "01j2ryxxmd5zzdv1ayvzibi3njl3nbn0ypxmafvglrvn2zwnmsqy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring directory filepath ghc ghc-paths haskeline
          mtl process unix
        ];
@@ -54219,7 +55538,7 @@ self: {
        pname = "ghci-lib";
        version = "0.1.0.0";
        sha256 = "06lg1czsr6k5h18aks33p2kbahiidhv7xsrv7n1fcvqsgglzgk3z";
-       buildDepends = [ base ghc MissingH ];
+       libraryHaskellDepends = [ base ghc MissingH ];
        jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for interactively evaluating Haskell code";
@@ -54236,7 +55555,7 @@ self: {
        sha256 = "01ghvv0y1qif19v8dlbspxyb9m5zag832sx2k3qyhqh8iccnr14x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring directory filepath ghc ghc-paths haskeline
          process transformers unix
        ];
@@ -54253,7 +55572,7 @@ self: {
        pname = "ghci-pretty";
        version = "0.0.2";
        sha256 = "01syl5c6ana4m8d3jc5pbi64zf3c4l2x0r7jwkizm7kymszmbns5";
-       buildDepends = [ base hscolour ipprint ];
+       libraryHaskellDepends = [ base hscolour ipprint ];
        homepage = "https://github.com/larskuhtz/ghci-pretty";
        description = "colored pretty-printing within ghci";
        license = stdenv.lib.licenses.mit;
@@ -54270,11 +55589,14 @@ self: {
        sha256 = "1b5d70f1422lwn8xmcdn6b52qwqp3aax0h7q3zfnkv2ima18yk6l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base cmdargs directory extra filepath process terminal-size time
+       ];
+       executableHaskellDepends = [
          ansi-terminal base cmdargs containers directory extra filepath
          fsnotify process terminal-size time
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base cmdargs containers directory extra filepath
          fsnotify process tasty tasty-hunit terminal-size time
        ];
@@ -54289,7 +55611,7 @@ self: {
        pname = "ghcjs-codemirror";
        version = "0.0.0.1";
        sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ghcjs/CodeMirror";
        description = "Installs CodeMirror JavaScript files";
        license = stdenv.lib.licenses.mit;
@@ -54302,7 +55624,9 @@ self: {
        pname = "ghcjs-dom";
        version = "0.1.1.3";
        sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly";
-       buildDepends = [ base glib gtk mtl text transformers webkit ];
+       libraryHaskellDepends = [
+         base glib gtk mtl text transformers webkit
+       ];
        description = "DOM library that supports both GHCJS and WebKitGTK";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -54315,7 +55639,7 @@ self: {
        sha256 = "0jbn6nhaq7h01wh1limsb4xzgwp7i71922gql5mz916kv6wa2cgl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghcjs-dom mtl ];
+       executableHaskellDepends = [ base ghcjs-dom mtl ];
        homepage = "https://github.com/ghcjs/ghcjs-dom-hello";
        description = "GHCJS DOM Hello World, an example package";
        license = stdenv.lib.licenses.mit;
@@ -54328,7 +55652,9 @@ self: {
        pname = "ghcjs-websockets";
        version = "0.3.0.4";
        sha256 = "03ycfbp756hiivbynfsmkn4ddh5gj82dswzkj3cm8dwq94m8wd16";
-       buildDepends = [ base base64-bytestring binary bytestring text ];
+       libraryHaskellDepends = [
+         base base64-bytestring binary bytestring text
+       ];
        homepage = "http://github.com/mstksg/ghcjs-websockets";
        description = "GHCJS interface for the Javascript Websocket API";
        license = stdenv.lib.licenses.mit;
@@ -54347,11 +55673,14 @@ self: {
        sha256 = "0rnmv09sl5pj9y8hr7s8hwh23zfm4j8nsn524hpj73diwmzf5fh8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base blaze-html blaze-markup bytestring containers
-         diagrams-lib diagrams-svg directory file-embed ghc-prim hint mtl
-         text time unix unordered-containers vector wai wai-websockets warp
-         websockets yesod yesod-static
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup containers diagrams-lib
+         diagrams-svg ghc-prim text
+       ];
+       executableHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         file-embed hint mtl text time unix unordered-containers vector wai
+         wai-websockets warp websockets yesod yesod-static
        ];
        jailbreak = true;
        homepage = "http://github.com/shapr/ghclive/";
@@ -54368,7 +55697,7 @@ self: {
        sha256 = "1yn6blszccmgv0zrq5cxv6kww47j7pwgywgy7piz6is44ab5s5l9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base zenc ];
+       executableHaskellDepends = [ base zenc ];
        homepage = "https://github.com/Peaker/ghczdecode";
        description = "Decode Z-encoded strings from GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -54385,10 +55714,13 @@ self: {
        sha256 = "03lrn3s79gxdn5fwh6cbp46k303662fnisjs7qp1yf8c66vxi8wc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring data-default directory filepath iteratee
-         iteratee-compress mmap mtl old-locale SHA storable-endian time
-         ui-command unix zlib
+       libraryHaskellDepends = [
+         base binary bytestring data-default iteratee iteratee-compress mmap
+         old-locale SHA storable-endian time
+       ];
+       executableHaskellDepends = [
+         base bytestring data-default directory filepath mtl SHA ui-command
+         unix zlib
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
@@ -54401,7 +55733,7 @@ self: {
        pname = "gimlh";
        version = "0.1.3.0";
        sha256 = "1hxdgff1rw3yp3a2p26bj6034jgc458bdzma1xkbh9pahlhwhs2l";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/gazay/gimlh";
        description = "Haskell parser for GIML";
        license = stdenv.lib.licenses.mit;
@@ -54419,12 +55751,12 @@ self: {
        sha256 = "0qvhdzmqi1pppfcfld27mjzbzj9h6yaz2n7b6inp0ybr80vm6x4w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers directory hashable
          hashtables mtl network old-locale old-time parsec pretty process
          random regex-posix syb unix utf8-string
        ];
-       extraLibraries = [ openssl ];
+       executableSystemDepends = [ openssl ];
        homepage = "http://repetae.net/computer/ginsu/";
        description = "Ginsu Gale Client";
        license = stdenv.lib.licenses.mit;
@@ -54439,8 +55771,10 @@ self: {
        pname = "gio";
        version = "0.13.1.0";
        sha256 = "1qxbdjznxz56jw108cc78lzwh1r4g8l2jcaz2bh2akc1nwhv2x5j";
-       buildDepends = [ array base bytestring containers glib mtl ];
-       buildTools = [ gtk2hs-buildtools ];
+       libraryHaskellDepends = [
+         array base bytestring containers glib mtl
+       ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GIO";
        license = stdenv.lib.licenses.lgpl21;
@@ -54457,7 +55791,7 @@ self: {
        sha256 = "0wra67d2jdnx463vw8hf2yzzwmnkbs9791x5mgarlgc6zj68g926";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring cassava containers directory extra filepath
          gitlib gitlib-libgit2 scientific shake split tagged text
          unordered-containers vector yaml
@@ -54465,6 +55799,7 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gist" = callPackage
@@ -54477,7 +55812,9 @@ self: {
        sha256 = "1jgdhga0qjbc6kx1nr5yngcx560rlxiil3cnsmzh8mwazbs3yyl1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring conduit http-conduit text ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit http-conduit text
+       ];
        jailbreak = true;
        homepage = "http://github.com/simonmichael/gist";
        description = "A reliable command-line client for gist.github.com";
@@ -54495,7 +55832,7 @@ self: {
        sha256 = "0wfvfrmwn81myiaa5x4bw6ypyk0hljaaf3f7b9rnpxwk291dwc3z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs hslogger parallel-io regex-posix shelly system-fileio
          system-filepath text transformers unix
        ];
@@ -54528,9 +55865,10 @@ self: {
        pname = "git-annex";
        version = "5.20150731";
        sha256 = "18akv0xj4mf2ypzzd12briv0rw9ba7xw8k1qxvl10m9z4x6gvvm2";
+       configureFlags = [ "-fassistant" "-fproduction" ];
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson async aws base blaze-builder bloomfilter byteable bytestring
          case-insensitive clientsession conduit conduit-extra containers
          crypto-api cryptohash data-default DAV dbus directory dlist dns
@@ -54546,10 +55884,9 @@ self: {
          warp-tls xml-types yesod yesod-core yesod-default yesod-form
          yesod-static
        ];
-       buildTools = [
+       executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
        ];
-       configureFlags = [ "-fassistant" "-fproduction" ];
        preConfigure = "export HOME=$TEMPDIR";
        checkPhase = ''
          cp dist/build/git-annex/git-annex git-annex
@@ -54574,7 +55911,7 @@ self: {
        sha256 = "1q4fbvpdjca5k530dcm6yspsgzy60dx7nimar2fkm8s086qsf662";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath optparse-applicative parsec pretty process
        ];
        jailbreak = true;
@@ -54592,8 +55929,8 @@ self: {
        pname = "git-date";
        version = "0.2.2";
        sha256 = "0yld8p7jgq0ihz21nkmirz3ynwi0mgrlgzx727kim59hplm6xrcl";
-       buildDepends = [ base bytestring time utf8-string ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring time utf8-string ];
+       testHaskellDepends = [
          base bytestring old-locale QuickCheck test-framework
          test-framework-quickcheck2 time utf8-string
        ];
@@ -54611,7 +55948,7 @@ self: {
        pname = "git-embed";
        version = "0.1.0";
        sha256 = "0yrx06ay25zsk90djr4mrqnn80xp3w6cmkciqavrmijf25fc5jvn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath process template-haskell
        ];
        homepage = "https://github.com/borsboom/git-embed";
@@ -54629,10 +55966,10 @@ self: {
        sha256 = "1vi87kdb58d7yg5bc97nkz2lcnfxsmn4w66m2m52rbfi8xnqkl6l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers optparse-applicative process text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec optparse-applicative process text
        ];
        homepage = "https://github.com/fujimura/git-freq";
@@ -54651,7 +55988,7 @@ self: {
        sha256 = "13m95j227mvl7facqjlwcz11kd88ibhr7fwf5ph81wppyic8136g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath gitlib gitlib-cmdline
          hslogger old-locale optparse-applicative shelly tagged text time
          transformers
@@ -54675,7 +56012,7 @@ self: {
        sha256 = "00byw8y9av60rwacp4006kv7qb9sc26j1f82cz1ngr42nfx9955c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath gitlib gitlib-libgit2
          lifted-async logging monad-logger old-locale optparse-applicative
          shelly tagged template-haskell text time transformers unix
@@ -54695,7 +56032,7 @@ self: {
        pname = "git-object";
        version = "0.0.2";
        sha256 = "1hwsl5n6im6b13iy1whvgd3avax9xb81maaan2vf3r474r3321jm";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring directory
          enumerator filepath zlib-enum
        ];
@@ -54716,7 +56053,7 @@ self: {
        sha256 = "19hgrp2kjqhcw53rf9payiajzfz6d7jqf2m2mnmbjv2zpr9y74dp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base bytestring containers directory exceptions filepath
          hslogger IfElse MissingH mtl network network-uri
          optparse-applicative process QuickCheck text time transformers unix
@@ -54738,10 +56075,11 @@ self: {
        sha256 = "1yywxganjl7rj4lf3pp1fh4adjhp3110l4az1w76r3rywql6v8w2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring Cabal machines machines-io machines-process process
-         safe transformers
+       libraryHaskellDepends = [
+         base bytestring machines machines-io machines-process process safe
+         transformers
        ];
+       executableHaskellDepends = [ base Cabal ];
        jailbreak = true;
        homepage = "github.com/aloiscochard/git-sanity";
        description = "A sanity checker for your git history";
@@ -54760,13 +56098,17 @@ self: {
        sha256 = "1l1ly1wkfidpzxr68z0qyfyj0pq7wdn534m4ks0hvh45sp6v569c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bifunctors Cabal containers cpphs Diff directory filepath
-         formatting ghc-mod haskell-src-exts hlint hscolour mtl
-         optparse-applicative process split strict stylish-haskell text
+       libraryHaskellDepends = [
+         base containers directory filepath formatting ghc-mod hlint mtl
+         optparse-applicative process split stylish-haskell text
          transformers unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bifunctors Cabal containers cpphs Diff directory filepath
+         ghc-mod haskell-src-exts hlint hscolour optparse-applicative
+         process split strict stylish-haskell text
+       ];
+       testHaskellDepends = [
          base containers directory filepath hspec process temporary
          transformers unix
        ];
@@ -54786,7 +56128,7 @@ self: {
        sha256 = "0vd580k1cxipycyyjpzhwvv6q70nf6fjfrsxp3gz3gy4iqzzssgy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cryptohash directory filepath process utf8-string
        ];
        homepage = "https://github.com/vincenthz/gitcache";
@@ -54805,7 +56147,7 @@ self: {
        sha256 = "0krna2rqdscnrd86d7ipq4gad7dzk1w5lnk8757a13qnd5jqrxdl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-lens base bytestring foldl lens mtl
          optparse-applicative sqlite-simple system-filepath text turtle wreq
        ];
@@ -54827,13 +56169,13 @@ self: {
        pname = "github";
        version = "0.13.2";
        sha256 = "1i07jwhkzaxia98a3fjnm3hynh4mjdhy9rzdh9chdlram5wqk87z";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive conduit containers cryptohash data-default failure
          hashable HTTP http-conduit http-types network old-locale text time
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive conduit containers cryptohash data-default failure
          hashable hspec HTTP http-conduit http-types network old-locale text
@@ -54856,13 +56198,13 @@ self: {
        sha256 = "110nivss9436ls2mr5bl0m6fzg6ds5m0ams803zq60b8dya96wic";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory exceptions filepath github
          hslogger IfElse MissingH mtl network network-uri
          optparse-applicative pretty-show process text transformers unix
          unix-compat
        ];
-       buildTools = [ git ];
+       executableToolDepends = [ git ];
        homepage = "https://github.com/joeyh/github-backup";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
@@ -54876,7 +56218,7 @@ self: {
        pname = "github-post-receive";
        version = "1.2.0.1";
        sha256 = "14vd9rnr3x3wasnc6w6d3kcs5dnka902n9cbxblqdryc8l7p360q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers email-validate http-types text wai
          wai-logger warp
        ];
@@ -54891,7 +56233,7 @@ self: {
        pname = "github-types";
        version = "0.1.0.5";
        sha256 = "0lymbga0rwhni0rrjdla6fz5a1gz8zclf421rdiz5cnnh8lbd97i";
-       buildDepends = [ aeson base text ];
+       libraryHaskellDepends = [ aeson base text ];
        description = "Type definitions for objects used by the GitHub v3 API";
        license = "unknown";
      }) {};
@@ -54902,7 +56244,7 @@ self: {
        pname = "github-utils";
        version = "0.1.0";
        sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5";
-       buildDepends = [ base basic-prelude github text ];
+       libraryHaskellDepends = [ base basic-prelude github text ];
        jailbreak = true;
        homepage = "https://github.com/greenrd/github-utils";
        description = "Useful functions that use the GitHub API";
@@ -54917,7 +56259,7 @@ self: {
        pname = "github-webhook-handler";
        version = "0.0.3";
        sha256 = "1dwq1fccgnngh97kxyb3kp4f6xr8dsydlgkydl28lxkbwcapk39h";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cryptohash github-types text transformers
          uuid vector
        ];
@@ -54933,7 +56275,7 @@ self: {
        pname = "github-webhook-handler-snap";
        version = "0.0.3";
        sha256 = "0v9wman214rj81dfvkgng195s3gsvy5d7csshqwcw9x10giby9iy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive github-types
          github-webhook-handler snap-core uuid
        ];
@@ -54951,7 +56293,7 @@ self: {
        sha256 = "03sjhlsp7xswciypp7sw9x0b3h6m7fvc2dk5k0a3bibflns2zgql";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base base64-bytestring bytestring http-conduit network safe
          text
        ];
@@ -54977,13 +56319,16 @@ self: {
        sha256 = "06wxy4hpbkbmlwrgnsxbr47k2a791094gzqsmlqzhsq6wa1bgfr9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       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 safe SHA split syb tagsoup text time uri url
+         random recaptcha SHA split syb tagsoup text time uri url
          utf8-string uuid xhtml xml xss-sanitize zlib
        ];
        homepage = "http://gitit.net";
@@ -55002,7 +56347,7 @@ self: {
        pname = "gitlib";
        version = "3.1.0.2";
        sha256 = "05l5i2s0212sx3bzw6r9njanjv1q1gmqc7f6g1z1sy9fibyxcwah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring conduit conduit-combinators
          containers directory exceptions filepath hashable lifted-async
          lifted-base monad-control monad-logger mtl resourcet semigroups
@@ -55024,20 +56369,19 @@ self: {
        pname = "gitlib-cmdline";
        version = "3.1.0.2";
        sha256 = "1dridps65mw06r9slza80vl21f5n1kq1if7gnwcrbagicvy45p0k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions gitlib monad-control mtl old-locale parsec
          process-extras shelly system-filepath tagged text time
          time-locale-compat transformers transformers-base
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base gitlib gitlib-test hspec hspec-expectations system-filepath
          tagged text transformers
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-cross" = callPackage
@@ -55048,8 +56392,8 @@ self: {
        pname = "gitlib-cross";
        version = "3.1.0";
        sha256 = "0iack7kafbfa45s9k7ypbafapahrifh2grjdzyrhvzjg767l3i1h";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base gitlib gitlib-cmdline gitlib-libgit2 gitlib-test hspec
          hspec-expectations HUnit
        ];
@@ -55071,14 +56415,14 @@ self: {
        pname = "gitlib-libgit2";
        version = "3.1.0.5";
        sha256 = "1xnzks7jwl7d0xf7qgz9gmqf4n1yn3qvjrs73prla8n063kgdh95";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions fast-logger filepath gitlib hlibgit2 lifted-async
          lifted-base mmorph monad-control monad-logger monad-loops mtl
          resourcet stm stm-conduit tagged template-haskell text text-icu
          time transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
          monad-logger transformers
        ];
@@ -55100,14 +56444,14 @@ self: {
        pname = "gitlib-s3";
        version = "3.1.0.1";
        sha256 = "1vcx26dny7pj4lqn1rli3vqad2xh7vkqj86c6i7hyskilgbs6n8m";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attempt aws base bifunctors binary bytestring conduit
          conduit-combinators data-default directory exceptions filepath
          ghc-prim gitlib gitlib-libgit2 hlibgit2 http-conduit lens
          lifted-base monad-control monad-logger resourcet retry split stm
          template-haskell text time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aws base data-default directory exceptions filepath gitlib
          gitlib-libgit2 gitlib-test hlibgit2 hspec hspec-expectations HUnit
          monad-logger resourcet temporary text transformers
@@ -55123,7 +56467,9 @@ self: {
        pname = "gitlib-sample";
        version = "3.1.0";
        sha256 = "1px3yskxkr1kmgwfw1jdrbgjgkz8wxznz56g0gn3gqx63haxifmc";
-       buildDepends = [ base exceptions gitlib mtl transformers ];
+       libraryHaskellDepends = [
+         base exceptions gitlib mtl transformers
+       ];
        description = "Sample backend for gitlib showing the basic structure for any backend";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -55137,7 +56483,7 @@ self: {
        pname = "gitlib-test";
        version = "3.1.0.3";
        sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-combinators exceptions gitlib hspec
          hspec-expectations HUnit monad-control tagged text time
          transformers
@@ -55155,7 +56501,7 @@ self: {
        pname = "gitlib-utils";
        version = "1.2.0";
        sha256 = "081vagmlf6lkh7qqr9y42nl8c1ds011s05a567dsw6ckf166wshn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit data-default failure gitlib hex lifted-base
          system-fileio system-filepath tagged text transformers
          unordered-containers
@@ -55173,7 +56519,7 @@ self: {
        pname = "gitrev";
        version = "1.0.0";
        sha256 = "05jxzhpjzd9n5sdaa8d9y2zczs2v5w4n9718wl411ghvx54jhnfd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath process template-haskell
        ];
        homepage = "https://github.com/acfoltzer/gitrev";
@@ -55190,11 +56536,11 @@ self: {
        pname = "gitson";
        version = "0.5.1";
        sha256 = "175j2pkc3cb37h3vilb99i782as9yg68nacs2ysnp1m7hrxvvyjy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring directory errors filepath flock
          monad-control process transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base directory doctest Glob hspec process transformers
        ];
        homepage = "https://github.com/myfreeweb/gitson";
@@ -55211,11 +56557,11 @@ self: {
        pname = "gl";
        version = "0.7.7";
        sha256 = "0lsz8gq3cmkh6s9hhxnr3m95ibra9y63230jyqhwk9wamid2x2pg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath fixed half hxt split
          transformers
        ];
-       extraLibraries = [ mesa ];
+       librarySystemDepends = [ mesa ];
        description = "Complete OpenGL raw bindings";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) mesa;};
@@ -55226,7 +56572,7 @@ self: {
        pname = "gl-capture";
        version = "0.1.0.0";
        sha256 = "0pcan0fpb1mfwda69f8z8pdrdav79rdm31yvmrk98dca7al7k583";
-       buildDepends = [ base bytestring OpenGL ];
+       libraryHaskellDepends = [ base bytestring OpenGL ];
        description = "simple image capture from OpenGL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55237,9 +56583,9 @@ self: {
        pname = "glade";
        version = "0.12.5.0";
        sha256 = "0dbl7y5rdwzcham16iym9cikfyaphzr1rqcsni9ab6s2368a1vkr";
-       buildDepends = [ base glib gtk ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ libglade ];
+       libraryHaskellDepends = [ base glib gtk ];
+       libraryPkgconfigDepends = [ libglade ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the glade library";
@@ -55253,7 +56599,7 @@ self: {
        pname = "gladexml-accessor";
        version = "0.0";
        sha256 = "06kzakvssmldjgx0s8qm0a3cd9glmwrdnh690sv708jcvg8x45y3";
-       buildDepends = [ base glade HaXml template-haskell ];
+       libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55270,11 +56616,12 @@ self: {
        sha256 = "01bqh7g76a02qvzqm8di6ig84k0v7crd9aljsg339h7d3y7grxhf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base containers directory errors haskeline mtl
          parsec
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          ansi-wl-pprint base errors mtl parsec tasty tasty-hunit
          template-haskell
        ];
@@ -55291,7 +56638,10 @@ self: {
        sha256 = "076v7h0p91dj8hx110vm0li2njsc8p5dgcf6zxk721mdx5xkymhz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers GLFW-b lens mtl OpenGL ];
+       libraryHaskellDepends = [ base containers GLFW-b lens mtl OpenGL ];
+       executableHaskellDepends = [
+         base containers GLFW-b lens mtl OpenGL
+       ];
        jailbreak = true;
        homepage = "zyghost.com";
        description = "An OpenGL micro framework";
@@ -55303,10 +56653,10 @@ self: {
      mkDerivation {
        pname = "glasso";
        version = "0.1.0";
-       revision = "1";
        sha256 = "1ibkvgfighkfn3v27cqy7wwhvlhmnbi1dvyycwbfba6rfy9w6gb8";
+       revision = "1";
        editedCabalFile = "abf1b0cb0b9cc8c106f833a2549e2be95111a58296d6cc01c39e18c03abef797";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        description = "Graphical Lasso algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55319,9 +56669,11 @@ self: {
        pname = "glib";
        version = "0.13.2.1";
        sha256 = "1pxc2a0hnjaryf3f8d410rnhxmc7byx6lwcypgqg4zma6r3qhqwp";
-       buildDepends = [ base bytestring containers text utf8-string ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ glib ];
+       libraryHaskellDepends = [
+         base bytestring containers text utf8-string
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GLIB library for Gtk2Hs";
        license = stdenv.lib.licenses.lgpl21;
@@ -55333,8 +56685,8 @@ self: {
        pname = "glider-nlp";
        version = "0.1";
        sha256 = "1i604gj3ssabr3dcas6gfh20d4psqwl1j4d7wk4p3gy0hvjvr8fb";
-       buildDepends = [ base containers text ];
-       testDepends = [ base Cabal containers HUnit text ];
+       libraryHaskellDepends = [ base containers text ];
+       testHaskellDepends = [ base Cabal containers HUnit text ];
        jailbreak = true;
        homepage = "https://github.com/klangner/glider-nlp";
        description = "Natural Language Processing library";
@@ -55350,7 +56702,7 @@ self: {
        sha256 = "1xgx02cxvpc8sv99wl44lpzbv9cc87nnihbpalmddb71mwrmj4ji";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ppm split ];
+       executableHaskellDepends = [ base ppm split ];
        description = "A simple ray tracer in an early stage of development";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55361,7 +56713,8 @@ self: {
        pname = "gll";
        version = "0.2.0.3";
        sha256 = "1w2z5071idac1jn367dymphqvayd580jlnhapmfrd3s40b6z6xaf";
-       buildDepends = [ array base containers TypeCompose ];
+       libraryHaskellDepends = [ array base containers TypeCompose ];
+       jailbreak = true;
        description = "GLL parser with simple combinator interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55375,7 +56728,7 @@ self: {
        pname = "global";
        version = "0.2.1.0";
        sha256 = "00d9qsh0n9yxr411mdisk602qiizy9h4wgz4k04mfr5x5g6cp418";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts haskell-src-exts-qq loch-th SafeSemaphore stm
          syntax-trees-fork-bairyn tagged template-haskell
        ];
@@ -55394,8 +56747,10 @@ self: {
        pname = "global-config";
        version = "0.3.1";
        sha256 = "1rp855j0rzx528x01q5wi2hah80bwqf5rrw7p8p8qzl39fhlpzqa";
-       buildDepends = [ base data-default global-variables transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base data-default global-variables transformers
+       ];
+       testHaskellDepends = [
          base bytestring data-default HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -55410,7 +56765,7 @@ self: {
        pname = "global-lock";
        version = "0.1";
        sha256 = "0b2sz9ag6wcr0amgrx08l7924brfansnh9rv64wg9s3nk4ni2sxp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A global lock implemented without unsafePerformIO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55421,7 +56776,7 @@ self: {
        pname = "global-variables";
        version = "1.0.1.1";
        sha256 = "0fvhh6q6z114qyi5rhwzxhrlqfhx6af97187b49lyvx2k9zkzvzp";
-       buildDepends = [ base containers stm ];
+       libraryHaskellDepends = [ base containers stm ];
        jailbreak = true;
        description = "Namespaced, global, and top-level mutable variables without unsafePerformIO";
        license = stdenv.lib.licenses.bsd3;
@@ -55437,7 +56792,11 @@ self: {
        sha256 = "069j4xvh5039xkg300h1cwa0lyvkycixasxr8zh4iqyl1g5bcvs8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base GlomeTrace GlomeVec GLUT haskell98 OpenGL parallel
+         random time
+       ];
+       executableHaskellDepends = [
          array base GlomeTrace GlomeVec GLUT haskell98 OpenGL parallel
          random time
        ];
@@ -55456,7 +56815,7 @@ self: {
        pname = "gloss";
        version = "1.9.2.1";
        sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
        jailbreak = true;
@@ -55473,7 +56832,7 @@ self: {
        pname = "gloss";
        version = "1.9.4.1";
        sha256 = "1rdgcv9jmawzgvshnc6pgdl7f2p6a3f09jwjnhmkfxx3gdwr8q5i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
        homepage = "http://gloss.ouroborus.net";
@@ -55486,10 +56845,10 @@ self: {
      mkDerivation {
        pname = "gloss-accelerate";
        version = "1.9.0.0";
-       revision = "1";
        sha256 = "13vr758nl712kpkc8nii05iv1zidsp55ihvaknqzn8zdhyk4dxrv";
+       revision = "1";
        editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff";
-       buildDepends = [ accelerate base gloss gloss-rendering ];
+       libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55500,7 +56859,7 @@ self: {
        pname = "gloss-algorithms";
        version = "1.9.4.1";
        sha256 = "0j8n0769690ikrqwbqp4ba6zz2l4i6211alic3l7mqc2h6rggjs0";
-       buildDepends = [ base containers ghc-prim gloss ];
+       libraryHaskellDepends = [ base containers ghc-prim gloss ];
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
@@ -55511,10 +56870,10 @@ self: {
      mkDerivation {
        pname = "gloss-banana";
        version = "0.1.0.4";
-       revision = "1";
        sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3";
+       revision = "1";
        editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a";
-       buildDepends = [ base gloss reactive-banana ];
+       libraryHaskellDepends = [ base gloss reactive-banana ];
        homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
@@ -55526,7 +56885,7 @@ self: {
        pname = "gloss-devil";
        version = "0.2";
        sha256 = "17gwy13z4lymm9dpj26q4ihcl198gqn9kpcjdw8lcgfcg4gxszsm";
-       buildDepends = [ base bytestring gloss repa repa-devil ];
+       libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55543,7 +56902,7 @@ self: {
        sha256 = "02qsxxbrg8d4338mcj3ka3l2f9qyf3r515b32dm5iingjb8dn5ly";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bmp bytestring containers ghc-prim GLFW-b gloss
          gloss-algorithms gloss-raster gloss-rendering random repa
          repa-algorithms repa-io vector
@@ -55559,7 +56918,7 @@ self: {
        pname = "gloss-game";
        version = "0.3.3.0";
        sha256 = "01k9600f9lv65n9bi2v40gzcl14gg9cm27fxz8yk4kx1hk5hv980";
-       buildDepends = [ base gloss gloss-juicy ];
+       libraryHaskellDepends = [ base gloss gloss-juicy ];
        homepage = "https://github.com/mchakravarty/gloss-game";
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
@@ -55574,7 +56933,12 @@ self: {
        sha256 = "1y525ck3cqqg9zggd88ilzxv1pfcz801s0sdgprw3amzyxn71kqq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bmp bytestring gloss JuicyPixels vector ];
+       libraryHaskellDepends = [
+         base bmp bytestring gloss JuicyPixels vector
+       ];
+       executableHaskellDepends = [
+         base bmp bytestring gloss JuicyPixels vector
+       ];
        homepage = "http://github.com/alpmestan/gloss-juicy";
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
@@ -55582,20 +56946,19 @@ self: {
 
   "gloss-raster" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
-     , llvm, repa
+     , repa
      }:
      mkDerivation {
        pname = "gloss-raster";
        version = "1.9.4.1";
        sha256 = "0q6mqgmi3gx2yx8a3rq4nzk2mz2iidnzl26b5h4zhjgmgz8jawv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
-       extraLibraries = [ llvm ];
        homepage = "http://gloss.ouroborus.net";
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {};
 
   "gloss-raster-accelerate" = callPackage
     ({ mkDerivation, accelerate, accelerate-cuda, base, gloss
@@ -55605,7 +56968,7 @@ self: {
        pname = "gloss-raster-accelerate";
        version = "1.9.0.0";
        sha256 = "0kgjbqharpl9an4kpciiy17chsdlzx5n4mgxp93yja4av8vik3i8";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-cuda base gloss gloss-accelerate
        ];
        description = "Parallel rendering of raster images using Accelerate";
@@ -55618,7 +56981,9 @@ self: {
        pname = "gloss-rendering";
        version = "1.9.3.1";
        sha256 = "1ns9x9fwkvxy0dwgdd3apv3p0d4857h3mkb3dx0rg9rs3wbapyzy";
-       buildDepends = [ base bmp bytestring containers GLUT OpenGL ];
+       libraryHaskellDepends = [
+         base bmp bytestring containers GLUT OpenGL
+       ];
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -55629,7 +56994,7 @@ self: {
        pname = "gloss-sodium";
        version = "0.1.0.0";
        sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za";
-       buildDepends = [ base gloss sodium ];
+       libraryHaskellDepends = [ base gloss sodium ];
        jailbreak = true;
        homepage = "https://github.com/Twey/gloss-sodium";
        description = "A Sodium interface to the Gloss drawing package";
@@ -55642,11 +57007,10 @@ self: {
        pname = "glpk-hs";
        version = "0.3.5";
        sha256 = "1nx0mcy009cj1h2fsz00qfpr9zawagwsp3w370251hdc5q6bw52p";
-       buildDepends = [ array base containers deepseq mtl ];
-       extraLibraries = [ glpk ];
+       libraryHaskellDepends = [ array base containers deepseq mtl ];
+       librarySystemDepends = [ glpk ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) glpk;};
 
   "glue" = callPackage
@@ -55660,11 +57024,15 @@ self: {
        sha256 = "1p93cv8c52dbw0lz48yjpfbrj48giyxrwmc9bymfpgjmynda4zab";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         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 text time
          transformers transformers-base unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base ekg-core hashable hspec lifted-base monad-control
          QuickCheck quickcheck-instances text time transformers
          transformers-base unordered-containers
@@ -55679,7 +57047,9 @@ self: {
        pname = "gluturtle";
        version = "0.0.58.1";
        sha256 = "0jwkppf9ipm61g052r9m65awq3nsigf3q4m9bj2hmb3n9z75i1hp";
-       buildDepends = [ base convertible GLUT stm yjsvg yjtools ];
+       libraryHaskellDepends = [
+         base convertible GLUT stm yjsvg yjtools
+       ];
        description = "turtle like LOGO with glut";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55692,7 +57062,9 @@ self: {
        pname = "gmap";
        version = "0.1";
        sha256 = "0kwx0zknxpda0pjf9hphniz33b9m0md54z8zx09vzkjq7lpljx7r";
-       buildDepends = [ array AvlTree base COrdering QuickCheck random ];
+       libraryHaskellDepends = [
+         array AvlTree base COrdering QuickCheck random
+       ];
        description = "Composable maps and generic tries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55708,7 +57080,7 @@ self: {
        sha256 = "04r7n24jnqgggi19d4l1lj1ag5jrh3zk2pvxwm5xfb7imlg37zm8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ad array base gtk gtkglext mtl OpenGL OpenGLRaw parsec
          priority-queue qd reflection Vec
        ];
@@ -55726,7 +57098,9 @@ self: {
        sha256 = "0ipx8hka4ly3dc3dv6dnk2bq3hbiiahqqragdm1bqgy1plvwa5q6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory gconf glib gtk random ];
+       executableHaskellDepends = [
+         base directory gconf glib gtk random
+       ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55739,10 +57113,10 @@ self: {
        pname = "gnome-keyring";
        version = "0.3.1";
        sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8";
-       buildDepends = [ base bytestring text time ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ gnome_keyring ];
-       pkgconfigDepends = [ gnome_keyring ];
+       libraryHaskellDepends = [ base bytestring text time ];
+       librarySystemDepends = [ gnome_keyring ];
+       libraryPkgconfigDepends = [ gnome_keyring ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://john-millikin.com/software/haskell-gnome-keyring/";
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
@@ -55757,9 +57131,11 @@ self: {
        pname = "gnomevfs";
        version = "0.11.0";
        sha256 = "0g4dic9k1c4221v4kacc46sj2vra1jlnb4pn657zfwbkni8z0kmp";
-       buildDepends = [ array base containers glib gtk haskell98 mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gnome_vfs gnome_vfs_module ];
+       libraryHaskellDepends = [
+         array base containers glib gtk haskell98 mtl
+       ];
+       libraryPkgconfigDepends = [ gnome_vfs gnome_vfs_module ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GNOME Virtual File System library";
@@ -55773,10 +57149,10 @@ self: {
        pname = "gnuidn";
        version = "0.2.1";
        sha256 = "1jii635wc3j1jnwwx24j9gg9xd91g2iw5967acn74p7db62lqx37";
-       buildDepends = [ base bytestring text ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ libidn ];
-       pkgconfigDepends = [ libidn ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ libidn ];
+       libraryPkgconfigDepends = [ libidn ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://john-millikin.com/software/haskell-gnuidn/";
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
@@ -55793,14 +57169,13 @@ self: {
        sha256 = "1rx6gppgikjyd8ndlmc1yx3b4670184l80g8vrpcgjmbq23wjnmh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq filepath process temporary time transformers utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
        description = "2D and 3D plots using gnuplot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnutls" = callPackage
@@ -55810,9 +57185,9 @@ self: {
        pname = "gnutls";
        version = "0.2";
        sha256 = "1c5pm0d80wpgh2bkcgbvmc72agf89h8ghfnrn1m1x3fljbgzvrn0";
-       buildDepends = [ base bytestring monads-tf transformers ];
-       extraLibraries = [ gnutls ];
-       pkgconfigDepends = [ gnutls ];
+       libraryHaskellDepends = [ base bytestring monads-tf transformers ];
+       librarySystemDepends = [ gnutls ];
+       libraryPkgconfigDepends = [ gnutls ];
        homepage = "https://john-millikin.com/software/haskell-gnutls/";
        description = "Bindings for GNU libgnutls";
        license = stdenv.lib.licenses.gpl3;
@@ -55823,10 +57198,10 @@ self: {
      mkDerivation {
        pname = "goa";
        version = "3.3";
-       revision = "1";
        sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk";
+       revision = "1";
        editedCabalFile = "5ae2bd1f4c29e22070fa32e5c126066813467ffe71a912148304d6f30d200137";
-       buildDepends = [ base directory filepath process ];
+       libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55840,8 +57215,10 @@ self: {
        pname = "goatee";
        version = "0.3.0";
        sha256 = "1py0cnmvqnjdf6bwwn8p6c78p9qnmk82932j7j6y2q91yhna6b2d";
-       buildDepends = [ base containers mtl parsec template-haskell ];
-       testDepends = [ base containers HUnit mtl parsec ];
+       libraryHaskellDepends = [
+         base containers mtl parsec template-haskell
+       ];
+       testHaskellDepends = [ base containers HUnit mtl parsec ];
        homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
@@ -55858,10 +57235,11 @@ self: {
        sha256 = "0wdspqs5pfa4axys87c8bci2s3y475fddjrdwh1kvc9vdsanb7xv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers directory filepath goatee gtk mtl parsec
        ];
-       testDepends = [ base HUnit ];
+       executableHaskellDepends = [ base gtk ];
+       testHaskellDepends = [ base HUnit ];
        jailbreak = true;
        homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
@@ -55875,7 +57253,7 @@ self: {
        pname = "gofer-prelude";
        version = "2.30.3";
        sha256 = "1whl3fvwxh26nsb4l6brljsmwl891w5yxlsv69mdfvfb1rl7p64f";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://code.haskell.org/~dons/code/gofer-prelude";
        description = "The Gofer 2.30 standard prelude";
        license = stdenv.lib.licenses.bsd3;
@@ -55888,7 +57266,7 @@ self: {
        pname = "google-dictionary";
        version = "0.1.0.2";
        sha256 = "12ib4y8cjg0dvvizy8yxgjaqvyawdy7vxmh1ab12b4yg40wwsg6g";
-       buildDepends = [ aeson base bytestring HTTP lens mtl ];
+       libraryHaskellDepends = [ aeson base bytestring HTTP lens mtl ];
        homepage = "https://github.com/mitchellwrosen/google-dictionary-api";
        description = "Simple interface to the google.com/dictionary API";
        license = stdenv.lib.licenses.bsd3;
@@ -55904,11 +57282,11 @@ self: {
        pname = "google-drive";
        version = "0.3.1";
        sha256 = "0fzz9dgb2l5zcfjrzf4bqv0dgjhy12r9i1h66y1mji2z0f9qj37y";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra directory filepath
          http-conduit http-types mtl random resourcet text time timerep
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra directory google-oauth2 hspec
          hspec-expectations-lifted load-env text time
        ];
@@ -55927,7 +57305,7 @@ self: {
        sha256 = "0wkblf0i4lfw6s8adf2clcqj3161863vbsq1cip3rcn9djqbimzl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html cmdargs data-default hamlet pandoc shakespeare-css
          syb text time
        ];
@@ -55945,10 +57323,10 @@ self: {
        pname = "google-mail-filters";
        version = "0.0.1.1";
        sha256 = "0cxslr062h536q4vgs16r2s1lm7x5m9lcy1hzif6mpnmvjzqsn11";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers google-search old-locale text time xml-conduit
        ];
-       testDepends = [ base google-search text time xml-conduit ];
+       testHaskellDepends = [ base google-search text time xml-conduit ];
        homepage = "https://github.com/liyang/google-mail-filters";
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
@@ -55963,8 +57341,10 @@ self: {
        pname = "google-oauth2";
        version = "0.2.0";
        sha256 = "15aqwbr8wb1ghzy0r0k3fvfr187d9s3zz21lp07ci9pyz8ln8z08";
-       buildDepends = [ aeson base bytestring HTTP http-conduit ];
-       testDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring HTTP http-conduit
+       ];
+       testHaskellDepends = [
          base bytestring hspec http-conduit http-types load-env
        ];
        jailbreak = true;
@@ -55978,7 +57358,7 @@ self: {
        pname = "google-search";
        version = "0.1.0.1";
        sha256 = "0nkpvp5zjf3mkhqv6z5xvrmr6b6d5zgmzlh67y7ssslp4620m5m7";
-       buildDepends = [ base free nats old-locale text time ];
+       libraryHaskellDepends = [ base free nats old-locale text time ];
        homepage = "https://github.com/liyang/google-search";
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -55994,7 +57374,7 @@ self: {
        pname = "googleplus";
        version = "0.3.1.1";
        sha256 = "046fvrr8cg00wagx4vdx35l2xk8qbs7fbs0v5hj45h4jk9dnk2jg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers enumerator haskell98
          http-enumerator http-types mtl text time timerep transformers url
        ];
@@ -56015,7 +57395,7 @@ self: {
        sha256 = "0qa4xs07975spf4pwc2y0hichn4x8l7kn2949v0j19gbd099vjng";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HDBC HDBC-postgresql MissingH network parsec unix
        ];
        description = "Spidering robot to download files from Gopherspace";
@@ -56034,7 +57414,7 @@ self: {
        sha256 = "1zwz065fdg3k09nh976igr90p1qpb397fyi7jh941c512m70qbxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal cmdargs containers csv deepseq directory
          filepath haskell-src-exts hint HTTP network process syb tar
          uniplate uu-parsinglib zlib
@@ -56050,7 +57430,7 @@ self: {
        pname = "gpcsets";
        version = "0.9.2.0";
        sha256 = "1fm0k6n6fb5a3wvmb2l6k4zq3sdfxv16cb2y2zmjgxgj5n3gy9s8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generalized Pitch Class Sets for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56061,7 +57441,7 @@ self: {
        pname = "gpolyline";
        version = "0.1.0.1";
        sha256 = "01bsl7s8r33jgvk9lyca02awj43acii8spa6sskz19ivhm2adcr8";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/fegu/gpolyline";
        description = "Pure module for encoding/decoding Google Polyline";
        license = stdenv.lib.licenses.bsd3;
@@ -56076,10 +57456,10 @@ self: {
        pname = "gps";
        version = "1.2";
        sha256 = "1krq6sv9qblwqlx7j6gb5qfv5zarxlyvaj6svhd4n8f7pr5w510r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base pretty prettyclass statistics text time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base gpx-conduit QuickCheck statistics test-framework
          test-framework-quickcheck2 time vector
        ];
@@ -56099,7 +57479,7 @@ self: {
        sha256 = "1n6a1c6w3wmyaqan3ymlrk36h98yvy40wgwfdah4ayyxlsmvvxg8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo Chart cmdargs colour data-accessor directory
          filepath gd gps GPX hsmagick html http-enumerator process random
          tar time xsd
@@ -56119,7 +57499,7 @@ self: {
        pname = "gpx-conduit";
        version = "0.1.1";
        sha256 = "0ffb0npx0yb69qxdcdznxpw36zjp2za7vdpzy2r5l245y0xr7mj4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base conduit filepath monad-control old-locale text time
          void xml-conduit xml-types
        ];
@@ -56137,8 +57517,8 @@ self: {
        pname = "graceful";
        version = "0.1.1.5";
        sha256 = "1kl4y01ny5w1y77r2jf830d7vd99by7frk106m2wc9nbl066mbhr";
-       buildDepends = [ base directory network stm unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base directory network stm unix ];
+       testHaskellDepends = [
          base directory filepath hspec network process stm unix
        ];
        description = "Library to write graceful shutdown / upgrade service";
@@ -56154,7 +57534,7 @@ self: {
        pname = "grammar-combinators";
        version = "0.2.7";
        sha256 = "1z7i1270g919g1756wgfap2mfhvln13bhgya2pw4b9lbr5fphkdd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers enumerable fgl graphviz MaybeT mtl multirec parsec
          template-haskell text uu-parsinglib
        ];
@@ -56171,7 +57551,7 @@ self: {
        pname = "grapefruit-examples";
        version = "0.1.0.5";
        sha256 = "0ad64jnp71gh7rj3rlfw7z67l5xnmc052g5q3slw3s6ga7spajlr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base colour containers fraction grapefruit-frp grapefruit-records
          grapefruit-ui
        ];
@@ -56189,7 +57569,7 @@ self: {
        pname = "grapefruit-frp";
        version = "0.1.0.5";
        sha256 = "155hmjflmzm463b00r1jjwbpjq8ilwss5xqwi6nz6lm3xbc2ddhm";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base containers fingertree semigroups TypeCompose
        ];
        jailbreak = true;
@@ -56205,7 +57585,7 @@ self: {
        pname = "grapefruit-records";
        version = "0.1.0.5";
        sha256 = "02hyrbsz20fl9mnynval55xar175vgy77s23zaq66r3f8c6gf6h1";
-       buildDepends = [ arrows base grapefruit-frp ];
+       libraryHaskellDepends = [ arrows base grapefruit-frp ];
        homepage = "http://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -56220,7 +57600,7 @@ self: {
        pname = "grapefruit-ui";
        version = "0.1.0.5";
        sha256 = "11xxvg2847vyzpw8i11a6mnflyr639hdwj51r9pfyaq95034q9jq";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base colour containers fraction grapefruit-frp
          grapefruit-records
        ];
@@ -56238,7 +57618,7 @@ self: {
        pname = "grapefruit-ui-gtk";
        version = "0.1.0.5";
        sha256 = "106svyjnv72f0ikcfxgq8zagqxcn52yc1f31kfgz9258mmdki49z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base colour containers fraction glib grapefruit-frp
          grapefruit-records grapefruit-ui gtk
        ];
@@ -56256,11 +57636,11 @@ self: {
        pname = "graph-core";
        version = "0.2.2.0";
        sha256 = "0czqcdg7w7al7gl339b9l15kn5n79zmdjbic3gn9mblnjb1666r9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hashable mtl QuickCheck safe
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq hashable HTF mtl QuickCheck safe
          unordered-containers vector
        ];
@@ -56277,8 +57657,10 @@ self: {
        pname = "graph-generators";
        version = "0.1.2.0";
        sha256 = "0iw22rmlhryc0z6k92lzdyjkc1qs98lj2509rk7qc7z0ghbhir9s";
-       buildDepends = [ base containers fgl multiset mwc-random ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers fgl multiset mwc-random
+       ];
+       testHaskellDepends = [
          base Cabal containers fgl hspec hspec-expectations multiset
          mwc-random QuickCheck
        ];
@@ -56294,7 +57676,7 @@ self: {
        pname = "graph-matchings";
        version = "0.1.0.0";
        sha256 = "0dzkv13w06hkxg2vkbblpskvsq02c2ay06rw2j4vyjpw13hms5bv";
-       buildDepends = [ base containers fgl ];
+       libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
        license = stdenv.lib.licenses.lgpl21;
      }) {};
@@ -56305,7 +57687,9 @@ self: {
        pname = "graph-rewriting";
        version = "0.7.6";
        sha256 = "014zsw98ksylr4g1ax3xxlsh9jiybaz7xjapl2h88a8ma91da3jz";
-       buildDepends = [ base base-unicode-symbols containers mtl ];
+       libraryHaskellDepends = [
+         base base-unicode-symbols containers mtl
+       ];
        jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
@@ -56323,7 +57707,7 @@ self: {
        sha256 = "0rwycs3vnzy9awm081h836136s2wjyk9qyhsx9j6z7y3lgsb2cr0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
        ];
@@ -56342,7 +57726,7 @@ self: {
        pname = "graph-rewriting-gl";
        version = "0.7.5";
        sha256 = "0cynzhr226944w3sn13bdnl60z9fy87va5fjayd4g0as2168ikhy";
-       buildDepends = [
+       libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols containers GLUT graph-rewriting
          graph-rewriting-layout OpenGL
        ];
@@ -56364,7 +57748,7 @@ self: {
        sha256 = "1qwy2mn22a5ppz3lrqz6czxrr3j26zxpp6lm3sf121k3a78c7vvp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout graph-rewriting-strategies IndentParser
          OpenGL parsec
@@ -56384,7 +57768,7 @@ self: {
        pname = "graph-rewriting-layout";
        version = "0.5.3";
        sha256 = "09fscyaknd3nhqn7d3wa4j8n2yagmmfk661m41cqx5hlay60x5f5";
-       buildDepends = [
+       libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols graph-rewriting
        ];
        jailbreak = true;
@@ -56404,7 +57788,7 @@ self: {
        sha256 = "0jdfwcz427lx3r0alba1rphc6hj43mqygkdqmwn37yll4r1c62a4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
        ];
@@ -56423,7 +57807,7 @@ self: {
        pname = "graph-rewriting-strategies";
        version = "0.2.3";
        sha256 = "0mimp7xbmnp9c2j8hr09qivc6kgfi4g63p071s560laddins39jr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols containers graph-rewriting
        ];
        jailbreak = true;
@@ -56444,7 +57828,7 @@ self: {
        sha256 = "1v8imc3ym0jjyhpw10xh36l060nvd0klp9llnmdnv8qkmy7pn8yg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols containers directory filepath GLUT
          graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL
          uu-parsinglib
@@ -56467,7 +57851,7 @@ self: {
        sha256 = "169s5iy15q9ll12fjxizrc0l2q34rvqmxfpbcanc602cj3inav2w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout IndentParser OpenGL parsec
        ];
@@ -56484,7 +57868,7 @@ self: {
        pname = "graph-serialize";
        version = "0.2";
        sha256 = "1a9qq5gpyxg6j6ja3kjldnf11wywjvvxpwvgiahlsrmwfw2c8d74";
-       buildDepends = [ array base bytestring containers ];
+       libraryHaskellDepends = [ array base bytestring containers ];
        homepage = "http://github.com/nominolo/graph-serialize";
        description = "Serialization of data structures with references";
        license = stdenv.lib.licenses.bsd3;
@@ -56498,7 +57882,7 @@ self: {
        pname = "graph-utils";
        version = "0.3.7";
        sha256 = "06wl6i8z0gfndr96g5ps11h877rbwvi1d9cbbr3d2whvbcsyclsf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fgl mtl parsec syb template-haskell
        ];
        jailbreak = true;
@@ -56516,7 +57900,7 @@ self: {
        pname = "graph-visit";
        version = "0.1.0.2";
        sha256 = "0afj0wqpk549n0xs4vqcblrxs1d6knmxcldfnmz5vy2da5zlfn0q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-lens data-lens-template mtl
        ];
        homepage = "https://github.com/atzedijkstra/graph-visit";
@@ -56532,8 +57916,10 @@ self: {
        pname = "graph-wrapper";
        version = "0.2.5.1";
        sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3";
-       buildDepends = [ array base containers ];
-       testDepends = [ array base containers deepseq hspec QuickCheck ];
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [
+         array base containers deepseq hspec QuickCheck
+       ];
        homepage = "https://github.com/soenkehahn/graph-wrapper";
        description = "A wrapper around the standard Data.Graph with a less awkward interface";
        license = stdenv.lib.licenses.bsd3;
@@ -56547,8 +57933,8 @@ self: {
        pname = "graphbuilder";
        version = "0.1.0.0";
        sha256 = "0zhjzb53qaj6dy6ncqjaxdfrs2hwfy4g9czybpsgnbniqm07i22b";
-       buildDepends = [ base containers mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [
          base containers mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -56567,7 +57953,7 @@ self: {
        pname = "graphene";
        version = "0.1.0.4";
        sha256 = "09q57hqf3s29y3b6wn79wa9ksm5r2p75ww3kpwqmigvngy4sz006";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers hashable lens-family lens-family-core
          mtl transformers
        ];
@@ -56587,12 +57973,13 @@ self: {
        sha256 = "0j0ilr54pdz61c78khy8bm37g89cvk1n56h5d6c55jabsv5gx3sf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bitmap bitmap-opengl FTGL OpenGL stb-image ];
+       libraryHaskellDepends = [
+         base bitmap bitmap-opengl FTGL OpenGL stb-image
+       ];
        jailbreak = true;
        homepage = "http://github.com/luqui/graphics-drawingcombinators";
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -56603,7 +57990,7 @@ self: {
        pname = "graphics-formats-collada";
        version = "0.3.1";
        sha256 = "1kfx1c2x8v2i7ckhjiqv7ghhn44w7fscghxkn1iqkp3mj1p3xvbv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitmap-opengl containers hxt OpenGL stb-image transformers
        ];
        jailbreak = true;
@@ -56619,7 +58006,7 @@ self: {
        pname = "graphicsFormats";
        version = "0.1";
        sha256 = "0bcqj0n8qqaqfrn21qgkf8si5qgxl3qlsc8djy0rqhnfi2grb8nh";
-       buildDepends = [ base haskell98 OpenGL QuickCheck ];
+       libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56635,9 +58022,10 @@ self: {
        sha256 = "0hcz8w6yf7dls4sv0i5kihs22ysv0dl63q5bs5y4hgv6d747psp8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL containers CV directory ghc-prim wx wxcore
        ];
+       executableHaskellDepends = [ base CV wx wxcore ];
        homepage = "https://yousource.it.jyu.fi/cvlab/pages/GraphicsTools";
        description = "Tools for creating graphical UIs, based on wxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -56654,7 +58042,7 @@ self: {
        sha256 = "02p1x44ywv2mb4l2dsz9z3ybnvv4nns3882lqm3nc8sw2hkib8z3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory dotgen filepath haskell-lexer
        ];
        homepage = "http://github.com/yav/graphmod/wiki";
@@ -56668,7 +58056,9 @@ self: {
        pname = "graphs";
        version = "0.6.0.1";
        sha256 = "061n1k5v6izpa77wyxch3ym4hzs1k64a902x2250gi724mj3mjsk";
-       buildDepends = [ array base containers transformers void ];
+       libraryHaskellDepends = [
+         array base containers transformers void
+       ];
        homepage = "http://github.com/ekmett/graphs";
        description = "A simple monadic graph library";
        license = stdenv.lib.licenses.bsd3;
@@ -56684,7 +58074,7 @@ self: {
        sha256 = "13nblgd4b3pwpw8idvbd54fq2lf233vj8gvsl0qr381lsvj69fbi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers dotgen haskell-src-exts haskell98 uniplate
        ];
        homepage = "http://github.com/explicitcall/graphtype";
@@ -56704,11 +58094,16 @@ self: {
        sha256 = "1zfndf5mpwx3nrgybxg5hy8n30zwsfx6jgp9468b0pp8c5h65j13";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring colour containers directory dlist fgl filepath
          polyparse process temporary text transformers wl-pprint-text
        ];
-       testDepends = [ base containers fgl filepath QuickCheck text ];
+       executableHaskellDepends = [
+         base bytestring directory filepath text
+       ];
+       testHaskellDepends = [
+         base containers fgl filepath QuickCheck text
+       ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
@@ -56723,8 +58118,10 @@ self: {
        pname = "gravatar";
        version = "0.8.0";
        sha256 = "1mzl08qzwzzhz6bvkz4qnrdnzsgvsmi2lnhzf743yzx4msn00q3g";
-       buildDepends = [ base bytestring data-default HTTP pureMD5 text ];
-       testDepends = [ base hspec text ];
+       libraryHaskellDepends = [
+         base bytestring data-default HTTP pureMD5 text
+       ];
+       testHaskellDepends = [ base hspec text ];
        description = "Generate Gravatar image URLs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -56735,8 +58132,8 @@ self: {
        pname = "gray-code";
        version = "0.3.1";
        sha256 = "0b0pm24mxjsxg95q6yisr9pa0jfklsfw66cicryib42czvv083av";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://bitbucket.org/astanin/hs-gray-code";
        description = "Gray code encoder/decoder";
        license = stdenv.lib.licenses.bsd3;
@@ -56750,8 +58147,8 @@ self: {
        pname = "gray-extended";
        version = "1.5.1";
        sha256 = "1lami8ncp9d4k25vzb23gz9067ahp8vws378qb57hnkisfnn932q";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -56768,7 +58165,8 @@ self: {
        sha256 = "1vl9p6mqss5r4jfqnjir7m1q7fhh9f204c99qd5y5d0j7yc26r5y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers pretty ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ array base containers pretty ];
        homepage = "https://github.com/sof/greencard";
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -56781,7 +58179,7 @@ self: {
        pname = "greencard-lib";
        version = "3.0.1";
        sha256 = "1a8h36kclb5db7kfy1pb4h2pwy6a6wwnjpm21xzvc9fjx9vj44kd";
-       buildDepends = [ array base containers greencard pretty ];
+       libraryHaskellDepends = [ array base containers greencard pretty ];
        homepage = "http://www.haskell.org/greencard/";
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -56796,7 +58194,7 @@ self: {
        pname = "greg-client";
        version = "1.0.2";
        sha256 = "1p645qgn5i194mna20ariypxp0dci7lzyxhszmnyylpd0icyg4in";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring clock hostname network stm system-uuid time
        ];
        homepage = "http://code.google.com/p/greg/";
@@ -56813,8 +58211,8 @@ self: {
        pname = "grid";
        version = "7.8.4";
        sha256 = "1jci2191l6k1qlch54id7z05zn9lp5lzyh7g6hm9s522z97lgb2k";
-       buildDepends = [ base cereal containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base cereal containers ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -56833,12 +58231,13 @@ self: {
        sha256 = "0q5p73n6h5ngg992f1msdqzxds2baafjypdx53zf2rdhbqp4fdi9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array astar base containers grid htiled mtl random safe SDL SDL-gfx
          SDL-image SDL-mixer tuple vector
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grm" = callPackage
@@ -56851,10 +58250,13 @@ self: {
        sha256 = "1za45931c6avyqxb6dwiafl739fmwdk68kxpk13zkv0jwxxpp9px";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath process syb wl-pprint
+       ];
+       executableHaskellDepends = [
          base Cabal cmdargs directory filepath parsec process syb wl-pprint
        ];
-       buildTools = [ happy ];
+       executableToolDepends = [ happy ];
        description = "grm grammar converter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56866,7 +58268,7 @@ self: {
        pname = "groom";
        version = "0.1.2";
        sha256 = "045hzpnf17rp1ib6q3gcznl9b7ivz5zmv0gh7qfg726kr8i030hf";
-       buildDepends = [ base haskell-src-exts ];
+       libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty printing for well-behaved Show instances";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -56880,10 +58282,10 @@ self: {
      mkDerivation {
        pname = "groundhog";
        version = "0.7.0.3";
-       revision = "1";
        sha256 = "0n5c501wfyqcl1iy4017yyxp95kz7mb4lgc0mjjk9si36ixkww9r";
+       revision = "1";
        editedCabalFile = "dcf9bbeaf0fd7e7ac0809902a54779097e8935a07b1e7e43c404bc683c17e7f0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          containers monad-control monad-logger mtl scientific text time
          transformers transformers-base
@@ -56904,10 +58306,13 @@ self: {
        sha256 = "14wxmn18z4022vkakyrdl7mz7zbdaa3dnwbb52ymg3f5r13lr7lh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson-pretty base bytestring cmdargs containers groundhog
-         groundhog-sqlite groundhog-th mtl regex-compat syb template-haskell
-         text time transformers
+       libraryHaskellDepends = [
+         aeson-pretty base bytestring containers groundhog groundhog-th
+         regex-compat syb template-haskell text time transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs containers groundhog groundhog-sqlite
+         groundhog-th mtl
        ];
        jailbreak = true;
        homepage = "http://github.com/lykahb/groundhog";
@@ -56924,7 +58329,7 @@ self: {
        pname = "groundhog-mysql";
        version = "0.7.0.1";
        sha256 = "01pnninva0va0pl9k7mjk2l7fm42978j9x82sj8z7cscshvl327f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers groundhog monad-control monad-logger
          mysql mysql-simple resource-pool text time transformers
        ];
@@ -56942,7 +58347,7 @@ self: {
        pname = "groundhog-postgresql";
        version = "0.7.0.2";
        sha256 = "18wdj51v6qqyqx10lvknr3irhs5qddvh301bx7l9cdcpkk1la81i";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers groundhog
          monad-control monad-logger postgresql-libpq postgresql-simple
          resource-pool text time transformers
@@ -56960,7 +58365,7 @@ self: {
        pname = "groundhog-sqlite";
        version = "0.7.0.1";
        sha256 = "0lsm9yfapdpy4nf5bxrbjkvw9nwc82qfmyw1h9l3mc4b8nfp12dy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers direct-sqlite groundhog monad-control
          monad-logger resource-pool text transformers unordered-containers
        ];
@@ -56976,7 +58381,7 @@ self: {
        pname = "groundhog-th";
        version = "0.7.0.1";
        sha256 = "15g07rzw2jygzs5p9jflq6l2rjrmf03lj8pprzc4vgwvk04x233h";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers groundhog template-haskell text
          time unordered-containers yaml
        ];
@@ -56992,8 +58397,8 @@ self: {
        pname = "group-with";
        version = "0.2.0.2";
        sha256 = "0c7p3bj3b68h2zp0lzldfjwq7x2a38v0gnxyflisawdg61jnx8h6";
-       buildDepends = [ base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base Cabal containers hspec hspec-expectations QuickCheck
        ];
        jailbreak = true;
@@ -57008,7 +58413,7 @@ self: {
        pname = "groupoid";
        version = "0.1.0";
        sha256 = "0gpjlq9f2il4vp7ihh1sf5g2jr1rbi5big5c6dhjk961n8b1dq0z";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "A Groupoid class";
        license = stdenv.lib.licenses.bsd3;
@@ -57020,7 +58425,7 @@ self: {
        pname = "groupoids";
        version = "4.0";
        sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6";
-       buildDepends = [ base semigroupoids ];
+       libraryHaskellDepends = [ base semigroupoids ];
        homepage = "http://github.com/ekmett/groupoids/";
        description = "This package has been absorbed into semigroupoids 4.0";
        license = stdenv.lib.licenses.bsd3;
@@ -57032,7 +58437,7 @@ self: {
        pname = "groups";
        version = "0.4.0.0";
        sha256 = "1kp8h3617cimya8nnadljyy4vk66dzl5nzfm900k2gh3ci8kja6k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell 98 groups";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57048,7 +58453,7 @@ self: {
        pname = "growler";
        version = "0.6.0";
        sha256 = "0skykz2p0kcs8g1vq7832h7fnw193hpq4pplkcaxazg8z97k8q75";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive either
          http-types lens monad-control mtl pipes pipes-aeson pipes-wai
          regex-compat text transformers transformers-base
@@ -57070,7 +58475,8 @@ self: {
        sha256 = "0is9bpaalyr78g0hfp6bbmny4w6w8a3aj9a041f82499hhy0vv0h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ruff ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath FTGL gtk gtkglext mtl
          old-locale OpenGL OpenGLRaw parallel qd qd-vec ruff time Vec
        ];
@@ -57090,7 +58496,7 @@ self: {
        sha256 = "02ygb88zxikf5ggw9ypyzganngk4dgfcszpkyzy6cwm47mksdzg7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers data-memocombinators filepath gruff qd qd-vec
          random ruff Vec
        ];
@@ -57106,8 +58512,8 @@ self: {
        pname = "gsasl";
        version = "0.3.6";
        sha256 = "0cgrw5ypkwp4mzj8m12q783jqng1jp1j7ny15704jmjxbq13cq3q";
-       buildDepends = [ base bytestring transformers ];
-       pkgconfigDepends = [ gsasl ];
+       libraryHaskellDepends = [ base bytestring transformers ];
+       libraryPkgconfigDepends = [ gsasl ];
        homepage = "https://john-millikin.com/software/haskell-gsasl/";
        description = "Bindings for GNU libgsasl";
        license = stdenv.lib.licenses.gpl3;
@@ -57119,10 +58525,9 @@ self: {
        pname = "gsc-weighting";
        version = "0.2.2";
        sha256 = "0y80j5qk601c965assl8d91k9bpvzijn2z0w64n2ksij9lm6b8p5";
-       buildDepends = [ base hierarchical-clustering ];
+       libraryHaskellDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsl-random" = callPackage
@@ -57131,7 +58536,7 @@ self: {
        pname = "gsl-random";
        version = "0.5.0";
        sha256 = "0bhwi2ianxazyxyp2siczk8rfdnj4dx3rfz5d82bag2xcbzcrbfj";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://github.com/patperry/hs-gsl-random";
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
@@ -57144,7 +58549,7 @@ self: {
        pname = "gsl-random-fu";
        version = "0.0.0.1";
        sha256 = "1qf5m3zksn16mlgavrwbq6yd1mbyafy27qf1ws4nmkxl8ci0k48i";
-       buildDepends = [ base gsl-random random-fu ];
+       libraryHaskellDepends = [ base gsl-random random-fu ];
        homepage = "http://code.haskell.org/~mokus/gsl-random-fu";
        description = "Instances for using gsl-random with random-fu";
        license = stdenv.lib.licenses.publicDomain;
@@ -57161,7 +58566,7 @@ self: {
        sha256 = "15ddm69fmk0nkkrs5g80amdvld2mq59ah58nbnk83mwkffpi484f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl parsec permute sindre text X11
        ];
        jailbreak = true;
@@ -57179,9 +58584,11 @@ self: {
        pname = "gstreamer";
        version = "0.12.5.0";
        sha256 = "0grg20wsvdyfpm2y3ykw7d3j7s2hlbs8psjwfy0yfz3839yvccy6";
-       buildDepends = [ array base bytestring directory glib mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gst_plugins_base gstreamer ];
+       libraryHaskellDepends = [
+         array base bytestring directory glib mtl
+       ];
+       libraryPkgconfigDepends = [ gst_plugins_base gstreamer ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
@@ -57199,7 +58606,7 @@ self: {
        sha256 = "1mkccxgnvgjxkbsdl6bcn61yv0zi20i8h9z11hqcfd3ibfnsw7bh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers extensible-exceptions haskeline HTTP json mtl unix
          url utf8-string
        ];
@@ -57215,7 +58622,9 @@ self: {
        pname = "gtfs";
        version = "0.1";
        sha256 = "0m0i13xpj9wz6ykngwfqi2vnrliwf0y1d2cxg9254dm865l5gvsi";
-       buildDepends = [ base csv directory filepath rowrecord split ];
+       libraryHaskellDepends = [
+         base csv directory filepath rowrecord split
+       ];
        description = "The General Transit Feed Specification format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57229,11 +58638,11 @@ self: {
        pname = "gtk";
        version = "0.13.9";
        sha256 = "1mdz3s03y69713cr3grn8gawimykk8rs1f9vgch8a8q04ivhkq0j";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk ];
+       libraryPkgconfigDepends = [ gtk ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57247,7 +58656,7 @@ self: {
        pname = "gtk-helpers";
        version = "0.0.7";
        sha256 = "0cx43z79r77ksicgz4ajg8b4hhllyfadcb46zdh6lg088zsgc6v7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base gio glib gtk mtl process template-haskell
        ];
        homepage = "http://keera.es/blog/community";
@@ -57261,7 +58670,7 @@ self: {
        pname = "gtk-jsinput";
        version = "0.0.0";
        sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0";
-       buildDepends = [ base gtk json transformers ];
+       libraryHaskellDepends = [ base gtk json transformers ];
        homepage = "http://github.com/timthelion/gtk-jsinput";
        description = "A simple custom form widget for gtk which allows inputing of JSON values";
        license = stdenv.lib.licenses.gpl3;
@@ -57275,8 +58684,10 @@ self: {
        pname = "gtk-largeTreeStore";
        version = "0.0.1.0";
        sha256 = "0nzddvm17gqkdjpkls4rd5lxshx8fwvn35b9r3njqqpm2yi5qci0";
-       buildDepends = [ base containers glib gtk3 mtl nested-sets ];
-       testDepends = [ base containers gtk3 hspec ];
+       libraryHaskellDepends = [
+         base containers glib gtk3 mtl nested-sets
+       ];
+       testHaskellDepends = [ base containers gtk3 hspec ];
        description = "Large TreeStore support for gtk2hs";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -57289,9 +58700,9 @@ self: {
        pname = "gtk-mac-integration";
        version = "0.3.1.1";
        sha256 = "02s5ksr8fkqlbwlq468v93w0is1xa73wswgxahyyvhh51wnqp3ax";
-       buildDepends = [ array base containers glib gtk mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk-mac-integration-gtk2 ];
+       libraryHaskellDepends = [ array base containers glib gtk mtl ];
+       libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57305,7 +58716,9 @@ self: {
        pname = "gtk-serialized-event";
        version = "0.12.0";
        sha256 = "0gh8kwd9758ws941xbxhrm3144pmnqln0md5r6vjbq7s1x54bsrf";
-       buildDepends = [ array base containers glib gtk haskell98 mtl ];
+       libraryHaskellDepends = [
+         array base containers glib gtk haskell98 mtl
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "GTK+ Serialized event";
@@ -57319,7 +58732,7 @@ self: {
        pname = "gtk-simple-list-view";
        version = "0.0.0";
        sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws";
-       buildDepends = [ base gtk ];
+       libraryHaskellDepends = [ base gtk ];
        homepage = "http://github.com/timthelion/gtk-simple-list-view";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views";
        license = stdenv.lib.licenses.gpl3;
@@ -57331,7 +58744,7 @@ self: {
        pname = "gtk-toggle-button-list";
        version = "0.0.0";
        sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706";
-       buildDepends = [ base gtk ];
+       libraryHaskellDepends = [ base gtk ];
        homepage = "http://github.com/timthelion/gtk-toggle-button-list";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists";
        license = stdenv.lib.licenses.gpl3;
@@ -57343,7 +58756,7 @@ self: {
        pname = "gtk-toy";
        version = "0.2.0";
        sha256 = "0zf3k0c5h5wcgkqr8np5kvgz4c9nha86k5whsn4f1wk0ikj98dfq";
-       buildDepends = [ base containers gtk ];
+       libraryHaskellDepends = [ base containers gtk ];
        jailbreak = true;
        description = "Convenient Gtk canvas with mouse and keyboard input";
        license = stdenv.lib.licenses.bsd3;
@@ -57356,8 +58769,8 @@ self: {
        pname = "gtk-traymanager";
        version = "0.1.5";
        sha256 = "0hzl9pa5vx04vslb2visx35wwjagzzi1j5gyk5acy8pym8ly50hm";
-       buildDepends = [ base glib gtk ];
-       pkgconfigDepends = [ x11 ];
+       libraryHaskellDepends = [ base glib gtk ];
+       libraryPkgconfigDepends = [ x11 ];
        homepage = "http://github.com/travitch/gtk-traymanager";
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
@@ -57373,11 +58786,11 @@ self: {
        sha256 = "041mprflgqc74qb21czzy3m2nzj5mc3ji4i60f04dh2f2bac491a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath hashtables pretty process
          random
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Tools to build the Gtk2Hs suite of User Interface libraries";
        license = stdenv.lib.licenses.gpl2;
@@ -57391,7 +58804,7 @@ self: {
        pname = "gtk2hs-cast-glade";
        version = "0.10.1.1";
        sha256 = "0azyf3h53r5dqvz66bbvqk9qp418v0mq0yzd1ia6pc6d7ypknkx6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base glade gtk gtk2hs-cast-glib hint template-haskell
        ];
        description = "A type class for cast functions of Gtk2hs: glade package";
@@ -57405,7 +58818,7 @@ self: {
        pname = "gtk2hs-cast-glib";
        version = "0.10.1.1";
        sha256 = "1bsz1zyz2hxf07q6xr232aciwxl3819jklj16hqqbfjwm4mzn2mp";
-       buildDepends = [ base glib ];
+       libraryHaskellDepends = [ base glib ];
        description = "A type class for cast functions of Gtk2hs: glib package";
        license = "unknown";
      }) {};
@@ -57418,7 +58831,7 @@ self: {
        pname = "gtk2hs-cast-gnomevfs";
        version = "0.10.1.2";
        sha256 = "0fkrrsvagsn51rn0b16y8ac3fg509wrxqdfwsij9nbprcd8iz75g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gnomevfs gtk2hs-cast-glib gtk2hs-cast-th hint template-haskell
        ];
        description = "A type class for cast functions of Gtk2hs: gnomevfs package";
@@ -57434,7 +58847,7 @@ self: {
        pname = "gtk2hs-cast-gtk";
        version = "0.10.1.2";
        sha256 = "15d6c0mdd9nzpb310n19kyw0jqv019w17ncxxhg3wk90ckb43l3j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk gtk2hs-cast-glib gtk2hs-cast-th hint template-haskell
        ];
        description = "A type class for cast functions of Gtk2hs: gtk package";
@@ -57450,7 +58863,7 @@ self: {
        pname = "gtk2hs-cast-gtkglext";
        version = "0.10.1.2";
        sha256 = "05m4h8wh820mwiarrysa4fkxj14l90ky89kv24irpa3vw27xnsm9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk2hs-cast-glib gtk2hs-cast-th gtkglext hint template-haskell
        ];
        description = "A type class for cast functions of Gtk2hs: gtkglext package";
@@ -57466,7 +58879,7 @@ self: {
        pname = "gtk2hs-cast-gtksourceview2";
        version = "0.10.1.2";
        sha256 = "1fyca2kwjc4hk9jqshn9hzq4m7415kapdln1nv0rgxsd1iabjk81";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk2hs-cast-glib gtk2hs-cast-th gtksourceview2 hint
          template-haskell
        ];
@@ -57480,7 +58893,7 @@ self: {
        pname = "gtk2hs-cast-th";
        version = "0.10.1.0";
        sha256 = "19a7qb0dlfqw22fz7m94xyzbssvia106wlvy3brag5nhfza833px";
-       buildDepends = [ base hint template-haskell ];
+       libraryHaskellDepends = [ base hint template-haskell ];
        description = "A type class for cast functions of Gtk2hs: TH package";
        license = "unknown";
      }) {};
@@ -57493,7 +58906,7 @@ self: {
        sha256 = "0km86yd8wkn85x8xr326a8pzrfmbrf0cpf6zz3sggk3kn4jrmbj4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base glib gtk3 transformers ];
+       executableHaskellDepends = [ base glib gtk3 transformers ];
        jailbreak = true;
        homepage = "http://www.haskell.org/hello/";
        description = "Gtk2Hs Hello World, an example package";
@@ -57506,7 +58919,7 @@ self: {
        pname = "gtk2hs-rpn";
        version = "0.2.1";
        sha256 = "01wikd60b48qcz6vk31kwfkpkf2za5laxbhdyns45s90lvr98rvi";
-       buildDepends = [ base cairo glib gtk mtl ];
+       libraryHaskellDepends = [ base cairo glib gtk mtl ];
        jailbreak = true;
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
@@ -57524,12 +58937,14 @@ self: {
        sha256 = "1j6nwjvjmzb144vbizraax0yf5bbkicg5hx2mm4z9ayacf58sm7c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring cairo containers gio glib mtl pango text time
-         transformers
+       libraryHaskellDepends = [
+         array base bytestring cairo containers gio glib mtl pango text
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
+       executableHaskellDepends = [
+         array base cairo text time transformers
        ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk3 ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57543,9 +58958,9 @@ self: {
        pname = "gtk3-mac-integration";
        version = "0.3.2.0";
        sha256 = "0m7659ca92w9yhd1fnraa255sx74qjagwsavd3navl41h687bzqj";
-       buildDepends = [ array base containers glib gtk3 mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk-mac-integration-gtk3 ];
+       libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
+       libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57554,22 +58969,21 @@ self: {
 
   "gtkglext" = callPackage
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext
-     , pango, pangox_compat
+     , pango
      }:
      mkDerivation {
        pname = "gtkglext";
        version = "0.12.5.0";
        sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk";
-       buildDepends = [ base glib gtk pango ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtkglext pangox_compat ];
+       libraryHaskellDepends = [ base glib gtk pango ];
+       libraryPkgconfigDepends = [ gtkglext ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtkglext;
-          inherit (pkgs) pangox_compat;};
+     }) { inherit (pkgs.gnome) gtkglext;};
 
   "gtkimageview" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk
@@ -57579,9 +58993,11 @@ self: {
        pname = "gtkimageview";
        version = "0.12.0";
        sha256 = "0sdfb7gmgqh4dkc0a39abx84x7j7zs5z1l62nfzz22wsx1h641j3";
-       buildDepends = [ array base containers glib gtk haskell98 mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtkimageview ];
+       libraryHaskellDepends = [
+         array base containers glib gtk haskell98 mtl
+       ];
+       libraryPkgconfigDepends = [ gtkimageview ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GtkImageView library";
@@ -57599,7 +59015,7 @@ self: {
        sha256 = "0z7mwgmjpbmj2949bfrragyjr6s38vv9sz8zpy63ss9h7b5xn4xw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base gconf glade gtk MissingH process regex-posix unix
        ];
        homepage = "http://hg.complete.org/gtkrsync";
@@ -57616,9 +59032,11 @@ self: {
        pname = "gtksourceview2";
        version = "0.13.1.3";
        sha256 = "1ji8sfkjggjxl4yrazm6n8gp74hlh3h28kjc9nfxka062bjmxfhf";
-       buildDepends = [ array base containers glib gtk mtl text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtksourceview ];
+       libraryHaskellDepends = [
+         array base containers glib gtk mtl text
+       ];
+       libraryPkgconfigDepends = [ gtksourceview ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57632,9 +59050,11 @@ self: {
        pname = "gtksourceview3";
        version = "0.13.2.0";
        sha256 = "0chn0rl5kkfi7y02h1x0gfkpbm4hfcl6pxrbdpfv20jk4m88a0qj";
-       buildDepends = [ array base containers glib gtk3 mtl text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtksourceview ];
+       libraryHaskellDepends = [
+         array base containers glib gtk3 mtl text
+       ];
+       libraryPkgconfigDepends = [ gtksourceview ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57646,11 +59066,10 @@ self: {
        pname = "guarded-rewriting";
        version = "0.1";
        sha256 = "04396pd4c4yqpw6ai5ciigva9l3acdz7yn4d5hvyks52khv5fsf9";
-       buildDepends = [ base instant-generics ];
+       libraryHaskellDepends = [ base instant-generics ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/GuardedRewriting";
        description = "Datatype-generic rewriting with preconditions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "guess-combinator" = callPackage
@@ -57659,7 +59078,7 @@ self: {
        pname = "guess-combinator";
        version = "0.1.1";
        sha256 = "1xaj8zl6cbgks3r0asbnkz1ixq1hlglpjxdymj6ikyjq955sxmzj";
-       buildDepends = [ base HList ];
+       libraryHaskellDepends = [ base HList ];
        homepage = "http://code.atnnn.com/project/guess";
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
@@ -57674,7 +59093,7 @@ self: {
        sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo containers filepath gtk ];
+       executableHaskellDepends = [ base cairo containers filepath gtk ];
        jailbreak = true;
        homepage = "http://code.mathr.co.uk/gulcii";
        description = "graphical untyped lambda calculus interactive interpreter";
@@ -57687,7 +59106,7 @@ self: {
        pname = "gutenberg-fibonaccis";
        version = "1.1.0";
        sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/justinhanekom/gutenberg-fibonaccis";
        description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project";
        license = stdenv.lib.licenses.gpl3;
@@ -57701,7 +59120,7 @@ self: {
        sha256 = "19r2vsi5v43a3wq2vbfh2wfscmbzvcbyd1lqc2xdg4bbla9pf648";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base extra GiveYouAHead ];
+       executableHaskellDepends = [ base extra GiveYouAHead ];
        description = "A binary version of GiveYouAHead";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57717,7 +59136,11 @@ self: {
        sha256 = "0v2mcf35j4dr32j9n6rx10h7mx9d9f14bh70yphj01laxg240746";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring filepath http-conduit hxt mtl stm template-haskell
+         transformers utf8-string vinyl
+       ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath http-conduit hxt mtl
          stm template-haskell transformers utf8-string vinyl
        ];
@@ -57736,8 +59159,10 @@ self: {
        pname = "h-gpgme";
        version = "0.3.0.0";
        sha256 = "172awh918zldbivnn8jy24r30mxppgjvn2bz52phjxln02kcpm3x";
-       buildDepends = [ base bindings-gpgme bytestring either time unix ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bindings-gpgme bytestring either time unix
+       ];
+       testHaskellDepends = [
          base bindings-gpgme bytestring either HUnit QuickCheck tasty
          tasty-hunit tasty-quickcheck time transformers unix
        ];
@@ -57756,13 +59181,17 @@ self: {
        sha256 = "1s8r476bhvmhpj914n4sjsa1z6dgf26m872rpzhlsyhw1rsxgcfr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base MonadRandom mtl text transformers vty vty-ui
        ];
-       testDepends = [ base HUnit MonadRandom mtl transformers ];
+       executableHaskellDepends = [
+         base MonadRandom mtl text transformers vty vty-ui
+       ];
+       testHaskellDepends = [ base HUnit MonadRandom mtl transformers ];
        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
@@ -57773,7 +59202,9 @@ self: {
        pname = "hArduino";
        version = "0.9";
        sha256 = "03wq0c9aqv3n27zcm74l2df75z3sr7kvyszgs0m2sn2680izl024";
-       buildDepends = [ base bytestring containers mtl serialport time ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl serialport time
+       ];
        homepage = "http://leventerkok.github.com/hArduino";
        description = "Control your Arduino board from Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -57785,7 +59216,7 @@ self: {
        pname = "hBDD";
        version = "0.0.3";
        sha256 = "1jj8hj8wl95fy0n1qixhra4sqlmgddgn080plk7q7iv000qv67gk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "An abstraction layer for BDD libraries";
        license = "LGPL";
      }) {};
@@ -57798,9 +59229,9 @@ self: {
        pname = "hBDD-CMUBDD";
        version = "0.0.3";
        sha256 = "16pvi496qi3q2rrw08p6lndnsz6d6p65i8m10ldjlh143y8k9ga9";
-       buildDepends = [ base containers deepseq hBDD unix ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ bdd mem ];
+       libraryHaskellDepends = [ base containers deepseq hBDD unix ];
+       librarySystemDepends = [ bdd mem ];
+       libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57814,9 +59245,9 @@ self: {
        pname = "hBDD-CUDD";
        version = "0.0.3";
        sha256 = "1r94nj23pj134bd5b2mqk01g8xvbcn4ik2xs9yp01v1jg2clhjha";
-       buildDepends = [ base containers deepseq hBDD unix ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ cudd epd mtr st util ];
+       libraryHaskellDepends = [ base containers deepseq hBDD unix ];
+       librarySystemDepends = [ cudd epd mtr st util ];
+       libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57831,9 +59262,9 @@ self: {
        pname = "hCsound";
        version = "0.4.2";
        sha256 = "0z4zcf70jplm68k69kigj0kfx78r00y6fx6rjymzpvpbhppmyyd2";
-       buildDepends = [ base monads-tf transformers vector ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ csound64 libsndfile ];
+       libraryHaskellDepends = [ base monads-tf transformers vector ];
+       librarySystemDepends = [ csound64 libsndfile ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        description = "interface to CSound API";
        license = "LGPL";
@@ -57846,7 +59277,7 @@ self: {
        pname = "hDFA";
        version = "0.0.2";
        sha256 = "1ays1qy2zsl3h49ryr2y9dymfv1ak1m1d0jvarmqwg3nb49armhm";
-       buildDepends = [ base containers directory process ];
+       libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57858,7 +59289,7 @@ self: {
        pname = "hF2";
        version = "0.2";
        sha256 = "1y0731fsay2dp9m4b94w15m054vqsnnafz4k8jjqjvvrmwyfgicz";
-       buildDepends = [ base cereal vector ];
+       libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57872,7 +59303,7 @@ self: {
        pname = "hGelf";
        version = "0.1";
        sha256 = "0jkgf0sm8xv204hrzpkplccfq88y5xyrm8y2b5gjfp473872jqxw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cereal network old-time pureMD5 QuickCheck
          text time zlib
        ];
@@ -57891,7 +59322,11 @@ self: {
        sha256 = "0my2071si1x25q482rz48ihj6b9pg1vf6g722jdx8nbgri1x4wzz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring cmdargs containers data-dword directory
+         filepath hooplext mtl parsec pretty template-haskell transformers
+       ];
+       executableHaskellDepends = [
          array base bytestring cmdargs containers data-dword directory
          filepath hooplext mtl parsec pretty template-haskell transformers
        ];
@@ -57910,7 +59345,7 @@ self: {
        pname = "hMollom";
        version = "0.4.0";
        sha256 = "1grhkvmcdyi7gmmcqfqi3n78p4gbimzxa4mylj1f0j8iy5iycmg5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring Crypto dataenc ghc-prim HTTP mtl
          old-locale old-time pureMD5 random time
        ];
@@ -57936,7 +59371,7 @@ self: {
        pname = "hOpenPGP";
        version = "2.1";
        sha256 = "0jl2rciqgnhjw6q4xgdm2117vrj25l18hzl58fdls7j9bqlvrn5y";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors binary
          binary-conduit byteable bytestring bzlib conduit conduit-extra
          containers crypto-cipher-types crypto-pubkey crypto-random
@@ -57946,7 +59381,7 @@ self: {
          securemem semigroups split text time transformers
          unordered-containers wl-pprint-extras zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bifunctors binary binary-conduit byteable
          bytestring bzlib conduit conduit-extra containers
          crypto-cipher-types crypto-pubkey crypto-random cryptocipher
@@ -57971,7 +59406,7 @@ self: {
        pname = "hPDB";
        version = "1.2.0.4";
        sha256 = "0fzr6y19x7c47y3jl68zcrjnlc8j3b0xnvvrpmqm15qznlrdh41s";
-       buildDepends = [
+       libraryHaskellDepends = [
          AC-Vector base bytestring containers deepseq directory ghc-prim
          iterable mmap mtl Octree parallel QuickCheck tagged
          template-haskell text vector zlib
@@ -57993,18 +59428,19 @@ self: {
        sha256 = "1s1m09y3x8lpsdxs6ch77y1qipfy35swqwaj242aa0v5p8xs58wa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          AC-Vector base bytestring containers deepseq directory ghc-prim
          GLUT hPDB iterable mtl Octree OpenGL QuickCheck template-haskell
          text text-format vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          AC-Vector base bytestring containers deepseq directory ghc-prim
          hPDB IfElse iterable mtl process template-haskell text time vector
        ];
        homepage = "https://github.com/BioHaskell/hPDB-examples";
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPushover" = callPackage
@@ -58015,7 +59451,9 @@ self: {
        pname = "hPushover";
        version = "0.2";
        sha256 = "14k3sdy2c0anfsw0hdir0l107ixlsnr90miwxrxdsckh40kz3ad3";
-       buildDepends = [ aeson base bytestring http-conduit network text ];
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit network text
+       ];
        jailbreak = true;
        homepage = "tot";
        description = "Pushover.net API functions";
@@ -58028,7 +59466,7 @@ self: {
        pname = "hR";
        version = "0.1.1";
        sha256 = "1kc03mgsxijszdvxw4qwq4fnd0ln61v08rk9y1k6kx9vyqc7bilc";
-       buildDepends = [ array base containers unix ];
+       libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58040,7 +59478,7 @@ self: {
        pname = "hRESP";
        version = "0.1.0.0";
        sha256 = "188rs1g2yacka8c4wbqkhwjrin95f3ribm8007lqsxiapaj1d89y";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        homepage = "https://github.com/yihuang/hresp";
        description = "haskell implementation of RESP (REdis Serialization Protocol)";
        license = stdenv.lib.licenses.bsd3;
@@ -58057,7 +59495,7 @@ self: {
        sha256 = "0nf71jb15gkkcrb0x83mmql6j55c6dnz3bl3yq1grphwn0jbmq3y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Crypto dataenc HTTP hxt MissingH network
          network-uri old-locale old-time random regex-compat utf8-string
        ];
@@ -58074,7 +59512,7 @@ self: {
        pname = "hSimpleDB";
        version = "0.3";
        sha256 = "045mgg2b7wmkcziil8njb2wsy8pgzqcc46dwdrabxgbw1nzsfkaa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Crypto dataenc HTTP hxt network old-locale old-time
          utf8-string
        ];
@@ -58090,8 +59528,8 @@ self: {
        pname = "hTalos";
        version = "0.2";
        sha256 = "05l9nlrwpb9gwgj8z48paxx46lkasa82naiq7armi98salk1a9ip";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/mgajda/hTalos";
        description = "Parser, print and manipulate structures in PDB file format";
@@ -58105,7 +59543,7 @@ self: {
        pname = "hTensor";
        version = "0.8.2";
        sha256 = "1nwzh68v2b11lph64432bjdrpxrr62cv4hdh935wml13mac3l2ly";
-       buildDepends = [ base containers hmatrix random ];
+       libraryHaskellDepends = [ base containers hmatrix random ];
        homepage = "http://perception.inf.um.es/tensor";
        description = "Multidimensional arrays and simple tensor computations";
        license = stdenv.lib.licenses.bsd3;
@@ -58120,8 +59558,8 @@ self: {
        sha256 = "0r9a461k1rr0j9zgjfq1z37i6blv9rqf8pzb984h1nmlfqpnidnc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base hmatrix ];
-       extraLibraries = [ blas lapack ];
+       executableHaskellDepends = [ array base hmatrix ];
+       executableSystemDepends = [ blas lapack ];
        homepage = "http://dslsrv4.cs.missouri.edu/~qqbm9";
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
@@ -58133,12 +59571,14 @@ self: {
      mkDerivation {
        pname = "hXmixer";
        version = "0.3.0.0";
-       revision = "2";
        sha256 = "1n9wlg6inzvnyqkx61bpbgx744q25zpjhkihwbqv6569lgir1h4x";
+       revision = "2";
        editedCabalFile = "ba9345a3146b34d0101920f9efd6af7f435188dd7ae53b50d76cc0851f13014f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory gtk3 process split text ];
+       executableHaskellDepends = [
+         base directory gtk3 process split text
+       ];
        description = "A Gtk mixer GUI application for FreeBSD";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58151,8 +59591,8 @@ self: {
        pname = "haar";
        version = "0.1";
        sha256 = "1xmz659lqr25c0xxkmly5w4fxgk9rqnms2sknd5ab8czqdgq6n1v";
-       buildDepends = [ base split ];
-       testDepends = [
+       libraryHaskellDepends = [ base split ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -58168,7 +59608,7 @@ self: {
        pname = "hacanon-light";
        version = "2008.10.28";
        sha256 = "0m0wfg74kmpz6ydldz5h9z5xd54957v1rprl9wal9sjr0pzl28a7";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Template Haskell framework for automatic FFI code generation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58179,7 +59619,7 @@ self: {
        pname = "hack";
        version = "2012.2.6";
        sha256 = "0wrfa9fa6skl985fi2a6iv4m8kchg87w9x3k37nf3l8vaz95jmdr";
-       buildDepends = [ base bytestring data-default ];
+       libraryHaskellDepends = [ base bytestring data-default ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "a Haskell Webserver Interface";
        license = stdenv.lib.licenses.bsd3;
@@ -58194,7 +59634,7 @@ self: {
        pname = "hack-contrib";
        version = "2010.9.28";
        sha256 = "1r0g8fcwz6r4vrsadjyb5awjmfbqsskmc1c8xkfwv0knak1qq2p1";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bytestring cgi containers data-default
          directory filepath hack haskell98 mps network old-locale old-time
          time utf8-string
@@ -58213,7 +59653,7 @@ self: {
        pname = "hack-contrib-press";
        version = "0.1.2";
        sha256 = "12v7xw448cxl93bnbzqkinlij74flffpif0x5jd51sndvpgsh12r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-class containers hack json mtl parsec
          press
        ];
@@ -58231,7 +59671,7 @@ self: {
        pname = "hack-frontend-happstack";
        version = "2009.6.24.1";
        sha256 = "1x4kaj4nk5lrgsm6pfxr6f8rvjyxhy0agqv9f810xh6s1r9pihw1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers hack happstack-server network
          utf8-string
        ];
@@ -58247,7 +59687,7 @@ self: {
        pname = "hack-frontend-monadcgi";
        version = "0.0.3.1";
        sha256 = "0m0af44jv03djn5i2lgrnnvvcdqx44qppfx76m1bwr7gv1vzm432";
-       buildDepends = [ base bytestring cgi containers hack ];
+       libraryHaskellDepends = [ base bytestring cgi containers hack ];
        description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58258,7 +59698,7 @@ self: {
        pname = "hack-handler-cgi";
        version = "0.2.0.2";
        sha256 = "0pm8vs94dbaahqrdwfffwa1jb9ghyjnq48sirlw1dj2gcsa3np2x";
-       buildDepends = [ base bytestring hack ];
+       libraryHaskellDepends = [ base bytestring hack ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/hack-handler-cgi/tree/master";
        description = "Hack handler using CGI protocol. (deprecated)";
@@ -58273,7 +59713,7 @@ self: {
        pname = "hack-handler-epoll";
        version = "0.1.3";
        sha256 = "0q4cw789x8c93y53lwhr7g0hkli8x6qb9k0cg5pxln6cxxvi9p82";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default epoll failure hack HTTP network unix
          utf8-string
        ];
@@ -58291,11 +59731,11 @@ self: {
        pname = "hack-handler-evhttp";
        version = "2009.8.4";
        sha256 = "1a09ls9jgakdx8ya6zd5z3ss2snb4pp0db1573hzmrhr37i2gklz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-class containers data-default hack
          hack-contrib network
        ];
-       extraLibraries = [ event ];
+       librarySystemDepends = [ event ];
        homepage = "http://github.com/bickfordb/hack-handler-evhttp";
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
@@ -58308,8 +59748,8 @@ self: {
        pname = "hack-handler-fastcgi";
        version = "0.2.0.1";
        sha256 = "02slh33r9qy8q0vpi4s4vvf5lmb14ypk8bixdicvxakahjvxhanr";
-       buildDepends = [ base bytestring hack hack-handler-cgi ];
-       extraLibraries = [ fcgi ];
+       libraryHaskellDepends = [ base bytestring hack hack-handler-cgi ];
+       librarySystemDepends = [ fcgi ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/hack-handler-fastcgi/tree/master";
        description = "Hack handler direct to fastcgi (deprecated)";
@@ -58325,7 +59765,7 @@ self: {
        pname = "hack-handler-happstack";
        version = "2009.12.20";
        sha256 = "10b3cp1gap59ialfl33dwhzw50nwrqg49zvv0v813q7rqk3nkhg4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi containers data-default hack happstack-server
          mtl network
        ];
@@ -58343,7 +59783,7 @@ self: {
        pname = "hack-handler-hyena";
        version = "2010.3.15";
        sha256 = "1p0zyki1iapz2xncq0l5bbas44pk5kb29kbb3bdxb4anb0m5jb2q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default hack hyena network
        ];
        homepage = "http://github.com/nfjinjing/hack-handler-hyena";
@@ -58358,7 +59798,9 @@ self: {
        pname = "hack-handler-kibro";
        version = "2009.5.27";
        sha256 = "0py30rp7r4hrazrfq3avpqcp1w8405pyfw1yxz7msb58yjppa792";
-       buildDepends = [ base cgi data-default hack kibro network ];
+       libraryHaskellDepends = [
+         base cgi data-default hack kibro network
+       ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "Hack Kibro handler";
        license = "GPL";
@@ -58373,7 +59815,7 @@ self: {
        pname = "hack-handler-simpleserver";
        version = "0.2.2";
        sha256 = "1p7igprgxkzkqhsy5n2qci75dbx2qxs1dcq8krghwj3isl6wds3y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring failure hack network web-encodings
        ];
        jailbreak = true;
@@ -58389,7 +59831,9 @@ self: {
        pname = "hack-middleware-cleanpath";
        version = "0.0.1.1";
        sha256 = "0107ajkiwkn33h56dz576y4dxl0sr2lkkcmjy6f9s2nzqp9ibin4";
-       buildDepends = [ base bytestring hack split web-encodings ];
+       libraryHaskellDepends = [
+         base bytestring hack split web-encodings
+       ];
        homepage = "http://github.com/snoyberg/hack-middleware-cleanpath/tree/master";
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -58404,7 +59848,7 @@ self: {
        pname = "hack-middleware-clientsession";
        version = "0.0.1.1";
        sha256 = "0h4l2lvshf9cqg43az9alq4rybhr4k07mhrila4fx7yjxslw871f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clientsession hack old-locale predicates time web-encodings
        ];
        homepage = "http://github.com/snoyberg/hack-middleware-clientsession/tree/master";
@@ -58419,7 +59863,7 @@ self: {
        pname = "hack-middleware-gzip";
        version = "0.0.0.1";
        sha256 = "1x7526939h7g44yyscyk324gdb40cryyiffh13iinf8aw1rach70";
-       buildDepends = [ base hack split zlib ];
+       libraryHaskellDepends = [ base hack split zlib ];
        homepage = "http://github.com/snoyberg/hack-middleware-gzip/tree/master";
        description = "Automatic gzip compression of responses. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -58433,7 +59877,7 @@ self: {
        pname = "hack-middleware-jsonp";
        version = "0.0.2.1";
        sha256 = "0g7l441s0065f5dw2rj82m547nnc1i7cclx81kvgbpbi8q6hz0iw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-class hack web-encodings
        ];
        homepage = "http://github.com/snoyberg/hack-middleware-jsonp/tree/master";
@@ -58448,7 +59892,7 @@ self: {
        pname = "hack2";
        version = "2014.11.17";
        sha256 = "1b6jzdisv58scyzb9pxhqrnz74sy0j96jkbbnf84wccwbwn4rf28";
-       buildDepends = [ base bytestring data-default ];
+       libraryHaskellDepends = [ base bytestring data-default ];
        homepage = "https://github.com/nfjinjing/hack2";
        description = "a Haskell Webserver Interface (V2)";
        license = stdenv.lib.licenses.bsd3;
@@ -58462,7 +59906,7 @@ self: {
        pname = "hack2-contrib";
        version = "2015.5.4";
        sha256 = "1vbdnbab5f090fp5zgviwbc2w33y7calgbh67fgxcaflhg0514vk";
-       buildDepends = [
+       libraryHaskellDepends = [
          air base bytestring containers data-default directory filepath
          hack2 network-uri text time
        ];
@@ -58480,7 +59924,7 @@ self: {
        pname = "hack2-contrib-extra";
        version = "2014.12.20";
        sha256 = "1mxgvlr593cw523mknr5bcwf55544q04cz0nlpzgm5bg3336b5wl";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-extra base bytestring cgi containers data-default directory
          filepath hack2 hack2-contrib network old-locale old-time time
        ];
@@ -58497,7 +59941,7 @@ self: {
        pname = "hack2-handler-happstack-server";
        version = "2011.6.20";
        sha256 = "115nrzf0626pc716n01qjhxs44c1awdd4q1c8kbax025cwac7kpx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi containers data-default enumerator hack2
          happstack-server mtl network
        ];
@@ -58518,7 +59962,7 @@ self: {
        pname = "hack2-handler-mongrel2-http";
        version = "2011.10.31";
        sha256 = "1pymar803n696yx3dwqpfwqlkg93ncff162p26mrs7iqn14v851w";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson air attoparsec base blaze-builder blaze-textual bytestring
          containers data-default directory enumerator hack2 mtl network safe
          stm text unix zeromq-haskell
@@ -58538,7 +59982,7 @@ self: {
        pname = "hack2-handler-snap-server";
        version = "2015.3.9";
        sha256 = "1qs5mncl44p410ni8hbpgvmv81158z62mcg66fmnnlrkwdr1bbh7";
-       buildDepends = [
+       libraryHaskellDepends = [
          air base blaze-builder bytestring case-insensitive containers
          data-default directory enumerator hack2 mtl network snap-core
          snap-server
@@ -58556,7 +60000,7 @@ self: {
        pname = "hack2-handler-warp";
        version = "2012.5.25";
        sha256 = "1p0lkhf95xkllfpcb9yibpa1rkam90bccmzj2aa60shd7v9qx9r5";
-       buildDepends = [
+       libraryHaskellDepends = [
          air base data-default hack2 hack2-interface-wai warp
        ];
        homepage = "https://github.com/nfjinjing/hack2-handler-warp";
@@ -58574,7 +60018,7 @@ self: {
        pname = "hack2-interface-wai";
        version = "2012.5.25";
        sha256 = "18yyvb38axz18ac2q9z31qmqjd3d9yrzsgiv11wbf8ccdp2irm5w";
-       buildDepends = [
+       libraryHaskellDepends = [
          air base bytestring case-insensitive containers data-default hack2
          http-types mtl network safe wai
        ];
@@ -58591,10 +60035,10 @@ self: {
      mkDerivation {
        pname = "hackage-db";
        version = "1.22";
-       revision = "1";
        sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd";
+       revision = "1";
        editedCabalFile = "b5277a8cbbfcfba81f29db4910003c2fa7e34c06bceb4f3e7318510e1ce74376";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal containers directory filepath tar utf8-string
        ];
        homepage = "http://github.com/peti/hackage-db";
@@ -58613,7 +60057,7 @@ self: {
        sha256 = "0kdc7ah1mn6xcaan56li9k7ccrcsjz3ysi04fp334l57kd3i105z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal async attoparsec base Cabal cpphs directory filepath
          haskell-src-exts HTTP mtl process text
        ];
@@ -58635,18 +60079,20 @@ self: {
      mkDerivation {
        pname = "hackage-mirror";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1iaaxdn4lsfrjksax8c9pawrjwj4sb6irqd4sfkdm3k9l2f8nqvg";
+       revision = "1";
        editedCabalFile = "848ea26073e706a9303ec1baf811a74b65859ae649731a3b799b4fb8c558c1bc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base bytestring cereal conduit conduit-extra cryptohash
          data-default directory exceptions fast-logger filepath http-conduit
          lifted-async lifted-base mmorph monad-control monad-logger
-         old-locale optparse-applicative resourcet retry shakespeare stm tar
-         template-haskell temporary text thyme transformers
-         unordered-containers
+         old-locale resourcet retry shakespeare stm tar template-haskell
+         temporary text thyme transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         base monad-logger optparse-applicative
        ];
        homepage = "http://fpcomplete.com";
        description = "Simple mirroring utility for Hackage";
@@ -58664,14 +60110,13 @@ self: {
        sha256 = "11vlnmadnjz1q4iw4ay8gh1yclba7550mnxwakdryakws5v75am1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory download-curl filepath gnuplot
          old-locale old-time parsedate
        ];
        homepage = "http://code.haskell.org/~dons/code/hackage-plot";
        description = "Generate cumulative graphs of hackage uploads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-proxy" = callPackage
@@ -58687,7 +60132,7 @@ self: {
        sha256 = "1vicmj070nb76zcxfmkj4sv0rxrrl13r31psnsgb8azbmvs1s0yp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base basic-prelude blaze-builder bytestring Cabal case-insensitive
          conduit containers filepath http-client http-client-conduit
          http-conduit http-types optparse-applicative tar text transformers
@@ -58716,7 +60161,7 @@ self: {
        sha256 = "1xsy2clsg53rhxgkb9vlan7dw7xqphm8gr1ajl8kq5ymfahnyd1i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state aeson array async attoparsec base base16-bytestring
          base64-bytestring binary blaze-builder bytestring Cabal cereal
          containers crypto-api csv deepseq directory filepath
@@ -58726,12 +60171,12 @@ self: {
          time tokenize transformers unix unordered-containers vector xhtml
          zlib
        ];
-       testDepends = [
+       executableToolDepends = [ alex happy ];
+       testHaskellDepends = [
          aeson base base64-bytestring bytestring Cabal directory filepath
          HTTP network process random tar text unix unordered-containers
          vector xml zlib
        ];
-       buildTools = [ alex happy ];
        jailbreak = true;
        description = "The Hackage web server";
        license = stdenv.lib.licenses.bsd3;
@@ -58748,7 +60193,7 @@ self: {
        sha256 = "0b43vd1b18ksivxr7cfymzwcgs8rhwib2prn86wmwhghyx8a4qnw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory download filepath hsparklines old-locale
          old-time parsedate tagsoup
        ];
@@ -58766,7 +60211,7 @@ self: {
        sha256 = "0vbp7c1g7dx119xxsn0f0fhk14l35jxmg7zdaqr1vcjhprj3nh6q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base download feed tagsoup ];
+       executableHaskellDepends = [ base download feed tagsoup ];
        homepage = "http://code.haskell.org/~dons/code/hackage2hwn";
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
@@ -58781,7 +60226,7 @@ self: {
        sha256 = "131hl59imxhql3hfp8m9363fgsgdywz1p8idrybncipyblwpsjgq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base feed feed2twitter ];
+       executableHaskellDepends = [ base feed feed2twitter ];
        homepage = "http://github.com/tomlokhorst/hackage2twitter";
        description = "Send new Hackage releases to Twitter";
        license = stdenv.lib.licenses.bsd3;
@@ -58798,13 +60243,12 @@ self: {
        sha256 = "06lrsfs70zjhxqsz93wmhrmyq1v64kiq0580f9im9nw69w4yl4ax";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath mtl process
        ];
        homepage = "https://github.com/dterei/Hackager";
        description = "Hackage testing tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackernews" = callPackage
@@ -58816,11 +60260,11 @@ self: {
        pname = "hackernews";
        version = "0.5.0.0";
        sha256 = "1yj8wip52dagmdpziyyjs9hp7k1gdvwl6ynk5hr8c8wxapcj28bs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring either HsOpenSSL http-streams
          io-streams text time transformers
        ];
-       testDepends = [ base hspec transformers ];
+       testHaskellDepends = [ base hspec transformers ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58834,7 +60278,7 @@ self: {
        sha256 = "17c77f687874bfwahmzcz2v6k8z9p4fv555r5r1f38snsdi825gf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/fgaz/hackertyper";
        description = "\"Hack\" like a programmer in movies and games!";
        license = stdenv.lib.licenses.mit;
@@ -58852,13 +60296,13 @@ self: {
        sha256 = "18sv8kwhg0frsn6phg47hsm5vv84yaxxvk47sazgrb5hjl3qiam7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers deepseq directory
          extensible-exceptions filepath HTTP MissingH mtl network
          network-uri old-locale old-time parsec pretty process regex-compat
          tar time unix xml zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory extensible-exceptions
          filepath HUnit mtl pretty process time unix xml
        ];
@@ -58875,7 +60319,7 @@ self: {
        pname = "hactor";
        version = "1.2.0.0";
        sha256 = "0jgnifwgfxapi8l0ds56xr7h66jprn1ynpwmvhafbyk84ymznf8y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers monad-control mtl resourcet stm stm-chans
          transformers-base
        ];
@@ -58892,7 +60336,7 @@ self: {
        pname = "hactors";
        version = "0.0.3.1";
        sha256 = "0nxcl3v9gnnyjzdpk30m2pmrhwcva9rky2dxrj4nnkr67ajm2dj0";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        jailbreak = true;
        homepage = "https://github.com/treep/hactors";
        description = "Practical actors for Haskell";
@@ -58909,8 +60353,8 @@ self: {
        sha256 = "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haddock-api ];
-       testDepends = [ base Cabal directory filepath process ];
+       executableHaskellDepends = [ base haddock-api ];
+       testHaskellDepends = [ base Cabal directory filepath process ];
        preCheck = "unset GHC_PACKAGE_PATH";
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
@@ -58926,7 +60370,7 @@ self: {
        pname = "haddock-api";
        version = "2.15.0.2";
        sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
        ];
@@ -58945,11 +60389,10 @@ self: {
        pname = "haddock-api";
        version = "2.16.1";
        sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
        ];
-       jailbreak = true;
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -58965,7 +60408,7 @@ self: {
        sha256 = "1a56nihkxybldk55g69v2aw6r4ipa9x86i0jr19fd23zxvancs8h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths pretty
        ];
        jailbreak = true;
@@ -58983,8 +60426,8 @@ self: {
        pname = "haddock-library";
        version = "1.2.1";
        sha256 = "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g";
-       buildDepends = [ base bytestring deepseq transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq transformers ];
+       testHaskellDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
        ];
        homepage = "http://www.haskell.org/haddock/";
@@ -59004,7 +60447,7 @@ self: {
        sha256 = "0ppbvmmiz07p8kyblkplzkki3kc4z8hlmxc9h18fj0xwr6dpfib7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal conduit conduit-extra exceptions ghc haddock-api mtl
          optparse-applicative process resourcet sqlite-simple system-fileio
          system-filepath tagsoup text transformers
@@ -59024,9 +60467,9 @@ self: {
        pname = "hadoop-formats";
        version = "0.2.1.1";
        sha256 = "1w3869jz3mxhzdik5fwaha7dn9rhjg5w8g0qnznd4x45cnzxv5ga";
-       buildDepends = [ attoparsec base bytestring text vector ];
-       testDepends = [ base bytestring filepath text vector ];
-       extraLibraries = [ snappy ];
+       libraryHaskellDepends = [ attoparsec base bytestring text vector ];
+       librarySystemDepends = [ snappy ];
+       testHaskellDepends = [ base bytestring filepath text vector ];
        jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-formats";
        description = "Read/write file formats commonly used by Hadoop";
@@ -59043,12 +60486,12 @@ self: {
        pname = "hadoop-rpc";
        version = "1.0.0.1";
        sha256 = "1nm1xgb1ks57sbqg8x8aasr5l8lgdf4inr4ndgnnlsdjah6nbli1";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring cereal exceptions hashable monad-loops
          network protobuf random socks stm text transformers unix
          unordered-containers uuid vector xmlhtml
        ];
-       testDepends = [ base protobuf tasty tasty-hunit vector ];
+       testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        homepage = "http://github.com/jystic/hadoop-rpc";
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -59067,19 +60510,18 @@ self: {
        sha256 = "0grwi26xardg8fxvz7g10v9111bgph77s3pdrr58r9hqgm8lhx5v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base boxes bytestring configurator exceptions filepath
          hadoop-rpc old-locale optparse-applicative protobuf
          regex-pcre-builtin split stm text time transformers unix vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring hadoop-rpc tasty tasty-hunit
          tasty-quickcheck vector
        ];
        homepage = "http://github.com/jystic/hadoop-tools";
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haeredes" = callPackage
@@ -59092,10 +60534,10 @@ self: {
        sha256 = "0m6d75kgf40m3vnh148v2ysfhplspqbbqs8jha29ascap8xz7n47";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs dns iproute MissingH parallel-io
        ];
-       testDepends = [ base doctest filemanip ];
+       testHaskellDepends = [ base doctest filemanip ];
        homepage = "http://michael.orlitzky.com/code/haeredes.php";
        description = "Confirm delegation of NS and MX records";
        license = stdenv.lib.licenses.gpl3;
@@ -59114,11 +60556,14 @@ self: {
        sha256 = "09mqs4y26w7f4729gvrpv9mh431xpdngas14ad86bbjf2ncvggjg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers convertible directory
          filemanip filepath HDBC HDBC-sqlite3 hquery MissingH network
-         old-locale optparse-applicative pandoc pandoc-types parsec rss
-         split text time unix xmlhtml
+         old-locale pandoc pandoc-types parsec rss split text time unix
+         xmlhtml
+       ];
+       executableHaskellDepends = [
+         base directory filemanip filepath optparse-applicative
        ];
        homepage = "http://github.com/tych0/haggis";
        description = "A static site generator with blogging/comments support";
@@ -59134,7 +60579,8 @@ self: {
        sha256 = "1vfsy6ks9rnynwvavakj90662vxgvk7y0vwpdga2k2fc8nkqjf10";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers time ];
+       libraryHaskellDepends = [ base containers time ];
+       executableHaskellDepends = [ base containers time ];
        description = "A simple library for creating animated ascii art on ANSI terminals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59148,7 +60594,7 @@ self: {
        pname = "hailgun";
        version = "0.4.0.3";
        sha256 = "1c4fd116xhkw0hknzfyxyw7v62wjixcdbdidx804rs8g8f3c5p1c";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring email-validate exceptions filepath
          http-client http-client-tls http-types tagsoup text time
          transformers
@@ -59166,7 +60612,9 @@ self: {
        sha256 = "1cxvzg5bfwsdly9k24izwnk5gf9vvzisaj3m6ng647bm1fc598c6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring configurator hailgun text ];
+       executableHaskellDepends = [
+         base bytestring configurator hailgun text
+       ];
        jailbreak = true;
        description = "A program to send emails throught the Mailgun api";
        license = stdenv.lib.licenses.mit;
@@ -59189,14 +60637,21 @@ self: {
        sha256 = "1s447iqgpxsx78zd873izyqhdq34dz1ikjcfw8m9r0rv5nkxkf7c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         authenticate base base64-bytestring binary blaze-builder bson
+         bytestring conduit conduit-extra containers cookie exceptions
+         failure http-conduit http-types lio mongoDB mtl network network-uri
+         parsec resourcet SHA text time transformers wai wai-app-static
+         wai-extra
+       ];
+       executableHaskellDepends = [
          authenticate base base64-bytestring binary blaze-builder bson
          bytestring conduit conduit-extra containers cookie directory
-         exceptions failure filepath ghc-paths hint http-conduit http-types
-         lio mongoDB mtl network network-uri parsec resourcet SHA text time
+         exceptions filepath ghc-paths hint http-conduit http-types lio
+         mongoDB mtl network network-uri parsec resourcet SHA text time
          transformers unix wai wai-app-static wai-extra warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bson containers http-types HUnit lio mongoDB QuickCheck
          quickcheck-instances quickcheck-lio-instances test-framework
          test-framework-hunit test-framework-quickcheck2 text time unix wai
@@ -59218,7 +60673,7 @@ self: {
        sha256 = "006qy5mkhh8zqy9mrpwjiym7klqma49zglwpjmx2ikmkkq9qnfvr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bson bytestring containers ghc-paths hails iterIO
          iterio-server mongoDB mtl
        ];
@@ -59239,12 +60694,13 @@ self: {
        sha256 = "19kgygj9d3m56xcfc1zm0ki2ncgifrrsrf90bvp9bykyixycplap";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default heroku http-types monad-logger mtl
          persistent persistent-postgresql persistent-template scotty text
          time transformers wai wai-extra warp
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base hspec http-types mtl persistent scotty time wai wai-extra
        ];
        jailbreak = true;
@@ -59266,13 +60722,13 @@ self: {
        pname = "hakaru";
        version = "0.1.4";
        sha256 = "033m28jckpqgc4izmyf4h60riy29mcvfhyw340z604miqg7ss2hf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array base bytestring cassava containers directory hmatrix
          integration logfloat math-functions monad-loops mwc-random parallel
          parsec pretty primitive random statistics text transformers vector
          zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Cabal containers hmatrix HUnit logfloat math-functions
          monad-loops mwc-random pretty primitive QuickCheck random
          statistics test-framework test-framework-hunit
@@ -59295,9 +60751,8 @@ self: {
        sha256 = "0h0y466b664xyxi1hr8c7il4cslrmb1hyhsjzhvs55l33zb7591b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base directory filepath mtl process regexpr time yjtools
-       ];
+       libraryHaskellDepends = [ base filepath mtl time ];
+       executableHaskellDepends = [ directory process regexpr yjtools ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/hake/index.xhtml";
        description = "make tool. ruby : rake = haskell : hake";
        license = "GPL";
@@ -59309,7 +60764,7 @@ self: {
        pname = "hakismet";
        version = "0.1";
        sha256 = "1ddmnzan16vn0fbp1fgsidahayihhr0vw8saypdqq7lnhqw8j9d4";
-       buildDepends = [ base HTTP network ];
+       libraryHaskellDepends = [ base HTTP network ];
        jailbreak = true;
        homepage = "https://code.reaktor42.de/projects/hakismet";
        description = "Akismet spam protection library";
@@ -59325,10 +60780,10 @@ self: {
        pname = "hako";
        version = "1.0.0";
        sha256 = "1gcw15522yh0aa7xa793gda45qmq8my15id4ybivv3n16pcr7prm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta parsec template-haskell text transformers
        ];
-       testDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        description = "A mako-like quasi-quoter template library";
        license = stdenv.lib.licenses.bsd3;
@@ -59350,7 +60805,7 @@ self: {
        sha256 = "1gy7j15qqh8m0wf8xkpb1hglahylwyy7vq6c4bm9arap3viak29c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
          cryptohash data-default deepseq directory filepath fsnotify
          http-conduit http-types lrucache mtl network network-uri pandoc
@@ -59358,7 +60813,8 @@ self: {
          snap-core snap-server system-filepath tagsoup text time
          time-locale-compat
        ];
-       testDepends = [
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
          cryptohash data-default deepseq directory filepath fsnotify
          http-conduit http-types HUnit lrucache mtl network network-uri
@@ -59379,7 +60835,9 @@ self: {
        pname = "hakyll-R";
        version = "0.1.0.3";
        sha256 = "0sr0mpyhjr7ajg227rfylhv2950vip6zkryalxp39m1xv0dh2rb3";
-       buildDepends = [ base directory filepath hakyll pandoc process ];
+       libraryHaskellDepends = [
+         base directory filepath hakyll pandoc process
+       ];
        jailbreak = true;
        description = "A package allowing to write Hakyll blog posts in Rmd";
        license = stdenv.lib.licenses.bsd3;
@@ -59394,7 +60852,7 @@ self: {
        pname = "hakyll-agda";
        version = "0.1.10";
        sha256 = "1621l7pw2rcyalp17dcjp1bk650rs8w1i3swnwrzr9wwi6nrx7qb";
-       buildDepends = [
+       libraryHaskellDepends = [
          Agda base containers directory filepath hakyll mtl pandoc
          transformers xhtml
        ];
@@ -59402,7 +60860,6 @@ self: {
        homepage = "https://github.com/bitonic/hakyll-agda";
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-blaze-templates" = callPackage
@@ -59411,7 +60868,7 @@ self: {
        pname = "hakyll-blaze-templates";
        version = "0.1.1.0";
        sha256 = "11dl3rqls2yxkmycx63xr1cix4adk6b29sbwr4v5n48bqamr7p1j";
-       buildDepends = [ base blaze-html blaze-markup hakyll ];
+       libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ];
        jailbreak = true;
        description = "Blaze templates for Hakyll";
        license = stdenv.lib.licenses.bsd3;
@@ -59426,7 +60883,8 @@ self: {
        sha256 = "0w23laiw6a5hxfq5hjq8vn3k7fx5l4yb9p8qcbm62zlycza1ci14";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath hakyll pandoc ];
+       libraryHaskellDepends = [ base hakyll pandoc ];
+       executableHaskellDepends = [ base directory filepath hakyll ];
        jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "Extra modules for the hakyll website compiler";
@@ -59440,7 +60898,7 @@ self: {
        pname = "hakyll-contrib-hyphenation";
        version = "0.1.0.3";
        sha256 = "0mkbsivifggi64k97ssxb0dskzwf7h0sny4m8gmkdsvwqjhfdjam";
-       buildDepends = [ base hakyll hyphenation split tagsoup ];
+       libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
        jailbreak = true;
        homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation";
        description = "automatic hyphenation for Hakyll";
@@ -59456,10 +60914,10 @@ self: {
        pname = "hakyll-contrib-links";
        version = "0.2.0.0";
        sha256 = "0gzg88pcqxwj4qwr2qj24csjljvxcz3v9iclhz5f9g8dx41rkiy5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers hakyll pandoc pandoc-types parsec
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -59478,9 +60936,11 @@ self: {
        sha256 = "1dvif26avp6fczhlg8pi591wp8d1z3kvjr745r5p17lzwpwy1rx3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring cmdargs directory feed filepath hakyll
-         old-locale text time xml
+       libraryHaskellDepends = [
+         base binary bytestring feed hakyll old-locale text time xml
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs directory feed filepath hakyll text xml
        ];
        homepage = "http://github.com/kowey/hakyll-convert";
        description = "Convert from other blog engines to Hakyll";
@@ -59495,7 +60955,9 @@ self: {
        pname = "hakyll-elm";
        version = "0.2.1";
        sha256 = "0bgwcxarsa40aylvg4cc7ha5y87xklkc4ifwd17l69l4xbb4iqpk";
-       buildDepends = [ base blaze-html blaze-markup Elm hakyll mtl ];
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup Elm hakyll mtl
+       ];
        jailbreak = true;
        homepage = "https://github.com/maxsnew/hakyll-elm";
        description = "Hakyll wrapper for the Elm compiler";
@@ -59514,11 +60976,15 @@ self: {
        sha256 = "1d8r1cz9q9mgw1abz8b8n6lnnc19g223hv3igznxfldbws7d6zrj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers haskell-names haskell-packages
-         haskell-src-exts mtl safe syb tagged
+         haskell-src-exts mtl safe syb
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base Cabal haskell-names haskell-packages haskell-src-exts mtl safe
+         tagged
+       ];
+       testHaskellDepends = [
          base Cabal containers haskell-names haskell-packages
          haskell-src-exts HUnit mtl split tagged test-framework
          test-framework-hunit
@@ -59535,10 +61001,10 @@ self: {
      mkDerivation {
        pname = "half";
        version = "0.2.0.1";
-       revision = "1";
        sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw";
+       revision = "1";
        editedCabalFile = "cfadc0b87a5d9c4cc9a3ab5d7a5524221ae88e962f812eb41beba7b39111ccce";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/half";
        description = "Half-precision floating-point";
        license = stdenv.lib.licenses.bsd3;
@@ -59555,7 +61021,11 @@ self: {
        sha256 = "1k47q0vp0cmvmxz28hmv8dgniz9ks7h0wjjmdkjgvb77p8jj2akd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring cereal containers directory filepath
+         fingertree mtl QuickCheck random time unix
+       ];
+       executableHaskellDepends = [
          array base bytestring cereal containers directory filepath
          fingertree HFuse mtl QuickCheck random time unix
        ];
@@ -59571,7 +61041,7 @@ self: {
        pname = "halipeto";
        version = "2.4.1";
        sha256 = "1anyf6mh13rmj5a0lsayrcxzvm3zk0a2943pzkgz06y3aqgmcbdb";
-       buildDepends = [ base directory HaXml pandoc ];
+       libraryHaskellDepends = [ base directory HaXml pandoc ];
        jailbreak = true;
        homepage = "http://github.com/peti/halipeto";
        description = "Haskell Static Web Page Generator";
@@ -59590,13 +61060,15 @@ self: {
        sha256 = "0rxcklxmfk6z9f3alvzszq7g5wik7x9nj43m4vvf6iw1nsjvk580";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bin-package-db containers directory filepath foreign-store
-         fsnotify ghc ghc-paths system-filepath transformers
+       libraryHaskellDepends = [ base containers foreign-store ];
+       executableHaskellDepends = [
+         base bin-package-db directory filepath fsnotify ghc ghc-paths
+         system-filepath transformers
        ];
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma" = callPackage
@@ -59611,11 +61083,14 @@ self: {
        sha256 = "04b0djijhmgwr79hkprikqxdzfxabavrvkwmb1pv9qybsa82j6sc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base containers data-default diagrams-cairo diagrams-gtk
-         diagrams-lib grid gtk mtl mvc pipes timeit
+       libraryHaskellDepends = [
+         base containers data-default diagrams-lib grid
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         async base data-default diagrams-cairo diagrams-gtk diagrams-lib
+         gtk mtl mvc pipes timeit
+       ];
+       testHaskellDepends = [
          base containers grid HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -59632,7 +61107,7 @@ self: {
        sha256 = "0l2qlibfxj8n7jqqqrbswx3fgislxz39075bhip07qx55193dx2f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hint process ];
+       executableHaskellDepends = [ base hint process ];
        description = "looks for functions given a set of example input/outputs";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -59643,7 +61118,7 @@ self: {
        pname = "hamid";
        version = "0.10";
        sha256 = "19792k9pwpkqwqznxm00nbq22swnayz7fv60ly0wsw5zmf1g6wv8";
-       buildDepends = [ base HCodecs newtype ];
+       libraryHaskellDepends = [ base HCodecs newtype ];
        description = "Binding to the OS level Midi services (fork of system-midi)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59654,7 +61129,7 @@ self: {
        pname = "hamlet";
        version = "1.2.0";
        sha256 = "0rla3ap3malk8j6mh07fr2aqvbscpy743wrfq3skgjv3j4jlpjfi";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Haml-like template files that are compile-time checked (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -59670,7 +61145,7 @@ self: {
        sha256 = "0y7lsh16xrlgsgfsqw00ldcdcjwsy8cziw8p3g753k9m23can4wl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath Glob
          preprocessor-tools
        ];
@@ -59686,7 +61161,7 @@ self: {
        pname = "hamtmap";
        version = "0.3";
        sha256 = "04fr1wjlbmr0c9cp9ybdcirlgayw843klxi0lwl9b9pzwzn0glfl";
-       buildDepends = [ array base deepseq hashable ];
+       libraryHaskellDepends = [ array base deepseq hashable ];
        homepage = "https://github.com/exclipy/pdata";
        description = "A purely functional and persistent hash map";
        license = stdenv.lib.licenses.bsd3;
@@ -59703,10 +61178,11 @@ self: {
        sha256 = "1gfzydgnf8fffsl2f189gy81pb13dbf81i1a83laqsck6dhp60in";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers directory filepath haskore HaXml musicxml
-         non-negative process
+       libraryHaskellDepends = [
+         base containers directory haskore HaXml musicxml non-negative
+         process
        ];
+       executableHaskellDepends = [ filepath ];
        jailbreak = true;
        homepage = "https://troglodita.di.uminho.pt/svn/musica/work/HaMusic";
        description = "Library to handle abstract music";
@@ -59727,12 +61203,18 @@ self: {
        sha256 = "1rm61kzvy8vrqmpa82y98hdf3dhqxkq9yh583p0l48zfj28ljh91";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base64-bytestring binary bytestring case-insensitive cmdargs
+       libraryHaskellDepends = [
+         base base64-bytestring binary bytestring case-insensitive
          data-default directory filepath GenericPretty HTTP http-conduit
          json network old-locale pretty process pureMD5 random regex-posix
          resourcet split time unix-compat utf8-string xml
        ];
+       executableHaskellDepends = [
+         base base64-bytestring binary bytestring case-insensitive cmdargs
+         directory filepath GenericPretty HTTP http-conduit json network
+         old-locale pretty process pureMD5 random regex-posix resourcet
+         split time unix-compat utf8-string xml
+       ];
        homepage = "http://code.google.com/p/hgdata";
        description = "Library and command-line utility for accessing Google services and APIs";
        license = stdenv.lib.licenses.mit;
@@ -59746,7 +61228,12 @@ self: {
        sha256 = "0x0ix66wcpv172rxk9daifirnrcbblkjlvlg762z4i7qhipjfi2n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring containers scientific ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers scientific
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers scientific
+       ];
        homepage = "http://code.bwbush.io/handa-geodata/";
        description = "Geographic and Geometric Data";
        license = stdenv.lib.licenses.mit;
@@ -59758,7 +61245,7 @@ self: {
        pname = "handle-like";
        version = "0.1.0.2";
        sha256 = "1cn7423962fg21m75ww5gpg2kwbn1fb7y76hgfq9n6hhbnz8nd4m";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59773,11 +61260,13 @@ self: {
        pname = "handsy";
        version = "0.0.14";
        sha256 = "1a2yzpj883wsn013cy2jvn6wjsqqyf5xn91nkw6f5cg4sd9znzmy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class operational process-extras retry
          shell-escape split transformers
        ];
-       testDepends = [ base bytestring tasty tasty-hunit tasty-th ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit tasty-th
+       ];
        jailbreak = true;
        homepage = "https://github.com/utdemir/handsy";
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
@@ -59792,7 +61281,7 @@ self: {
        sha256 = "0k86z27qiaz967hsdnb3sac5ybmnyzd4d2gxzvdngw8rcvcq3biy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl random utility-ht ];
+       executableHaskellDepends = [ base mtl random utility-ht ];
        description = "Hangman implementation in Haskell written in two hours";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -59808,7 +61297,7 @@ self: {
        sha256 = "072f9zsfrs8g6nw83g6qzczzybngrhyrm1m2y7ha37vf0y9gdpn0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory formatting http-types lens
          lens-aeson process scotty text transformers unix-time wai-extra
          wai-middleware-static yaml
@@ -59829,12 +61318,17 @@ self: {
        sha256 = "19zmwwnccmr1smypm8xbxh1r0fcrd9967dqcrjw5mm9675v1iw0p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-html blaze-markup bytestring cereal containers
-         fingertree HTTP monadLib network old-locale random time unix
+       libraryHaskellDepends = [
+         base bytestring cereal containers fingertree monadLib random time
+         unix
+       ];
+       executableHaskellDepends = [
+         base blaze-html blaze-markup bytestring cereal containers HTTP
+         monadLib network old-locale time
        ];
        description = "IPv4 Network Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans-pcap" = callPackage
@@ -59843,11 +61337,12 @@ self: {
        pname = "hans-pcap";
        version = "0.1.0.2";
        sha256 = "10zj129s6l4gf9acvs1yahdwv5vqj9kqwshvfjdak3gbi7arw48s";
-       buildDepends = [ base bytestring hans pcap ];
+       libraryHaskellDepends = [ base bytestring hans pcap ];
        jailbreak = true;
        homepage = "https://github.com/tolysz/hans-pcap";
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans-pfq" = callPackage
@@ -59856,7 +61351,7 @@ self: {
        pname = "hans-pfq";
        version = "0.1.0.0";
        sha256 = "07jspsi8y921n5m5ar93w4gqaff4mjx79ss416ccm4s1k4l2km0b";
-       buildDepends = [ base bytestring hans pfq ];
+       libraryHaskellDepends = [ base bytestring hans pfq ];
        jailbreak = true;
        homepage = "https://github.com/tolysz/hans-pfq";
        description = "Driver for real ethernet devices for HaNS";
@@ -59875,11 +61370,15 @@ self: {
        sha256 = "1bw37wb7wwf6qagp5q0i9biy5cma6i0yvn7z051da3gnad89iil1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat either filepath mtl old-locale process time
          time-locale-compat transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base base-compat either filepath mtl old-locale process time
+         time-locale-compat transformers
+       ];
+       testHaskellDepends = [
          base base-compat directory either filepath hspec mtl old-locale
          process temporary time time-locale-compat transformers
        ];
@@ -59896,9 +61395,11 @@ self: {
        pname = "happindicator";
        version = "0.0.4";
        sha256 = "1d0ycpxmlz2ab8dzys7i6ihc3rbs43d0l5l2mxvshqbpj3j73643";
-       buildDepends = [ array base bytestring containers glib gtk mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ appindicator ];
+       libraryHaskellDepends = [
+         array base bytestring containers glib gtk mtl
+       ];
+       libraryPkgconfigDepends = [ appindicator ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
@@ -59913,8 +61414,9 @@ self: {
        sha256 = "09h3077s61krg814aw2whgc869m6ff96rrxfk6rjpjy71lkmcl92";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base glib gtk3 text ];
-       pkgconfigDepends = [ appindicator ];
+       libraryHaskellDepends = [ base glib gtk3 ];
+       libraryPkgconfigDepends = [ appindicator ];
+       executableHaskellDepends = [ base gtk3 text ];
        jailbreak = true;
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
@@ -59930,7 +61432,7 @@ self: {
        sha256 = "1vcbfil9wxhk7vrmrmkn094rb281h4a3mrzpw5gl1842dpp5hp1g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59943,7 +61445,9 @@ self: {
        pname = "happs-hsp";
        version = "0.1";
        sha256 = "0l1gb0qhhmld77qyz8qclbqxnv0hvyvjhav78690z50kvpjpqrxx";
-       buildDepends = [ base bytestring HAppS-Server hsp mtl plugins ];
+       libraryHaskellDepends = [
+         base bytestring HAppS-Server hsp mtl plugins
+       ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -59956,7 +61460,7 @@ self: {
        pname = "happs-hsp-template";
        version = "0.2";
        sha256 = "0591ipk9zzzznmhz5wpp3qk7fkirhcp801qnk399jsms66fc8378";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath HAppS-Server hinotify
          hsp mtl network plugins RJson
        ];
@@ -59978,7 +61482,7 @@ self: {
        sha256 = "1pkk78npgrr6dar00n93j6fbbkjam6198lkxp3q4zpdqspz4qypn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers DebugTraceHelpers directory filepath
          happstack happstack-data happstack-helpers happstack-ixset
          happstack-server happstack-state hscolour HStringTemplate
@@ -59999,7 +61503,7 @@ self: {
        sha256 = "1dfmfyrynggf1ff6364kb9a53rm64zhirx6ispnhykwdf60zbm6r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base happstack-server ];
+       libraryHaskellDepends = [ base happstack-server ];
        jailbreak = true;
        homepage = "http://happstack.com";
        description = "The haskell application server stack + code generation";
@@ -60015,7 +61519,7 @@ self: {
        pname = "happstack-auth";
        version = "0.2.1.1";
        sha256 = "0mfd2r88681dskn1l1gcbam8rvaqsry09zavywkm4kvmw8912vy4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers convertible happstack happstack-data
          happstack-ixset happstack-server happstack-state mtl old-time
          random
@@ -60041,7 +61545,7 @@ self: {
        pname = "happstack-authenticate";
        version = "2.1.4";
        sha256 = "075bncl5mz7hi674gyhd9mrnf3xb8zn5frcy39dj5m7jrsrdy91z";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default filepath happstack-hsp
          happstack-jmacro happstack-server hsp hsx-jmacro hsx2hs
@@ -60064,7 +61568,7 @@ self: {
        pname = "happstack-clientsession";
        version = "7.3.0";
        sha256 = "1dh6l52mfd6p9y39lr0qax1gs7rxpamy21iwxca7ylbhlqyxfa2g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal clientsession happstack-server monad-control
          mtl safecopy transformers-base
        ];
@@ -60084,11 +61588,12 @@ self: {
        sha256 = "0cqdfnjcmghw3wwny2brw51qbkvi8ps2crl8382sqwqq9gkw0l75";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory happstack-data happstack-ixset
-         happstack-server happstack-state happstack-util HTTP HUnit mtl
-         network old-time syb unix
+         happstack-server happstack-state happstack-util HTTP mtl network
+         old-time syb unix
        ];
+       executableHaskellDepends = [ HUnit ];
        jailbreak = true;
        homepage = "http://happstack.com";
        description = "Web related tools and services";
@@ -60107,7 +61612,7 @@ self: {
        sha256 = "0v2ln4mdnild72p02mzjn8mn5srvjixsjqjgkdqzshvxjnnm95l8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers mtl pretty syb syb-with-class
          syb-with-class-instances-text template-haskell text time
        ];
@@ -60127,7 +61632,7 @@ self: {
        pname = "happstack-dlg";
        version = "0.1.2";
        sha256 = "1zm8f224r0nwpykvil8s05lcswrw31iigcw9arnf4j362y03n2qp";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base bytestring containers formlets
          happstack-server mtl random template-haskell time xhtml
        ];
@@ -60151,14 +61656,14 @@ self: {
        sha256 = "1rfd2rkizviq7pv6lmhkp0dmwwk2m25kz9vzczk3ycm57mk7ql8c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base bytestring containers filepath happstack
          happstack-data happstack-hsp happstack-ixset happstack-server
          happstack-state happstack-util harp hsp hsx html HTTP json mtl
          network old-time random RJson syb text time utf8-string web-routes
          web-routes-mtl
        ];
-       buildTools = [ trhsx ];
+       executableToolDepends = [ trhsx ];
        homepage = "http://src.seereason.com/happstack-facebook/";
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
@@ -60173,7 +61678,7 @@ self: {
        pname = "happstack-fastcgi";
        version = "0.1.5";
        sha256 = "0rvb041nx2f8azvfy1yysisjqrmsfbxnccn992v5q7zhlglcvj8h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi containers fastcgi happstack-server mtl
          utf8-string
        ];
@@ -60189,7 +61694,7 @@ self: {
        pname = "happstack-fay";
        version = "0.2.0";
        sha256 = "1mwx7ki35s6x3ypxl8sv611a2h4zxwd77ij95bydf5azzz9l6ys5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base fay happstack-fay-ajax happstack-server mtl
        ];
        jailbreak = true;
@@ -60205,7 +61710,7 @@ self: {
        pname = "happstack-fay-ajax";
        version = "0.2.0";
        sha256 = "0zdkvvmywnfvqg5jdvf29qczzxmprvspxj0r1vj46fd6vld53j4j";
-       buildDepends = [ fay-base fay-jquery ];
+       libraryHaskellDepends = [ fay-base fay-jquery ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Support for using Fay with Happstack";
@@ -60222,7 +61727,7 @@ self: {
        pname = "happstack-foundation";
        version = "0.5.8";
        sha256 = "1sbqp78mgnc5rrnn35myd0izlh3w1nv5pgpg807w3cax2xakw3bh";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state base happstack-hsp happstack-server hsp lifted-base
          monad-control mtl reform reform-happstack reform-hsp safecopy text
          web-routes web-routes-happstack web-routes-hsp web-routes-th
@@ -60239,7 +61744,7 @@ self: {
        pname = "happstack-hamlet";
        version = "7.0.4";
        sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a";
-       buildDepends = [ base happstack-server shakespeare text ];
+       libraryHaskellDepends = [ base happstack-server shakespeare text ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Support for Hamlet HTML templates in Happstack";
@@ -60254,7 +61759,7 @@ self: {
        pname = "happstack-heist";
        version = "7.2.4";
        sha256 = "1ax1fyw9788iilmczqr6s1ryh2h9x2f6n9c8mqxjmq58zg1lc2d3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring either filepath happstack-server
          heist mtl text
        ];
@@ -60277,7 +61782,7 @@ self: {
        pname = "happstack-helpers";
        version = "0.56";
        sha256 = "0yrspdcgxj2izivwm7fy8msfbzlpdn3zv0j1z6b1smzydcbad202";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers DebugTraceHelpers directory filepath
          happstack-data happstack-ixset happstack-server happstack-state
          haskell98 hscolour HSH HStringTemplate HStringTemplateHelpers HTTP
@@ -60299,7 +61804,7 @@ self: {
        pname = "happstack-hsp";
        version = "7.3.5";
        sha256 = "0p8hidcdrqj7n4b9a5gbc0ic279wjmxvjacn6b8nzcnridq3mif6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring happstack-server harp hsp hsx2hs mtl syb text
          utf8-string
        ];
@@ -60318,7 +61823,7 @@ self: {
        pname = "happstack-hstringtemplate";
        version = "7.0.4";
        sha256 = "1pcj6vixzrbdmqi2yxcxhjnj5rdwlyg4nzcjkgks01ilgpg7fsf4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring happstack-server hslogger HStringTemplate mtl
        ];
        jailbreak = true;
@@ -60337,7 +61842,7 @@ self: {
        sha256 = "1hnhn0iyfw5rknz17p7m1p3rrngr77zv3lkni8d35q50bzzyw8ni";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers happstack-data happstack-util mtl syb
          syb-with-class template-haskell
        ];
@@ -60357,7 +61862,7 @@ self: {
        pname = "happstack-jmacro";
        version = "7.0.10";
        sha256 = "0kzp3dfy2qrd9bwq3lwnxvh1zibw7kib8w8rfqz36k0ywdwq8768";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cereal digest happstack-server
          jmacro text utf8-string wl-pprint-text
        ];
@@ -60372,7 +61877,9 @@ self: {
        pname = "happstack-lite";
        version = "7.3.6";
        sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8";
-       buildDepends = [ base bytestring happstack-server mtl text ];
+       libraryHaskellDepends = [
+         base bytestring happstack-server mtl text
+       ];
        homepage = "http://www.happstack.com/";
        description = "Happstack minus the useless stuff";
        license = stdenv.lib.licenses.bsd3;
@@ -60386,7 +61893,7 @@ self: {
        pname = "happstack-monad-peel";
        version = "0.1";
        sha256 = "0v6lshy572pvzhgqphyrhw8w2wsgxp9mqz8p3lrxmcp3i7sgqbry";
-       buildDepends = [
+       libraryHaskellDepends = [
          base happstack-server monad-peel mtl transformers
        ];
        description = "monad-peel instances for Happstack types";
@@ -60402,7 +61909,7 @@ self: {
        pname = "happstack-plugins";
        version = "7.0.2";
        sha256 = "07zh0gk77rbd1akzax29l7d6412sx5ghjhz640d6cbzxs39nlaif";
-       buildDepends = [
+       libraryHaskellDepends = [
          base happstack-server mtl plugins-auto template-haskell th-lift
        ];
        jailbreak = true;
@@ -60425,7 +61932,7 @@ self: {
        pname = "happstack-server";
        version = "7.4.4";
        sha256 = "1whyv6rb4b9x9m381fs8938n74dgq7hd9gpznwnlzh76ah2nanjf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
          monad-control mtl network network-uri old-locale parsec process
@@ -60433,7 +61940,9 @@ self: {
          time-compat transformers transformers-base transformers-compat unix
          utf8-string xhtml zlib
        ];
-       testDepends = [ base bytestring containers HUnit parsec zlib ];
+       testHaskellDepends = [
+         base bytestring containers HUnit parsec zlib
+       ];
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
@@ -60448,11 +61957,11 @@ self: {
        pname = "happstack-server-tls";
        version = "7.1.6";
        sha256 = "00fmgws8hc0v1lsmxlj478xdbmlpgaz581m9hqw5nfjljg8mi74w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-exceptions happstack-server hslogger
          HsOpenSSL network sendfile time unix
        ];
-       extraLibraries = [ openssl ];
+       librarySystemDepends = [ openssl ];
        homepage = "http://www.happstack.com/";
        description = "extend happstack-server with https:// support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
@@ -60469,7 +61978,7 @@ self: {
        sha256 = "1xfp0546z70sfda0z7w7ns4jhgcbx3vmnz4vsnckzhgflzmdixq9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory extensible-exceptions
          filepath happstack-data happstack-util hslogger mtl old-time random
          stm syb template-haskell unix
@@ -60489,7 +61998,7 @@ self: {
        pname = "happstack-static-routing";
        version = "0.4.2";
        sha256 = "0g8b94mfhajgs99rgvzfrlc19cxm5a0j6cgrrlrdhgfx7lggc9h2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers happstack-server list-tries transformers
        ];
        homepage = "https://github.com/scrive/happstack-static-routing";
@@ -60509,7 +62018,7 @@ self: {
        sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring directory extensible-exceptions filepath
          hslogger mtl network old-locale old-time parsec process random
          template-haskell time unix unix-compat
@@ -60531,7 +62040,7 @@ self: {
        pname = "happstack-yui";
        version = "7373.5.3";
        sha256 = "178r3jqxmrdp0glp9p4baw8x7zk0w8j4m5l173rjnz9yxn53nyni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base boomerang bytestring containers directory happstack-jmacro
          happstack-server hsp interpolatedstring-perl6 jmacro mtl pretty
          template-haskell text web-routes web-routes-boomerang
@@ -60545,22 +62054,21 @@ self: {
      }) {};
 
   "happy" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, perl, process }:
+    ({ mkDerivation, array, base, containers, mtl, process }:
      mkDerivation {
        pname = "happy";
        version = "1.19.5";
-       revision = "1";
        sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32";
+       revision = "1";
        editedCabalFile = "d6a01f50aab2c480799b7d19643c5bb01891e01ac97aa892ffec3e6029a1446c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl ];
-       testDepends = [ base process ];
-       buildTools = [ perl ];
+       executableHaskellDepends = [ array base containers mtl ];
+       testHaskellDepends = [ base process ];
        homepage = "http://www.haskell.org/happy/";
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) perl;};
+     }) {};
 
   "happy-meta" = callPackage
     ({ mkDerivation, array, base, containers, happy, haskell-src-meta
@@ -60570,13 +62078,12 @@ self: {
        pname = "happy-meta";
        version = "0.2.0.8";
        sha256 = "0hnj039vspqvym70c59y80ygb8ciz5bf18sqm0dbvzr5v2mixbag";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers haskell-src-meta mtl template-haskell
        ];
-       buildTools = [ happy ];
+       libraryToolDepends = [ happy ];
        description = "Quasi-quoter for Happy parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happybara" = callPackage
@@ -60587,7 +62094,7 @@ self: {
        pname = "happybara";
        version = "0.0.1";
        sha256 = "1lp2awvj077d16gppir6nv9fx6d9g1k7w6j01bxkffy3q5x04xrv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base filepath http-types lifted-base monad-control mtl text
          time transformers transformers-base
        ];
@@ -60608,7 +62115,7 @@ self: {
        pname = "happybara-webkit";
        version = "0.0.1";
        sha256 = "17446wkyljwd7nq6mhsj2v411zb9wsz833sczm4nzcigywvhx4fw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring case-insensitive data-default directory
          filepath happybara http-types lifted-base monad-control mtl network
          process text time transformers transformers-base vector word8
@@ -60626,7 +62133,7 @@ self: {
        pname = "happybara-webkit-server";
        version = "0.0.1";
        sha256 = "0vh9ig9mvg12qgysk7gbqwiib3m2ciwi10asb1i0x25xjp585shi";
-       buildDepends = [ base directory filepath process ];
+       libraryHaskellDepends = [ base directory filepath process ];
        jailbreak = true;
        homepage = "https://github.com/cstrahan/happybara/happybara-webkit-server";
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
@@ -60641,7 +62148,9 @@ self: {
        pname = "har";
        version = "0.1.1.0";
        sha256 = "0x51sqlybfq2pqv6nrhvf50yds3gs08sfih7zi9ijvn5dkrxx1z3";
-       buildDepends = [ aeson base bytestring directory filepath text ];
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath text
+       ];
        jailbreak = true;
        homepage = "https://github.com/freizl/har";
        description = "HAR spec in Haskell";
@@ -60658,8 +62167,10 @@ self: {
        sha256 = "10485indn9sszq3514gs547phb0kpikm8m6ykq1ns2kp0pmkgz9m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary network parsec unix zlib ];
-       extraLibraries = [ openssl sqlite ];
+       executableHaskellDepends = [
+         base binary network parsec unix zlib
+       ];
+       executableSystemDepends = [ openssl sqlite ];
        homepage = "http://www.davidb.org/darcs/harchive/";
        description = "Networked content addressed backup and restore software";
        license = "GPL";
@@ -60676,7 +62187,7 @@ self: {
        sha256 = "1wxwxx3l4zvb1jr19lckamb0gxywsq1f4n4ncb373vqdnwnrr8x4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath haskell98 mtl old-locale
          old-time regex-pcre
        ];
@@ -60694,10 +62205,10 @@ self: {
        pname = "haroonga";
        version = "0.1.7.1";
        sha256 = "0j4668611qazzwb4w05v0xliw1w0a7kmlz0g2z9ixz0kywbfim2g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL monad-control resourcet transformers
        ];
-       pkgconfigDepends = [ groonga ];
+       libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
      }) { groonga = null;};
@@ -60712,7 +62223,7 @@ self: {
        sha256 = "1745b7khz1dn7n9w3z89na01jap62vbg1mb6c7i9n2mgwkkrys5g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory haroonga http-types old-locale optparse-applicative
          scotty text time transformers wai-extra
        ];
@@ -60726,7 +62237,7 @@ self: {
        pname = "harp";
        version = "0.4.1";
        sha256 = "0q9q3rw9yqkryjf5vvm41ckycqjfaxnsrmc1p0kmdrlb4f4dgclz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/seereason/harp";
        description = "HaRP allows pattern-matching with regular expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -60740,14 +62251,13 @@ self: {
        pname = "harpy";
        version = "0.6.0.2";
        sha256 = "1rlbakwqfjfr3d71jc6d5nyw5ms0y9wmb79p8jax45rxk1a8cfry";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers disassembler mtl parsec pretty
          template-haskell
        ];
        homepage = "https://github.com/mgrabmueller/harpy";
        description = "Runtime code generation for x86 machine code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "has" = callPackage
@@ -60758,7 +62268,7 @@ self: {
        sha256 = "0zydwhr2ac66knmrlf0b9vsys61w6370g9rid2gag2dvmy7xqp2s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/nonowarn/has";
        description = "Entity based records";
        license = stdenv.lib.licenses.bsd3;
@@ -60771,7 +62281,7 @@ self: {
        pname = "has-th";
        version = "0.1";
        sha256 = "0yyrfd8mgxwyfgwcg61q7yj2cq2zj6zlk1l340y4vzj71r53qgc4";
-       buildDepends = [ base has template-haskell ];
+       libraryHaskellDepends = [ base has template-haskell ];
        homepage = "http://github.com/chrisdone/has-th";
        description = "Template Haskell function for Has records";
        license = stdenv.lib.licenses.bsd3;
@@ -60786,8 +62296,9 @@ self: {
        sha256 = "1nq383fg2cn82rbmnp6kgzyk42fgp9xnqj84ypz0kf42954n4h1l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base numbers ];
-       testDepends = [ HUnit ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base numbers ];
+       testHaskellDepends = [ HUnit ];
        homepage = "http://darcsden.com/mekeor/hascal";
        description = "A minimalistic but extensible and precise calculator";
        license = "GPL";
@@ -60804,7 +62315,7 @@ self: {
        sha256 = "04z9q3l2hwf7lii8d3cxbh7zh6cqbbmy07yv5bal4lvrnd1wqia7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring hascat-lib hascat-setup hascat-system HaXml haxr
          html HTTP network unix
        ];
@@ -60823,7 +62334,7 @@ self: {
        pname = "hascat-lib";
        version = "0.2";
        sha256 = "0l2cixgnyv2xhbpvkzrrn1wxikx7gcmwpkwagkfzx27iy33xkrqj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory haskell98 HaXml html HTTP mtl
          network old-locale old-time parsec plugins xhtml
        ];
@@ -60843,7 +62354,10 @@ self: {
        sha256 = "058abyr70yr2130nbi64zhigglw207dh5anyxzw19c1qk4zmwsyi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory hascat-lib hascat-system haskell98 plugins
+       ];
+       executableHaskellDepends = [
          base directory hascat-lib hascat-system haskell98 plugins
        ];
        description = "Hascat Installation helper";
@@ -60859,7 +62373,7 @@ self: {
        pname = "hascat-system";
        version = "0.2";
        sha256 = "1fabn71llrlxs5xlcpzkkvzjv7zibxlna0jvh6rkrz6pqyp1nd94";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers hascat-lib HaXml HTTP mtl network
          old-time parsec plugins unix
        ];
@@ -60878,11 +62392,11 @@ self: {
        pname = "hash";
        version = "0.2.0.1";
        sha256 = "1ka6izpkz6gs4ag3xvnslxywi9344w3mh9rl968vq6ck203pv2rx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring data-default generic-deriving hashable
          lens transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/analytics/hash/";
        description = "Hashing tools";
@@ -60899,8 +62413,10 @@ self: {
        pname = "hashable";
        version = "1.2.3.3";
        sha256 = "0kp4aj0x1iicz9qirpqxxqd8x5g1njbapxk1d90n406w3xykz4pw";
-       buildDepends = [ base bytestring ghc-prim integer-gmp text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
          base bytestring ghc-prim HUnit QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2 text unix
        ];
@@ -60917,10 +62433,10 @@ self: {
        pname = "hashable-extras";
        version = "0.2.2";
        sha256 = "118l23n78xs1faa0q42h996q210l2p9mzl85a73krljzsz8wkc1b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring hashable transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/analytics/hashable-extras/";
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
@@ -60934,8 +62450,8 @@ self: {
        pname = "hashable-generics";
        version = "1.1.8";
        sha256 = "1l5i4lasz32hsjvm9fbf7p9fy7s6bjy868w7rmpxci40qkz7ffhq";
-       buildDepends = [ base ghc-prim hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base ghc-prim hashable ];
+       testHaskellDepends = [
          base ghc-prim hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -60952,7 +62468,7 @@ self: {
        pname = "hashable-time";
        version = "0.1.0.1";
        sha256 = "1137cc7jyyn293g3nx9bs4mw4r8i7k9cq0rz5f5rs7j8997gkmbf";
-       buildDepends = [ base hashable time ];
+       libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -60965,7 +62481,7 @@ self: {
        pname = "hashabler";
        version = "0.1.0.2";
        sha256 = "0n3cw5vc48144kddz0krcm682bcigdafap81kdkvhq8alhc50532";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring ghc-prim integer-gmp primitive
          template-haskell text
        ];
@@ -60984,7 +62500,7 @@ self: {
        sha256 = "0s8mnayxlvwrrii2l63b372yi5g08br6gpbgz2256d8y128mwjvk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dataenc directory
          extensible-exceptions filepath mmap mtl zlib
        ];
@@ -60999,11 +62515,10 @@ self: {
        pname = "hashids";
        version = "1.0.2.1";
        sha256 = "03q0fcxiw4yncmbdirnh6kaz9jhyxqy348dnrvgkbn4mzkh8fi2z";
-       buildDepends = [ base bytestring containers split ];
+       libraryHaskellDepends = [ base bytestring containers split ];
        homepage = "http://hashids.org/";
        description = "Hashids generates short, unique, non-sequential ids from numbers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashmap" = callPackage
@@ -61012,7 +62527,7 @@ self: {
        pname = "hashmap";
        version = "1.3.0.1";
        sha256 = "16scl1rbq0f18mggrj4lbhgkz7kzshsw9a523rjd8cjkdjz1ijwr";
-       buildDepends = [ base containers deepseq hashable ];
+       libraryHaskellDepends = [ base containers deepseq hashable ];
        homepage = "http://git.auryn.cz/haskell/hashmap/";
        description = "Persistent containers Map and Set based on hashing";
        license = stdenv.lib.licenses.bsd3;
@@ -61026,8 +62541,8 @@ self: {
        pname = "hashring";
        version = "0.0.0";
        sha256 = "05q9iay0ygr79x8yikgbi99v74kagyrd68zvjx8qakfzqgs9a19j";
-       buildDepends = [ base containers hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers hashable ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -61042,7 +62557,9 @@ self: {
        pname = "hashtables";
        version = "1.2.0.2";
        sha256 = "0dqq5ssgkqzplqf5dmc4l8cj28j5py7i6n6a069qn4cibvxfjaq1";
-       buildDepends = [ base ghc-prim hashable primitive vector ];
+       libraryHaskellDepends = [
+         base ghc-prim hashable primitive vector
+       ];
        homepage = "http://github.com/gregorycollins/hashtables";
        description = "Mutable hash tables in the ST monad";
        license = stdenv.lib.licenses.bsd3;
@@ -61055,7 +62572,9 @@ self: {
        pname = "hashtables-plus";
        version = "0.2.0";
        sha256 = "0g9jmc15g36iy0wmmsj74qwybh509j4lf8jzv3dws7c2j24kc7l7";
-       buildDepends = [ base hashable hashtables loch-th placeholders ];
+       libraryHaskellDepends = [
+         base hashable hashtables loch-th placeholders
+       ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hashtables-plus";
        description = "Extensions for a \"hashtables\" library";
@@ -61068,7 +62587,7 @@ self: {
        pname = "hasim";
        version = "0.1.2";
        sha256 = "03wn142r0sh7adfghjqwb2mgq4rgkqs8nq2rx2jq717dr2xp987n";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://huygens.functor.nl/hasim/";
        description = "Process-Based Discrete Event Simulation library";
        license = stdenv.lib.licenses.bsd3;
@@ -61082,10 +62601,10 @@ self: {
      mkDerivation {
        pname = "hask";
        version = "0";
-       revision = "1";
        sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39";
+       revision = "1";
        editedCabalFile = "04abcba45a7fbaa11d7f3bd9834f1e70a30f356ae871e59ab472f20d4cd60026";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints ghc-prim reflection tagged transformers void
        ];
        homepage = "http://github.com/ekmett/hask";
@@ -61104,7 +62623,7 @@ self: {
        sha256 = "128hkd1yycjvbnvwjd2r2mxhjdnmfkghyf0fcslh9fxprqgrhk18";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal directory hmarkup hsemail network parsec process
          regex-compat xhtml
        ];
@@ -61124,7 +62643,7 @@ self: {
        sha256 = "19cglzgzxbg65qr7m68gnc6y45b7n0wl98pgd9jrk20sblrhc6p6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers errors haskell-src text text-format
        ];
        homepage = "http://github.com/singpolyma/haskades";
@@ -61140,12 +62659,14 @@ self: {
        pname = "haskakafka";
        version = "1.0.0";
        sha256 = "0j1vii11lp91gydw3h0hb2b3lb85n9cji9m9rvb1d7svs91nhhk7";
-       buildDepends = [ base bytestring containers temporary unix ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers temporary unix
+       ];
+       librarySystemDepends = [ rdkafka ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
          base bytestring containers either-unwrap hspec regex-posix
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ rdkafka ];
        homepage = "http://github.com/cosbynator/haskakafka";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -61161,7 +62682,7 @@ self: {
        sha256 = "1k2y406kjxyv3sdpa50m6i15z2aiysy43xhjgln99v21x6rp08ia";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base freenect hcwiid IfElse MissingH mtl SDL SDL-image SDL-mixer
          SDL-ttf transformers vector Yampa
        ];
@@ -61181,7 +62702,7 @@ self: {
        sha256 = "01l90qningjlb4wn02avjy9lmi4ry4yxzw0a9sd29qbzfpnf3viy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers cpphs directory her-lexer split
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
@@ -61197,11 +62718,11 @@ self: {
        pname = "haskbot-core";
        version = "0.1";
        sha256 = "0alqjgg2gvb9610s2b4fil5frknn5j8d6r558bfp1n6a0d51pz74";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring connection containers http-conduit http-types
          monads-tf stm text wai warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring connection containers hspec http-conduit
          http-types monads-tf stm text wai warp
        ];
@@ -61224,7 +62745,7 @@ self: {
        sha256 = "0ncx9wx9ldynqwq0zwljwqzskm5mrq8rx74np43pm9qxvjc9f5vx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base base16-bytestring bytestring cereal conduit
          conduit-combinators conduit-extra containers crypto-api
          crypto-conduit cryptohash cryptohash-cryptoapi directory filepath
@@ -61235,7 +62756,6 @@ self: {
        homepage = "https://github.com/maurotrb/haskdeep";
        description = "Computes and audits file hashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskdogs" = callPackage
@@ -61246,7 +62766,7 @@ self: {
        sha256 = "0vl3c66ki9j9ncs2rapdn80kbfk0l3y97qwfraqlnjycdl10sm6r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal filepath HSH ];
+       executableHaskellDepends = [ base Cabal filepath HSH ];
        homepage = "http://github.com/ierton/haskdogs";
        description = "Generate ctags file for haskell project directory and it's deps";
        license = stdenv.lib.licenses.bsd3;
@@ -61262,7 +62782,7 @@ self: {
        sha256 = "0fmglaiq2axpb9f4yyk53fpppc1ysqglqgjxhy78yl3r8mik836n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory haskeline haskell98 mtl network old-time
          parsec process random unix
        ];
@@ -61274,17 +62794,17 @@ self: {
 
   "haskeline_0_7_2_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , terminfo, transformers, unix, utf8-string
+     , terminfo, transformers, unix
      }:
      mkDerivation {
        pname = "haskeline";
        version = "0.7.2.1";
        sha256 = "09v4vy6nf23b13ws9whdqwv84mj1nhnla88rw2939qyqxb4a6mmf";
-       buildDepends = [
-         base bytestring containers directory filepath terminfo transformers
-         unix utf8-string
-       ];
        configureFlags = [ "-fterminfo" ];
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath terminfo transformers
+         unix
+       ];
        homepage = "http://trac.haskell.org/haskeline";
        description = "A command-line interface for user input, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -61296,7 +62816,7 @@ self: {
        pname = "haskeline-class";
        version = "0.6.2";
        sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl";
-       buildDepends = [ base haskeline mtl ];
+       libraryHaskellDepends = [ base haskeline mtl ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~aslatter/code/haskeline-class";
        description = "Class interface for working with Haskeline";
@@ -61315,7 +62835,7 @@ self: {
        pname = "haskell-aliyun";
        version = "0.1.0.0";
        sha256 = "1id1l7arf3yq9mym6ds58k5wins57k71v8fgzyhxsg81657vh74a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring basic-prelude blaze-builder bytestring
          case-insensitive conduit Crypto data-default http-conduit
          http-types lifted-base monad-control old-locale resourcet safe
@@ -61340,12 +62860,15 @@ self: {
        sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers stringsearch
+       ];
+       executableHaskellDepends = [
          base bytestring containers directory easy-file exceptions filepath
          haskell-src-exts hint mtl network process stringsearch time
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory doctest easy-file exceptions
          filepath haskell-src-exts hint hspec HUnit mtl network process
          stringsearch temporary test-framework test-framework-hunit time
@@ -61362,7 +62885,7 @@ self: {
        pname = "haskell-bcrypt";
        version = "0.3.1";
        sha256 = "1w8crppmm02qw03n59s7dnqfhmqwmd44sj8qm38bf90fabl1wa7d";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://www.github.com/zbskii/haskell-bcrypt";
        description = "A bcrypt implementation for haskell";
        license = stdenv.lib.licenses.mit;
@@ -61379,8 +62902,9 @@ self: {
        sha256 = "12yhnlcif0jj9pmi3a098f1swvnww45rg2rpn6g82bkjzmd4sjr8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring mtl parsec ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring mtl QuickCheck tasty tasty-quickcheck tasty-th
        ];
        jailbreak = true;
@@ -61400,10 +62924,11 @@ self: {
        sha256 = "0x1kjdxbayq6z85w9fw6c4mpixzl60332wxgx4nh0ih9235jfdhd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring containers directory extensible-exceptions
-         ghc-prim HSH HUnit MissingH mtl process random time unix
+       libraryHaskellDepends = [
+         array base bytestring containers extensible-exceptions ghc-prim HSH
+         HUnit MissingH mtl random time unix
        ];
+       executableHaskellDepends = [ base directory process ];
        homepage = "http://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc/";
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
        license = stdenv.lib.licenses.bsd3;
@@ -61416,7 +62941,7 @@ self: {
        pname = "haskell-coffee";
        version = "0.1.0.2";
        sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        description = "Simple CoffeeScript API";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -61430,7 +62955,12 @@ self: {
        sha256 = "0d0rfkl6ladsl0s033ny390nk5qkiwddg84di0d8hgxblqsxj11m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bimap boolean-list bytestring containers ];
+       libraryHaskellDepends = [
+         base bimap boolean-list bytestring containers
+       ];
+       executableHaskellDepends = [
+         base bimap boolean-list bytestring containers
+       ];
        homepage = "codekinder.com";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61441,7 +62971,7 @@ self: {
        pname = "haskell-course-preludes";
        version = "0.0.0.4";
        sha256 = "1r0vhaxcsszrcqnw70gz8xpfrqddmxf9kpka63gix1bjic4alzjn";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        jailbreak = true;
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
        license = stdenv.lib.licenses.mit;
@@ -61459,12 +62989,14 @@ self: {
        sha256 = "09xagxs0br6781flp430syfn6yv36ri0y1yki8cakrn7ak722fq2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base16-bytestring bytestring Cabal containers cryptohash
          directory filepath ghc ghc-paths haddock-api monad-loops process
          text unordered-containers
        ];
-       testDepends = [ base ];
+       executableHaskellDepends = [ base ghc text ];
+       testHaskellDepends = [ base ];
+       jailbreak = true;
        homepage = "http://github.com/chrisdone/haskell-docs";
        description = "A program to find and display the docs and type of a name";
        license = stdenv.lib.licenses.bsd3;
@@ -61483,11 +63015,14 @@ self: {
        sha256 = "0mrcd57g3pnn11smgak51pikxxf5zsi7h06f270pmf2r1vv2977b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers directory filepath haskell-src-exts
-         optparse-applicative scientific text unordered-containers yaml
+       libraryHaskellDepends = [
+         base containers haskell-src-exts scientific text
+         unordered-containers yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       testHaskellDepends = [
          base containers directory-tree doctest filemanip filepath hlint
          tasty tasty-hunit
        ];
@@ -61510,7 +63045,12 @@ self: {
        sha256 = "0736kh5q63qgvq23k5w06ds9538cwymk64i5wdycxh35lz64qaip";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base basic-prelude bytestring case-insensitive conduit directory
+         lifted-base monad-control network network-conduit process-conduit
+         system-filepath text transformers transformers-base unix
+       ];
+       executableHaskellDepends = [
          base basic-prelude bytestring case-insensitive conduit directory
          lifted-base monad-control network network-conduit process-conduit
          system-filepath text transformers transformers-base unix
@@ -61530,10 +63070,10 @@ self: {
        pname = "haskell-generate";
        version = "0.2.3";
        sha256 = "07j0z9jxxgbxfxz9bpy5w8nphrqsl5wyq1jysfhypfi7v87nv9an";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts template-haskell transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/bennofs/haskell-generate/";
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
@@ -61547,7 +63087,7 @@ self: {
        sha256 = "1rcz5s3xa0f9yalyqb540l47bzql8p18y2mmax1zr92m7sh7m274";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HGL random ];
+       executableHaskellDepends = [ base HGL random ];
        homepage = "http://www.informatik.uni-bremen.de/~cxl/lehre/pi3.ws01/asteroids/";
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
@@ -61560,7 +63100,7 @@ self: {
        pname = "haskell-lexer";
        version = "1.0";
        sha256 = "11jv30msg4rym73lk6j21ky2510c3av8qxk5p4z63j4m283w9l46";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A fully compliant Haskell 98 lexer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61571,8 +63111,8 @@ self: {
        pname = "haskell-modbus";
        version = "0.3.2";
        sha256 = "08bcw7g84509rak9xqn2g4pr1mk3a2clikgfdiafrsr7lff16gyf";
-       buildDepends = [ array base bytestring cereal ];
-       testDepends = [ array base bytestring cereal hspec ];
+       libraryHaskellDepends = [ array base bytestring cereal ];
+       testHaskellDepends = [ array base bytestring cereal hspec ];
        homepage = "http://www.github.com/jhickner/haskell-modbus";
        description = "A cereal-based parser for the Modbus protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -61588,11 +63128,13 @@ self: {
        sha256 = "1aw8jjvysdf3vsf6rcxnvwnqpiqmfrp88gryngakjjkxwzzh5an0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal extensible-exceptions
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ open-pal open-rte openmpi ];
+       librarySystemDepends = [ open-pal open-rte openmpi ];
+       libraryToolDepends = [ c2hs ];
+       executableSystemDepends = [ open-pal open-rte openmpi ];
+       executableToolDepends = [ c2hs ];
        homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -61609,12 +63151,12 @@ self: {
        pname = "haskell-names";
        version = "0.5.3";
        sha256 = "066mh4qgldh8nspinm97695zdhw5hkpz9mmrnc2a0y0wblggq5sm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-lens-light filepath
          haskell-packages haskell-src-exts hse-cpp mtl tagged transformers
          traverse-with-class type-eq uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal containers filemanip filepath
          haskell-packages haskell-src-exts hse-cpp mtl pretty-show tagged
          tasty tasty-golden traverse-with-class uniplate utf8-string
@@ -61622,7 +63164,6 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -61637,13 +63178,13 @@ self: {
        pname = "haskell-neo4j-client";
        version = "0.3.1.4";
        sha256 = "171ar3vfhgijy79p0a4wqm0b8bisgqf8iqzm17yb5pwirlfm5hi6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base mtl network-uri resourcet
          scientific text transformers transformers-base transformers-compat
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal data-default hashable HTTP http-conduit
          http-types HUnit lifted-base mtl network-uri QuickCheck resourcet
          scientific test-framework test-framework-hunit
@@ -61662,8 +63203,10 @@ self: {
        pname = "haskell-openflow";
        version = "0.0.0.1";
        sha256 = "1zrzkvw4i7jaz74g63k1yj1v2i9lsxgr8zj2b6p3srag1dwgnmkd";
-       buildDepends = [ base bytestring cereal network network-info ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [
+         base bytestring cereal network network-info
+       ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/brooksbp/haskell-openflow";
        description = "OpenFlow protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -61679,7 +63222,7 @@ self: {
        pname = "haskell-packages";
        version = "0.3";
        sha256 = "199srg8k8j2nirs83hx04r1hkwv83h4k73z1sji547f5w0zwnws0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq directory filepath
          haskell-src-exts hse-cpp mtl optparse-applicative tagged
          transformers transformers-compat
@@ -61700,7 +63243,7 @@ self: {
        sha256 = "11y3n7ldnlx8vq2qb42kn8fg6ikq42x28bm46ivydx7h3z0zf5s3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cairo containers directory filepath glib gtk
          old-locale poppler template-haskell time zlib
        ];
@@ -61726,7 +63269,7 @@ self: {
        sha256 = "0ki6mppxk9a6lm0miagr4mpsbjx66gizc3qxl5vfp7wvbc977bwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal cgi containers deepseq directory
          extensible-exceptions fgl filepath ghc ghc-prim GLUT haskell-src
          haskell98 hpc html HTTP HUnit mtl network old-locale old-time
@@ -61734,7 +63277,7 @@ self: {
          regex-compat regex-posix stm syb template-haskell time unix xhtml
          zlib
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/haskell-platform-test";
        description = "A test system for the Haskell Platform environment";
@@ -61750,7 +63293,7 @@ self: {
        pname = "haskell-plot";
        version = "0.1.0.0";
        sha256 = "0dwa2kz3sbnhc99kzhspf4hhid9q0c8irq8m9vr95l9kbq45avpi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Chart Chart-cairo Chart-gtk colour data-default lens
          math-functions vector
        ];
@@ -61766,8 +63309,8 @@ self: {
        pname = "haskell-qrencode";
        version = "1.0.4";
        sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ qrencode ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ qrencode ];
        homepage = "https://github.com/jamessanders/haskell-qrencode";
        description = "Haskell bindings for libqrencode";
        license = stdenv.lib.licenses.bsd3;
@@ -61781,7 +63324,7 @@ self: {
        pname = "haskell-reflect";
        version = "0.9";
        sha256 = "116vs8p9j0py3rxh0m53nanwsa99ga0lg9z3avn5r0clmpak9zyn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hint MonadCatchIO-mtl mtl parsec template-haskell
          transformers
        ];
@@ -61796,7 +63339,7 @@ self: {
        pname = "haskell-rules";
        version = "0.1.0.1";
        sha256 = "03d8c1gnxd923f3fqqw06w3ibnd20llfgd7s5jgkscc872i5ghz6";
-       buildDepends = [ base syb ];
+       libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61810,7 +63353,7 @@ self: {
        pname = "haskell-spacegoo";
        version = "0.2.0.1";
        sha256 = "0g6ximrv5jwibklkyr74vy3qkx8mv4xbpc7f6w1qg9gnlylzmcqy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra mtl pretty pretty-show
          text vector vector-space
        ];
@@ -61824,8 +63367,8 @@ self: {
        pname = "haskell-src";
        version = "1.0.2.0";
        sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a";
-       buildDepends = [ array base pretty syb ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ array base pretty syb ];
+       libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61839,12 +63382,12 @@ self: {
        pname = "haskell-src-exts";
        version = "1.15.0.1";
        sha256 = "0xp5i06c478vn5m504ax5dfa7p5zc0kflbdkm2ijdzc779lpbx45";
-       buildDepends = [ array base cpphs ghc-prim pretty ];
-       testDepends = [
+       libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
+       libraryToolDepends = [ happy ];
+       testHaskellDepends = [
          base containers directory filemanip filepath mtl smallcheck syb
          tasty tasty-golden tasty-smallcheck
        ];
-       buildTools = [ happy ];
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -61859,12 +63402,12 @@ self: {
        pname = "haskell-src-exts";
        version = "1.16.0.1";
        sha256 = "1h8gjw5g92rvvzadqzpscg73x7ajvs1wlphrh27afim3scdd8frz";
-       buildDepends = [ array base cpphs ghc-prim pretty ];
-       testDepends = [
+       libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
+       libraryToolDepends = [ happy ];
+       testHaskellDepends = [
          base containers directory filepath mtl smallcheck syb tasty
          tasty-golden tasty-smallcheck
        ];
-       buildTools = [ happy ];
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -61878,7 +63421,7 @@ self: {
        pname = "haskell-src-exts-qq";
        version = "0.6.1";
        sha256 = "0cblv8fk369236szwzwmyaxaa8fkwia5r50zz5ghfbglb2xvwsmn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta syb template-haskell
        ];
        description = "A quasiquoter for haskell-src-exts";
@@ -61887,15 +63430,14 @@ self: {
 
   "haskell-src-meta" = callPackage
     ({ mkDerivation, base, haskell-src-exts, pretty, syb
-     , template-haskell, th-orphans, uniplate
+     , template-haskell, th-orphans
      }:
      mkDerivation {
        pname = "haskell-src-meta";
        version = "0.6.0.10";
        sha256 = "0flcyimibz4flq66isshn2zsmzlly6sja6gfb0a0xn4ns4xpwpy1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
-         uniplate
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
@@ -61909,7 +63451,7 @@ self: {
        pname = "haskell-src-meta-mwotton";
        version = "0.1.0";
        sha256 = "04f0p3jxmvw1kqygvxihdr4dirapi6bdv2w213c2s771xbnx88nn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim haskell-src-exts pretty syb
          template-haskell
        ];
@@ -61929,11 +63471,11 @@ self: {
        pname = "haskell-token-utils";
        version = "0.0.0.6";
        sha256 = "14nzlw9vqnp70xcwan6mjsr318p2sky5nsyqxw5iivggy7qspp9r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dual-tree ghc ghc-paths ghc-syb-utils
          haskell-src-exts monoid-extras mtl pretty rosezipper semigroups syb
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers Diff directory dual-tree ghc ghc-mod ghc-paths
          ghc-prim ghc-syb-utils haskell-src-exts hspec HUnit monoid-extras
          mtl pretty QuickCheck rosezipper semigroups syb uniplate
@@ -61950,7 +63492,9 @@ self: {
        pname = "haskell-type-exts";
        version = "0.1.0";
        sha256 = "051lsg9j3dgkr2akannfaddawdhybvsnm6x6xafmdmwn31v73z98";
-       buildDepends = [ base containers haskell-src-exts pretty ];
+       libraryHaskellDepends = [
+         base containers haskell-src-exts pretty
+       ];
        homepage = "http://code.haskell.org/haskell-type-exts";
        description = "A type checker for Haskell/haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
@@ -61963,7 +63507,7 @@ self: {
        pname = "haskell-typescript";
        version = "0.1.0.0";
        sha256 = "0fv533nac6dlawgffr1kvn4xpv63hdcb4wgyqbbg2s6dg9a2hw38";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        jailbreak = true;
        description = "Simple TypeScript API";
        license = stdenv.lib.licenses.gpl3;
@@ -61975,7 +63519,7 @@ self: {
        pname = "haskell-tyrant";
        version = "0.4";
        sha256 = "1pqh1v0klpi8iq882l5gk0fsf87kabq6rw1wjwkiq6fvw8cc1l97";
-       buildDepends = [ base binary bytestring network ];
+       libraryHaskellDepends = [ base binary bytestring network ];
        homepage = "https://github.com/PeterScott/haskell-tyrant";
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -61992,7 +63536,7 @@ self: {
        sha256 = "0nd8xjlyr8zjrqj9mw6xpn3rxsj9vpb8khc6hq6dc5agmldl9z7a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath process
        ];
        homepage = "http://haskell.org/haskellwiki/Gentoo#haskell-updater";
@@ -62010,7 +63554,7 @@ self: {
        sha256 = "1z4x4mn0vry8mwq6ily668ignmf4s9m92fmga15dr83y7aq5wd59";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base HaXml html mtl network polyparse pretty random
          regex-compat stm utf8-string
        ];
@@ -62026,7 +63570,7 @@ self: {
        pname = "haskell2010";
        version = "1.1.2.0";
        sha256 = "1s0avb08b5iwaym42jz783mk1az9kmjf3zmhfag0kzdw10qcnz4m";
-       buildDepends = [ array base ghc-prim ];
+       libraryHaskellDepends = [ array base ghc-prim ];
        jailbreak = true;
        homepage = "http://www.haskell.org/onlinereport/haskell2010/";
        description = "Compatibility with Haskell 2010";
@@ -62042,7 +63586,7 @@ self: {
        pname = "haskell98";
        version = "2.0.0.3";
        sha256 = "1450bgkn7gasj6cmkxn4afs828fc9slrrp2lqsqs3jlryr94cpdx";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base directory old-locale old-time process time
        ];
        jailbreak = true;
@@ -62060,7 +63604,7 @@ self: {
        pname = "haskell98libraries";
        version = "2.0.0.2";
        sha256 = "1dcjwkvggvwrs8lv2pcxcz2kcz179nbca9q16mbk90qnznysr8i8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base directory old-locale old-time process time
        ];
        jailbreak = true;
@@ -62077,7 +63621,7 @@ self: {
        pname = "haskelldb";
        version = "2.2.4";
        sha256 = "0f8c9bz25wzsc65czv0chxk93w947824axl7p821fljlrykcm45y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory mtl old-locale old-time pretty time
        ];
        homepage = "https://github.com/m4dc4p/haskelldb";
@@ -62091,7 +63635,7 @@ self: {
        pname = "haskelldb-connect-hdbc";
        version = "0.1.0.0";
        sha256 = "1l9ifff33xbgdr6fahnzz00nb7va2r0i3pncjd1j8bbnyya1w2kl";
-       buildDepends = [ base containers haskelldb HDBC ];
+       libraryHaskellDepends = [ base containers haskelldb HDBC ];
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
@@ -62106,7 +63650,7 @@ self: {
        pname = "haskelldb-connect-hdbc-catchio-mtl";
        version = "0.1.0.0";
        sha256 = "1ssg96r7cphakis5c494m5lc3m5ksn1w03k554p0qx2kl1g885xw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-mtl mtl
        ];
        homepage = "http://twitter.com/khibino";
@@ -62123,7 +63667,7 @@ self: {
        pname = "haskelldb-connect-hdbc-catchio-tf";
        version = "0.1.0.0";
        sha256 = "16qab88ryli9jbinw9frhhzl0ph09dinzx40x9cr9a3db7wvphw4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC
          MonadCatchIO-transformers transformers
        ];
@@ -62141,7 +63685,7 @@ self: {
        pname = "haskelldb-connect-hdbc-catchio-transformers";
        version = "0.1.0.0";
        sha256 = "0hbb6klc4azz6f5wi39l5736xq0b7wgja35fk9vmmn0lnf6iv5j7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC
          MonadCatchIO-transformers transformers
        ];
@@ -62159,7 +63703,7 @@ self: {
        pname = "haskelldb-connect-hdbc-lifted";
        version = "0.1.0.0";
        sha256 = "1ysnha7bmrd3accrnbswr17nv6j4pj1mbshcphjkhdffcvxb82wa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC lifted-base
          monad-control transformers-base
        ];
@@ -62177,7 +63721,8 @@ self: {
        sha256 = "0wdiywxjara2fwb1d548f9s0vcjxm1c38v4s05xqm5bz141l7a6a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell98 haskelldb mtl plugins ];
+       libraryHaskellDepends = [ base haskell98 haskelldb mtl plugins ];
+       executableHaskellDepends = [ haskelldb ];
        jailbreak = true;
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the dynamically loaded drivers";
@@ -62195,7 +63740,7 @@ self: {
        sha256 = "0f75am17zfpbxhg951gnjqmdfgi1q7byhw1xv1rz4k36kcg623x1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory haskelldb mtl old-time
        ];
        jailbreak = true;
@@ -62212,7 +63757,7 @@ self: {
        pname = "haskelldb-hdbc";
        version = "2.2.2";
        sha256 = "06vzzya6k1l74bm5ky7cbn6ch1wx5j5phnhi49bw17y3q632vd3f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers convertible haskelldb HDBC mtl old-time
        ];
        homepage = "https://github.com/m4dc4p/haskelldb";
@@ -62231,7 +63776,7 @@ self: {
        sha256 = "0nn8jjrsi62xqws00izh3qi2shlxa58l37q91x1xnd9fig7j0ai2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-mysql mtl
        ];
        jailbreak = true;
@@ -62250,7 +63795,7 @@ self: {
        sha256 = "1y87iiil6k9ycsni70kvfcq50fiws8aqnhmk4018f6k6q1bx7q6p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-odbc mtl
        ];
        homepage = "https://github.com/m4dc4p/haskelldb";
@@ -62269,10 +63814,10 @@ self: {
        sha256 = "08cv3y22zvf0pf1cs57vrma3vp3b5fzzs6nsnvcnfnzsvacanh7g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-postgresql mtl
        ];
-       extraLibraries = [ postgresql ];
+       executableSystemDepends = [ postgresql ];
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
@@ -62289,7 +63834,7 @@ self: {
        sha256 = "0qdp2lzhk8ywb9pmppvvmwqkaagvrnyjiglahy6mb7rdfq89bas6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-sqlite3 mtl
        ];
        homepage = "https://github.com/m4dc4p/haskelldb";
@@ -62304,7 +63849,7 @@ self: {
        pname = "haskelldb-hsql";
        version = "1.0.0";
        sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0";
-       buildDepends = [ base haskelldb hsql mtl old-time ];
+       libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
        jailbreak = true;
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for HSQL";
@@ -62322,7 +63867,7 @@ self: {
        sha256 = "09rlrv9jb2hw7jypglfqhgfx3b0bcp68iq2wk4jfqw74m4d34xkm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-mysql mtl
        ];
        jailbreak = true;
@@ -62342,7 +63887,7 @@ self: {
        sha256 = "18r7b4x43729c9l34gvbhgw2fwgq7llcb6cfwcp077f9ia0kgn6a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-odbc mtl
        ];
        jailbreak = true;
@@ -62362,7 +63907,7 @@ self: {
        sha256 = "0j26gm9bibnj2jl5fs3sf2m8b5gl05brf55bzxnxa1cb78dgbpx9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-oracle mtl
        ];
        jailbreak = true;
@@ -62382,7 +63927,7 @@ self: {
        sha256 = "1d1vgw9q95h864gfv0n2gmdvnvkxjg4pdjmfpfj899xx1s0a0vsv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-postgresql mtl
        ];
        jailbreak = true;
@@ -62402,7 +63947,7 @@ self: {
        sha256 = "0hs8ympicys4p6lpfcvny3c183v4s25lk990yb4fzrpv0hy3bhhw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-sqlite mtl
        ];
        jailbreak = true;
@@ -62422,7 +63967,7 @@ self: {
        sha256 = "11xlr2f7203wxg17696yjqgyzckavqjazc9brmdqpbrnplaqdrc5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-sqlite3 mtl
        ];
        jailbreak = true;
@@ -62438,7 +63983,7 @@ self: {
        pname = "haskelldb-th";
        version = "2.1.0";
        sha256 = "12whvz0qy9lqk1frfl5px9lhr1nwy519vj2z9c3g8nqjzscwzayb";
-       buildDepends = [ base haskelldb mtl template-haskell ];
+       libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
        jailbreak = true;
        homepage = "http://trac.haskell.org/haskelldb-th";
        description = "Template Haskell utilities for HaskellDB";
@@ -62467,11 +64012,11 @@ self: {
        pname = "haskellscrabble";
        version = "1.1";
        sha256 = "1wb9ncpzsacvwk8gmh8gzxm54viwlzsikj05lk14gpyp8xwhl54h";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base containers errors mtl parsec QuickCheck random
          safe semigroups split transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filepath HUnit QuickCheck random
          semigroups test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -62492,7 +64037,7 @@ self: {
        sha256 = "0jrvvbpx35dhrwvknrxcwg1j1yi0mwzrnzrr2hsxja21drrqklf3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cryptohash directory either filepath mtl process text
        ];
        homepage = "http://github.com/seanparsons/haskellscript/";
@@ -62512,12 +64057,17 @@ self: {
        sha256 = "1bzp79fcq6gxy8pvspw4q71iakzvrbdwr3vjahd698ymfbj5ji8y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary containers directory haskell-src-exts
          haskell-src-meta mtl parsec pretty split template-haskell temporary
          text th-desugar unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base binary containers directory haskell-src-exts
+         haskell-src-meta mtl parsec pretty split template-haskell temporary
+         text th-desugar unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson base binary containers directory Elm haskell-src-exts
          haskell-src-meta mtl parsec pretty shakespeare split
          template-haskell temporary text th-desugar unordered-containers
@@ -62535,7 +64085,7 @@ self: {
        pname = "haskgame";
        version = "0.0.6";
        sha256 = "061dhk7d9d8mnb1rs7077q383sqlby8s31ips8jjadkkhyxi5lvz";
-       buildDepends = [ base containers haskell98 SDL SDL-ttf ];
+       libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
        homepage = "http://haskell.org/haskellwiki/HaskGame";
        description = "Haskell game library";
        license = stdenv.lib.licenses.bsd3;
@@ -62550,7 +64100,7 @@ self: {
        pname = "haskheap";
        version = "0.1.2";
        sha256 = "1c2fgqq2i3s2v0xi04y8y6li41ilvi50zlf2ba843my9s3i8njqr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types network old-locale
          text time unordered-containers
        ];
@@ -62570,7 +64120,7 @@ self: {
        pname = "haskhol-core";
        version = "1.1.0";
        sha256 = "0vlzybbplqggvgnj61yl0g2rak2qbsp7hly9srgr6wd6qm9l1nxx";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state base containers deepseq filepath ghc-prim hashable mtl
          parsec pretty safecopy shelly template-haskell text text-show
          th-lift unordered-containers
@@ -62593,10 +64143,11 @@ self: {
        sha256 = "0gbsr3b832rb3gk6gx3s1lrjpv4kqcf62cz3wgjj5riscq1vg73k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath
          haskell-src-exts HaTeX hint parsec process text transformers
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://daniel-diaz.github.io/projects/haskintex";
        description = "Haskell Evaluation inside of LaTeX code";
        license = stdenv.lib.licenses.bsd3;
@@ -62610,7 +64161,7 @@ self: {
        pname = "haskmon";
        version = "0.1.1.0";
        sha256 = "1xsp0jd7n5rbky4giy3dik2hcsnkzwlj2mdr8v3ahr17cqj3sm74";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-streams io-streams old-locale
          time vector
        ];
@@ -62630,11 +64181,11 @@ self: {
        pname = "haskoin";
        version = "0.1.0.2";
        sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary byteable bytestring containers cryptohash deepseq
          either json-rpc mtl pbkdf split text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base binary byteable bytestring containers cryptohash
          deepseq either HUnit json-rpc mtl pbkdf QuickCheck split
          test-framework test-framework-hunit test-framework-quickcheck2 text
@@ -62655,11 +64206,11 @@ self: {
        pname = "haskoin-crypto";
        version = "0.0.1.1";
        sha256 = "00argpj3qkaj8dcxbd46xsi1abjgr394li6ygyvna55508r1hd79";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary byteable bytestring containers cryptohash haskoin-util
          mtl QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary byteable bytestring containers cryptohash haskoin-util
          HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -62680,10 +64231,10 @@ self: {
        pname = "haskoin-protocol";
        version = "0.0.1.1";
        sha256 = "0r15csyylg5vd95z0spl5wkv6r8w7lpi983alsvlnkhv4dqnrg2v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-util QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-util HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -62703,11 +64254,11 @@ self: {
        pname = "haskoin-script";
        version = "0.0.1";
        sha256 = "18lw5hxwvj4ichw1k4a35hjih7h0hd24khvl4m0yf2cq12m2gl11";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-protocol haskoin-util
          mtl QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-protocol haskoin-util
          HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -62728,8 +64279,10 @@ self: {
        pname = "haskoin-util";
        version = "0.0.1.1";
        sha256 = "0hh3vavqsp8pafw4nrv9py1kqcc1yx52zr80xsqzqjlsxq04fgfw";
-       buildDepends = [ base binary bytestring either mtl QuickCheck ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring either mtl QuickCheck
+       ];
+       testHaskellDepends = [
          base binary bytestring containers either HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -62754,13 +64307,19 @@ self: {
        sha256 = "18q110q93qc00mqzprs5wprzrl0jfw5fjpli73n99knqb127aq5s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson aeson-pretty base binary bytestring conduit containers either
+         haskoin-crypto haskoin-protocol haskoin-script haskoin-util mtl
+         persistent persistent-sqlite persistent-template QuickCheck text
+         time unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
          aeson aeson-pretty base binary bytestring conduit containers
          directory either haskoin-crypto haskoin-protocol haskoin-script
          haskoin-util mtl persistent persistent-sqlite persistent-template
-         QuickCheck text time unordered-containers vector yaml
+         text time unordered-containers vector yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-pretty base binary bytestring conduit containers either
          haskoin-crypto haskoin-protocol haskoin-script haskoin-util HUnit
          mtl persistent persistent-sqlite persistent-template QuickCheck
@@ -62783,7 +64342,7 @@ self: {
        pname = "haskoon";
        version = "0.3.1.1";
        sha256 = "1rf5w1mvpsiqim1h5hh6s2cxzh3c5gm1k3n6z4h2ryc1s7m2bl9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi directory fastcgi filepath hslogger hsp hsx
          MaybeT MissingH mtl network regex-posix safe utf8-string
        ];
@@ -62800,7 +64359,7 @@ self: {
        pname = "haskoon-httpspec";
        version = "0.5.0.1";
        sha256 = "059hywia5fa15j2dpbzvnvjzv55bzgivy3ddxcrdskd85zx7lx6z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bidispec bytestring haskoon hslogger HTTP httpspec mtl network
        ];
        description = "Integrating HttpSpec with Haskoon";
@@ -62817,7 +64376,7 @@ self: {
        pname = "haskoon-salvia";
        version = "0.4.0.2";
        sha256 = "0d0s0zd9gr3xbssyk62l7w507prjnyak81czhnd6fgbfqx82d6hk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi fclabels haskoon hslogger HTTP monads-fd mtl
          network salvia salvia-protocol transformers
        ];
@@ -62837,7 +64396,7 @@ self: {
        sha256 = "0zvr7hwxnv01g626617yv7f0vwpmyqvlwbyc6yhb2mrlfqwdgbd0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers data-accessor event-list
          haskell-src markov-chain midi non-negative parsec process random
          transformers utility-ht
@@ -62857,7 +64416,7 @@ self: {
        pname = "haskore-realtime";
        version = "0.2";
        sha256 = "0fhlfivp44py93gjlqrp370cjkvi0g79p156vayylds128hgpi5f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-accessor directory event-list haskore midi
          non-negative old-time process transformers unix utility-ht
        ];
@@ -62879,7 +64438,7 @@ self: {
        sha256 = "04rzbk1v8ay569npd8i1xv3aqx55jn8p6cvqpi6774afaxvb0qxy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers data-accessor event-list haskore
          haskore-realtime hosc hsc3 non-negative opensoundcontrol-ht process
          random supercollider-ht transformers unix utility-ht
@@ -62902,7 +64461,7 @@ self: {
        sha256 = "0bdfn8s7gj39i3rr3xvi9xchi8zczqimb5gnkg0225m2zcfgvmy8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-accessor event-list haskore non-negative numeric-prelude
          random synthesizer-core utility-ht
        ];
@@ -62919,7 +64478,7 @@ self: {
        pname = "haskore-vintage";
        version = "0.2";
        sha256 = "1dpqs7xv3hvhla94v60q0fxfzgr4l3l69s7xc45rh712r9iws66n";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskore/";
        description = "The February 2000 version of Haskore";
        license = stdenv.lib.licenses.bsd3;
@@ -62936,9 +64495,10 @@ self: {
        sha256 = "1rpi9nrxizvzs7cxmykxvkbwd78144gwglk5f0rc19qyb0n80gr4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath json unix utf8-string
        ];
+       executableHaskellDepends = [ base directory filepath unix ];
        homepage = "http://github.com/MarcWeber/hasktags";
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -62952,7 +64512,8 @@ self: {
        sha256 = "0iizdi98w4k9kdizg9xwm2aca6mnn30frp15f8kyak3i194sk3kl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl old-time QuickCheck time wtk ];
+       libraryHaskellDepends = [ base mtl old-time wtk ];
+       executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62968,7 +64529,7 @@ self: {
        sha256 = "03avp9yn7ag1dc1wzk07sxkj3krqsrg3n44qcynxw9n1fmvk54lx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base convertible gtk haslo lenses mtl old-time QuickCheck time wtk
          wtk-gtk
        ];
@@ -62983,7 +64544,7 @@ self: {
        pname = "hasparql-client";
        version = "0.1";
        sha256 = "1ln0kdm40y6l8sncrjl0mj9bpd30ffg3msaxyd6fq520ypyws9pm";
-       buildDepends = [ base HTTP monads-fd network xml ];
+       libraryHaskellDepends = [ base HTTP monads-fd network xml ];
        homepage = "https://github.com/lhpaladin/HaSparql-Client";
        description = "This package enables to write SPARQL queries to remote endpoints";
        license = stdenv.lib.licenses.bsd3;
@@ -62996,8 +64557,8 @@ self: {
        pname = "haspell";
        version = "1.1.0";
        sha256 = "08ihdjgjvr8mgxxw62xwymj1lyl33r6w3mhy9chlw7ijcsy44y21";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ aspell ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ aspell ];
        homepage = "https://github.com/otters/haspell";
        description = "Haskell bindings to aspell";
        license = stdenv.lib.licenses.mit;
@@ -63013,12 +64574,12 @@ self: {
        pname = "hasql";
        version = "0.7.3.2";
        sha256 = "1hhqs4acq8g3331av1lm6l7mmd0sswym278wsn3i0p9khyafpkcm";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base-prelude either hasql-backend list-t mmorph
          monad-control mtl resource-pool template-haskell text transformers
          transformers-base vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base-prelude either hasql-backend hasql-postgres hspec
          monad-control mtl-prelude slave-thread text vector
        ];
@@ -63036,7 +64597,7 @@ self: {
        pname = "hasql-backend";
        version = "0.4.1.1";
        sha256 = "13llpvppkj2k6kfhmqyllm3m2h8g7lvm6gy8y2bnqq8y5jw9xdm5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude bytestring either free list-t text transformers vector
        ];
        homepage = "https://github.com/nikita-volkov/hasql-backend";
@@ -63056,13 +64617,13 @@ self: {
        pname = "hasql-postgres";
        version = "0.10.3.3";
        sha256 = "0xwc1r7jirscsn1f11s7hkhc5knzzhb5l6if7c5w4skfx0vla7rh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base-prelude bytestring either free hashable
          hashtables hasql-backend list-t loch-th mmorph placeholders
          postgresql-binary postgresql-libpq scientific template-haskell text
          time transformers uuid vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base-prelude bytestring directory doctest either
          filepath hashable hasql hasql-backend hspec list-t mtl-prelude
          old-locale postgresql-binary QuickCheck quickcheck-instances
@@ -63081,7 +64642,7 @@ self: {
        pname = "hasql-postgres-options";
        version = "0.1.4";
        sha256 = "19jsi8r63phyjcwgvbbs30idl944dnl0iw15i0q2d501sa51ksf4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude hasql-postgres optparse-applicative
        ];
        homepage = "https://github.com/nikita-volkov/hasql-postgres-options";
@@ -63097,16 +64658,22 @@ self: {
      mkDerivation {
        pname = "hastache";
        version = "0.6.1";
-       revision = "2";
        sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc";
+       revision = "2";
        editedCabalFile = "92cea66e7c2d33e62c5caac8eaaf0e716fa6e2146ef906360db4d5f72cd30091";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers directory filepath ieee754
+         mtl syb text transformers
+       ];
+       executableHaskellDepends = [
          base blaze-builder bytestring containers directory filepath ieee754
          mtl process syb text transformers
        ];
-       testDepends = [ base bytestring directory HUnit mtl syb text ];
+       testHaskellDepends = [
+         base bytestring directory HUnit mtl syb text
+       ];
        homepage = "http://github.com/lymar/hastache";
        description = "Haskell implementation of Mustache templates";
        license = stdenv.lib.licenses.bsd3;
@@ -63120,7 +64687,7 @@ self: {
        pname = "hastache-aeson";
        version = "0.1.0.0";
        sha256 = "0b69ppgs0s8zjkrycz5iyd1wa92wr9wln3dvgzf736pbfhsgv2qi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers hastache text
          unordered-containers vector
        ];
@@ -63139,7 +64706,7 @@ self: {
        sha256 = "1vz36i74l1nnm34nn1rj3v8kprqa2piz3j5f58cccg2gvxl0abnj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base curl filepath mtl ];
+       executableHaskellDepends = [ base curl filepath mtl ];
        jailbreak = true;
        description = "A universal pastebin tool, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -63157,16 +64724,23 @@ self: {
        pname = "haste-compiler";
        version = "0.5.0";
        sha256 = "18n9sl9m2fpzshpj3gqvd7wlmvz5mrgsz8awcd3imcb7136qa9s9";
+       configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bin-package-db binary blaze-builder bytestring bzlib
-         Cabal containers data-binary-ieee754 data-default directory either
-         filepath ghc ghc-paths ghc-prim ghc-simple HTTP monads-tf mtl
-         network network-uri process random shellmate system-fileio tar
-         terminfo transformers unix utf8-string websockets
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 data-default
+         directory filepath ghc ghc-paths ghc-prim monads-tf network
+         network-uri process random shellmate transformers utf8-string
+         websockets
        ];
-       configureFlags = [ "-fportable" ];
+       executableHaskellDepends = [
+         array base bin-package-db binary blaze-builder bytestring bzlib
+         Cabal containers data-default directory either filepath ghc
+         ghc-paths ghc-prim ghc-simple HTTP mtl network network-uri process
+         random shellmate system-fileio tar terminfo transformers unix
+         utf8-string
+       ];
+       jailbreak = true;
        homepage = "http://haste-lang.org/";
        description = "Haskell To ECMAScript compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -63180,7 +64754,9 @@ self: {
        pname = "haste-markup";
        version = "0.0.1.0";
        sha256 = "02rqm4qjaww2c622bqd1bb2mjb73w2s7d7pwvz94x03npxkf4hn1";
-       buildDepends = [ base containers directory filepath haste-lib ];
+       libraryHaskellDepends = [
+         base containers directory filepath haste-lib
+       ];
        jailbreak = true;
        homepage = "http://github.com/ajnsit/haste-markup";
        description = "A port of blaze-markup and blaze-html to Haste";
@@ -63194,7 +64770,7 @@ self: {
        pname = "haste-perch";
        version = "0.1.0.9";
        sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8";
-       buildDepends = [ base haste-compiler transformers ];
+       libraryHaskellDepends = [ base haste-compiler transformers ];
        homepage = "https://github.com/agocorona/haste-perch";
        description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
        license = stdenv.lib.licenses.gpl3;
@@ -63212,14 +64788,16 @@ self: {
        sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory old-locale old-time process random
+       ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath haskeline
-         haskell-src-exts old-locale old-time polyparse process random
+         haskell-src-exts polyparse process
        ];
        homepage = "http://projects.haskell.org/hat/";
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hatex-guide" = callPackage
@@ -63230,7 +64808,7 @@ self: {
        pname = "hatex-guide";
        version = "1.3.1.0";
        sha256 = "11wi053g9kybw0qa3wdfccyy0ka3xnnghgamaaf220r8hz49g25y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html directory filepath HaTeX parsec text time
          transformers
        ];
@@ -63250,11 +64828,11 @@ self: {
        sha256 = "17ijsy0fmvaqq4ql7c2788kk3pi975pbi1g7ijh5fj0ybgxk5dww";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs dns MissingH parallel-io split tasty
          tasty-hunit tasty-quickcheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cmdargs dns MissingH parallel-io process split
          tasty tasty-hunit tasty-quickcheck
        ];
@@ -63273,10 +64851,13 @@ self: {
        sha256 = "0dgjia07v489wlk23hg84d1043rh71hl9yg7vdcih2jcj8pn00z4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ansi-wl-pprint base cmdargs containers haskeline parsec QuickCheck
+       libraryHaskellDepends = [
+         ansi-wl-pprint base containers parsec QuickCheck
+       ];
+       executableHaskellDepends = [ base cmdargs haskeline ];
+       testHaskellDepends = [
+         base test-framework test-framework-quickcheck2
        ];
-       testDepends = [ base test-framework test-framework-quickcheck2 ];
        homepage = "http://extralogical.net/projects/hatt";
        description = "A truth table generator for classical propositional logic";
        license = stdenv.lib.licenses.bsd3;
@@ -63293,11 +64874,12 @@ self: {
        sha256 = "1p4llwjab7h2zg10585jp5a5bfrzmmkziq7in164wk15rb2z5y0p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude containers errors lens MonadRandom mtl
          random-shuffle tasty tasty-quickcheck text
        ];
-       testDepends = [
+       executableHaskellDepends = [ base basic-prelude text ];
+       testHaskellDepends = [
          base basic-prelude containers errors mtl random-shuffle tasty
          tasty-hunit tasty-quickcheck text
        ];
@@ -63318,7 +64900,7 @@ self: {
        sha256 = "10qg24qkh17l9zqn47g64cg6hp48x7bjbcwigj35zpqcq71s9dxc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base64-string bytestring clock containers gconf glade gtk
          hoauth HTTP json mtl network old-locale parsec regex-base
          regex-tdfa SHA time utf8-string
@@ -63338,11 +64920,11 @@ self: {
        pname = "haxl";
        version = "0.2.0.0";
        sha256 = "13nd291s04wyyx60cfs7x02dfpm4b9qn73h70c97gjq2s7l7y7qy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers directory filepath hashable HUnit
          pretty text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers hashable HUnit text
          unordered-containers
        ];
@@ -63361,11 +64943,11 @@ self: {
        pname = "haxl-facebook";
        version = "0.1.0.0";
        sha256 = "0m8dycsh51sfrxhmajsaydgima4r0nc60yklv9w26302i176j2aq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base conduit data-default fb hashable haxl
          http-client-tls http-conduit resourcet text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base conduit data-default fb hashable haxl
          http-client-tls http-conduit resourcet text time transformers
          unordered-containers vector
@@ -63387,7 +64969,11 @@ self: {
        sha256 = "12ksmhmk1yns8znh9srqm53q4by8dibdvkd9qhbihiwdyz137y6j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 data-default
+         mtl parsec split template-haskell transformers utf8-string zlib
+       ];
+       executableHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          mtl optparse-applicative parsec split template-haskell transformers
          utf8-string zlib
@@ -63409,7 +64995,7 @@ self: {
        pname = "haxr";
        version = "3000.11.1.1";
        sha256 = "0a4ad0h45a6jv1x19ss0p6krhq040164cvvaivf0zba5q4ifmffh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base-compat base64-bytestring blaze-builder bytestring
          HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
          network network-uri old-locale old-time template-haskell time
@@ -63426,7 +65012,7 @@ self: {
        pname = "haxr-th";
        version = "3000.5";
        sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif";
-       buildDepends = [ base haxr template-haskell ];
+       libraryHaskellDepends = [ base haxr template-haskell ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haxr/";
        description = "Automatic deriving of XML-RPC structs for Haskell records";
@@ -63440,10 +65026,10 @@ self: {
      mkDerivation {
        pname = "haxy";
        version = "1.0";
-       revision = "2";
        sha256 = "1fzdxk0vl7pd3k1dgxli6f721lfvwpb2zl354fl0zy5gimiky7fs";
+       revision = "2";
        editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class hostname HTTP http-server mtl
          url
        ];
@@ -63462,11 +65048,12 @@ self: {
        sha256 = "0dpisbqfsay8lwpfihw5fmpzi2ajc8qshsawbr4r6x8indy4kdy0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-flags process template-haskell time xml
        ];
-       testDepends = [ base process xml ];
-       extraLibraries = [ mesa wayland ];
+       librarySystemDepends = [ mesa wayland ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base process xml ];
        jailbreak = true;
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
@@ -63483,7 +65070,7 @@ self: {
        sha256 = "05wfxpkpxma3ynla3wdgzq0raxqwg21fsa01qqpsh1ib7v462ls0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring http-conduit http-types optparse-applicative
          pandoc url
        ];
@@ -63504,7 +65091,7 @@ self: {
        sha256 = "01wx4dls0ccl0q09hvydjhj0lfpqfd32z76rjgc89p5889czkm5j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo filepath glade gtk haskell98 process svgcairo time unix
        ];
        homepage = "http://hback.googlecode.com/";
@@ -63523,7 +65110,7 @@ self: {
        pname = "hbayes";
        version = "0.5";
        sha256 = "1zhjhham5jyfwll8sp3kprp92l4whqfyys4jfl81gpb5igpgz039";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary boxes containers directory filepath gamma HUnit
          mtl mwc-random parsec pretty QuickCheck random split statistics
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -63544,7 +65131,9 @@ self: {
        sha256 = "1whnsbv04b9hr3dc6a3xzv270q7ygk8x4i20mb092fr98klbk9wn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory ghc ghc-mod ghc-paths libhbb ];
+       executableHaskellDepends = [
+         base directory ghc ghc-mod ghc-paths libhbb
+       ];
        jailbreak = true;
        homepage = "https://bitbucket.org/bhris/hbb";
        description = "Haskell Busy Bee, a backend for text editors";
@@ -63557,7 +65146,7 @@ self: {
        pname = "hbcd";
        version = "1.0";
        sha256 = "1glld44m6h8yfh5h63w9q5isy238j0j312ycx43va1xa80x5r4dq";
-       buildDepends = [ base bytestring Decimal digits split ];
+       libraryHaskellDepends = [ base bytestring Decimal digits split ];
        description = "Packed binary-coded decimal (BCD) serialization";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -63570,7 +65159,7 @@ self: {
        pname = "hbeanstalk";
        version = "0.2.4";
        sha256 = "13xcia1nnayhr22zi1wzgn8qs403ib4n2zikpxd3xnzy33yrgbzy";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers network
        ];
        homepage = "http://github.com/scsibug/hbeanstalk/";
@@ -63588,10 +65177,10 @@ self: {
        sha256 = "1lgsjwwpimvgczzgg2lvnf08hhcsnk5is52rm2lbmilky8ayhxjp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl old-time OpenGL SDL SDL-mixer
        ];
-       extraLibraries = [ SDL SDL_mixer ];
+       executableSystemDepends = [ SDL SDL_mixer ];
        homepage = "http://www.dockerz.net/software/hbeat.html";
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
@@ -63606,9 +65195,9 @@ self: {
        pname = "hblas";
        version = "0.3.2.1";
        sha256 = "05c2mqhwjq0r8jyaj0cncaxn4n5x27dd8z6lv8g8cdc7r749q59y";
-       buildDepends = [ base primitive storable-complex vector ];
-       testDepends = [ base HUnit tasty tasty-hunit vector ];
-       extraLibraries = [ blas lapack ];
+       libraryHaskellDepends = [ base primitive storable-complex vector ];
+       librarySystemDepends = [ blas lapack ];
+       testHaskellDepends = [ base HUnit tasty tasty-hunit vector ];
        jailbreak = true;
        homepage = "http://github.com/wellposed/hblas/";
        description = "Human friendly BLAS and Lapack bindings for Haskell";
@@ -63625,7 +65214,7 @@ self: {
        pname = "hblock";
        version = "0.1.0.2";
        sha256 = "0g8hj42ir3jcpmwf3pin2k4zdcf5p1f1sx1f8rj380qbyxgdrw3v";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-markup bytestring cereal containers deepseq
          hashable path-pieces safecopy text unordered-containers uuid vector
        ];
@@ -63646,12 +65235,12 @@ self: {
      mkDerivation {
        pname = "hbro";
        version = "1.4.0.0";
-       revision = "1";
        sha256 = "08vw5j3a22gszbsjhjp13dkgvxj2875zjsx6w3w7c2dkjg4lijpr";
+       revision = "1";
        editedCabalFile = "331a844037ba6df7831151e45e40223eed66313dabef7dc0285a6e658747b15c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring classy-prelude cond containers
          data-default-class directory dyre errors exceptions fast-logger
          filepath glib gtk3 lens lifted-async lifted-base monad-control
@@ -63659,6 +65248,7 @@ self: {
          process resourcet safe semigroups stm-chans text time transformers
          transformers-base unix webkitgtk3 zeromq4-haskell
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/k0ral/hbro";
        description = "Minimal extensible web-browser";
        license = "unknown";
@@ -63674,7 +65264,7 @@ self: {
        pname = "hbro-contrib";
        version = "1.4.0.0";
        sha256 = "0v7qxg1phac5m06raspaq6782iid7rnvkinkji0fs0yjigbblps2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring classy-prelude containers
          directory glib gtk3 hbro lens monad-control mtl network-uri pango
          parsec process resourcet safe text time transformers-base unix
@@ -63694,7 +65284,9 @@ self: {
        sha256 = "03gd0hgms5hmjvd1j533357h0gh7mh16vmlbbgdhzad1igq1lcfv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers filepath haskell98 mtl ];
+       executableHaskellDepends = [
+         array base containers filepath haskell98 mtl
+       ];
        homepage = "http://www.bytelabs.org/hburg.html";
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
@@ -63709,7 +65301,7 @@ self: {
        sha256 = "04aczl9mh1gb25kggh2jj043az61gzzhxqfg9gb3lcjr5krrnh4p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring language-c ];
+       executableHaskellDepends = [ base bytestring language-c ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "A toy C compiler";
@@ -63722,7 +65314,7 @@ self: {
        pname = "hcg-minus";
        version = "0.15";
        sha256 = "04g0f4sr7904w3ynyl0gnbyi2sl0z7ziv5q15mfb6c7h0zl25d5r";
-       buildDepends = [ base colour ];
+       libraryHaskellDepends = [ base colour ];
        homepage = "http://rd.slavepianos.org/t/hcg-minus";
        description = "haskell cg (minus)";
        license = stdenv.lib.licenses.bsd3;
@@ -63736,7 +65328,7 @@ self: {
        pname = "hcg-minus-cairo";
        version = "0.15";
        sha256 = "002gh8adqzhcjfnqkbcnpzz8qiqbj9zkbk6jj11dnnxjigc4l2q9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo colour filepath hcg-minus utf8-string
        ];
        homepage = "http://rd.slavepianos.org/t/hcg-minus-cairo";
@@ -63750,7 +65342,7 @@ self: {
        pname = "hcheat";
        version = "2010.1.16";
        sha256 = "1fwgnp15kha9qb7iagd8n5ahjjhg194wbva5i436mb57fn86pya2";
-       buildDepends = [ base mps ];
+       libraryHaskellDepends = [ base mps ];
        homepage = "http://github.com/nfjinjing/hcheat/";
        description = "A collection of code cheatsheet";
        license = stdenv.lib.licenses.bsd3;
@@ -63765,8 +65357,8 @@ self: {
        pname = "hchesslib";
        version = "0.1.0.0";
        sha256 = "10785d9n87ddln1rvr19wnvcj401x3b53psdcf8vrwfaq930kjrv";
-       buildDepends = [ array attoparsec base containers text ];
-       testDepends = [
+       libraryHaskellDepends = [ array attoparsec base containers text ];
+       testHaskellDepends = [
          array attoparsec base containers hlint hspec QuickCheck text
        ];
        homepage = "https://github.com/nablaa/hchesslib";
@@ -63785,17 +65377,16 @@ self: {
        pname = "hcltest";
        version = "0.3.7";
        sha256 = "1hqx0khbxypq4hqq1hq0ybyadd7m6bpd6rzc3zya3w0s7kwk0dgd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory dlist either filepath free lens mmorph
          monad-control mtl optparse-applicative process random-shuffle split
          stm tagged tasty temporary text transformers transformers-base
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/bennofs/hcltest/";
        description = "A testing library for command line applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcron" = callPackage
@@ -63806,7 +65397,7 @@ self: {
        pname = "hcron";
        version = "0.0.0.3";
        sha256 = "0ckq98aj6fgdgpwyy6ssydp4jazhhfshnalv71h2xx1z80m1ynq7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory mtl old-locale pretty process
          random stm time
        ];
@@ -63826,7 +65417,12 @@ self: {
        sha256 = "1h1g05a8wnk2q65mm4mwywxhygr7fs0150q8ml33ik59mcc5v7fr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory HaskellForMaths QuickCheck text ];
+       libraryHaskellDepends = [
+         base directory HaskellForMaths QuickCheck text
+       ];
+       executableHaskellDepends = [
+         base directory HaskellForMaths QuickCheck text
+       ];
        description = "Virtual Rubik's cube of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63838,8 +65434,8 @@ self: {
        pname = "hcwiid";
        version = "0.0.5";
        sha256 = "0dn19kkd1da9yk6yk8mmpz927d1gsjyip9v4dibsvc1w4v49n94x";
-       buildDepends = [ base unix ];
-       extraLibraries = [ bluetooth cwiid ];
+       libraryHaskellDepends = [ base unix ];
+       librarySystemDepends = [ bluetooth cwiid ];
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
@@ -63854,7 +65450,7 @@ self: {
        pname = "hdaemonize";
        version = "0.5.0.1";
        sha256 = "03daf8qb8x0503h5k2vr6r4lyv6fv1a5n6mhykx5872khl81d8ms";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions filepath hsyslog mtl unix
        ];
        homepage = "http://github.com/greydot/hdaemonize";
@@ -63870,7 +65466,7 @@ self: {
        pname = "hdaemonize-buildfix";
        version = "0.4.5";
        sha256 = "15k4z77caa5y1jix4llqdmqpx0j7iv9nx5lk3vc5hs8vl2ax86f6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions filepath hsyslog mtl unix
        ];
        homepage = "http://github.com/madhadron/hdaemonize";
@@ -63887,7 +65483,7 @@ self: {
        pname = "hdbc-aeson";
        version = "0.1.3.2";
        sha256 = "04bp1zxw5alazk241gbz7g1s4cr0gabb7c15irzzlkbjz5jsk6d5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base convertible HDBC scientific text unordered-containers
          vector
        ];
@@ -63903,7 +65499,7 @@ self: {
        pname = "hdbc-postgresql-hstore";
        version = "0.0.1.1";
        sha256 = "034zsmqgavh4ns69f6j4a1afyqbd1b7h35macmf20vzxj0j0bawj";
-       buildDepends = [ attoparsec base containers HDBC text ];
+       libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        jailbreak = true;
        homepage = "http://bitbucket.com/dpwiz/hdbc-postgresql-hstore";
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
@@ -63916,7 +65512,7 @@ self: {
        pname = "hdbc-tuple";
        version = "0.0.1";
        sha256 = "155darl83c1b3gjkh7x8pwpj6v4nqfb389ix9vr39j7qw1pkjwdd";
-       buildDepends = [ base convertible HDBC typical ];
+       libraryHaskellDepends = [ base convertible HDBC typical ];
        description = "Type save tuples for HDBC";
        license = "GPL";
      }) {};
@@ -63933,11 +65529,11 @@ self: {
        pname = "hdbi";
        version = "1.3.0";
        sha256 = "0z8ivqs79lkqr2bji6nc5djd29ajag5r7d7caja482ksfq75wdc2";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers Decimal deepseq
          old-locale stm template-haskell text time uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base blaze-builder bytestring containers Decimal deepseq
          derive hspec-expectations HUnit old-locale QuickCheck
          quickcheck-assertions quickcheck-instances stm template-haskell
@@ -63960,8 +65556,10 @@ self: {
        pname = "hdbi-conduit";
        version = "1.3.0";
        sha256 = "1wrc38m8451vslvnmd4p128x9885dbjx5hzc566s06dw8wshfdgj";
-       buildDepends = [ base conduit hdbi resourcet transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base conduit hdbi resourcet transformers
+       ];
+       testHaskellDepends = [
          base conduit hdbi hdbi-sqlite QuickCheck quickcheck-assertions
          resourcet test-framework test-framework-quickcheck2 transformers
        ];
@@ -63983,11 +65581,11 @@ self: {
        pname = "hdbi-postgresql";
        version = "1.3.0";
        sha256 = "1fjcp3ldc54bm8gj8l9ifjvdxx6h6lsswjspmwnzwfh1ahfrbg1x";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring hdbi mtl old-locale
          postgresql-libpq postgresql-simple safe text time uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base blaze-builder bytestring containers Decimal derive
          hdbi hdbi-tests HUnit ieee754 mtl old-locale postgresql-libpq
          postgresql-simple QuickCheck quickcheck-assertions
@@ -64009,10 +65607,10 @@ self: {
        pname = "hdbi-sqlite";
        version = "1.3.0";
        sha256 = "03vf5xv14hb6rwwaiv997a7j3s5rgp81cb60v0n013l20dqh1g04";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring direct-sqlite hdbi text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring direct-sqlite hdbi hdbi-tests
          test-framework text
        ];
@@ -64032,7 +65630,7 @@ self: {
        pname = "hdbi-tests";
        version = "1.3.0";
        sha256 = "0rvrjcv890flsmq8v6bpgh8kvg0ix3x2n149kdg7xviy26liyjg5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers Decimal hdbi HUnit ieee754 QuickCheck
          quickcheck-assertions quickcheck-instances stm test-framework
          test-framework-hunit test-framework-quickcheck2 text time uuid
@@ -64054,7 +65652,7 @@ self: {
        sha256 = "0cwgm4yws4irrrpk2jvgvgr74w7gn9ilcidb9flkxfh7kqwsjxac";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal cmdargs directory filepath ghc ghc-paths network process
          syb time unix
        ];
@@ -64071,7 +65669,7 @@ self: {
        pname = "hdf";
        version = "0.15";
        sha256 = "11nf9wlymdhydf0bhh9gdl0cdn0i4mbvx3hfdcmnxfvag5jmfbkk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory fgl fgl-visualize filepath hosc hsc3 murmur-hash
          process split transformers
        ];
@@ -64087,7 +65685,9 @@ self: {
        pname = "hdigest";
        version = "1.0";
        sha256 = "1wm9j8ncjfb0gscdz4zmkymrzykc6rqbcx7988r207l5s9q3043f";
-       buildDepends = [ base cgi Crypto network parsec random time ];
+       libraryHaskellDepends = [
+         base cgi Crypto network parsec random time
+       ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64101,8 +65701,10 @@ self: {
        sha256 = "1v7yx9k0kib6527k49hf3s4jvdda7a0wgv09qhyjk6lyriyi3ny2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base haskell98 pretty ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ array base haskell98 pretty ];
+       libraryToolDepends = [ happy ];
+       executableHaskellDepends = [ array base haskell98 pretty ];
+       executableToolDepends = [ happy ];
        homepage = "http://www.haskell.org/hdirect/";
        description = "An IDL compiler for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -64115,7 +65717,7 @@ self: {
        pname = "hdis86";
        version = "0.2";
        sha256 = "0qr8d4qbvkncv4im0iwwdr9khvkyy4ky8wnwxri1jqhylcq8vdks";
-       buildDepends = [ base bytestring containers QuickCheck ];
+       libraryHaskellDepends = [ base bytestring containers QuickCheck ];
        homepage = "https://github.com/kmcallister/hdis86";
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
        license = stdenv.lib.licenses.bsd3;
@@ -64128,8 +65730,8 @@ self: {
        pname = "hdiscount";
        version = "0.1.0.0";
        sha256 = "0z6kpsk57gjqwpvs5v6ikiirnyyg26mbrxx827bb1v27lhsy7py0";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ markdown ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ markdown ];
        jailbreak = true;
        homepage = "https://github.com/jamwt/hdiscount";
        description = "Haskell bindings to the Discount markdown library";
@@ -64145,7 +65747,7 @@ self: {
        sha256 = "1qgq4bwq2ip315j43f0pyhxah033bjrj3wrmvnzmc62s8k2rfvgh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory process unix vty ];
+       executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64163,12 +65765,16 @@ self: {
        sha256 = "153rwd1f390j6sjfxx135h3bh80pb8zb5myws9q8d0jkrx2sl198";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty base bytestring Cabal containers filepath ghc
-         ghc-paths haddock-api haddock-library MonadCatchIO-transformers mtl
-         network process text transformers
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers filepath ghc ghc-paths
+         haddock-api haddock-library MonadCatchIO-transformers mtl network
+         process text transformers
        ];
-       testDepends = [ base containers mtl ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring containers filepath mtl network
+         text
+       ];
+       testHaskellDepends = [ base containers mtl ];
        homepage = "https://github.com/mvoidex/hdocs";
        description = "Haskell docs tool";
        license = stdenv.lib.licenses.bsd3;
@@ -64186,7 +65792,12 @@ self: {
        sha256 = "116499cr0pcc1gg7aniprlcp9vp8s61b4vk7rcm673nw3lay496a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal containers deepseq hdph-closure mtl network
+         network-info network-multicast network-transport
+         network-transport-tcp random template-haskell time
+       ];
+       executableHaskellDepends = [
          base bytestring cereal containers deepseq hdph-closure mtl network
          network-info network-multicast network-transport
          network-transport-tcp random template-haskell time
@@ -64206,7 +65817,7 @@ self: {
        pname = "hdph-closure";
        version = "0.0.1";
        sha256 = "0rcmp5i7jvpghg8nql5wlidbyjs79cxxmdb6bq3xxk806gdj66d8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers deepseq template-haskell
        ];
        jailbreak = true;
@@ -64226,7 +65837,7 @@ self: {
        sha256 = "1hc1pmbj9452k4a71iiazxg6id7caf783m08lqnf3flf77cdjxpa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath haskeline
          time
        ];
@@ -64243,7 +65854,8 @@ self: {
        sha256 = "1xwgdx4m558m2xqmqnskkbja9s1lqm131xphjgk0yclsk0sv8was";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64254,8 +65866,8 @@ self: {
        pname = "heaps";
        version = "0.3.2.1";
        sha256 = "1g4nf361qfjyymwpyiiq0qk5brrsr4wz1pncij69pwda919b3j6b";
-       buildDepends = [ base ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/heaps/";
        description = "Asymptotically optimal Brodal/Okasaki heaps";
@@ -64270,7 +65882,7 @@ self: {
        sha256 = "0fzws9fjhqsygsbwj7nvj786j16264vqvqzc97dr73y72538k9qa";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base QuickCheck ];
+       executableHaskellDepends = [ array base QuickCheck ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/heapsort";
        description = "Heapsort of MArrays as a demo of imperative programming";
        license = stdenv.lib.licenses.bsd3;
@@ -64284,8 +65896,8 @@ self: {
        pname = "hebrew-time";
        version = "0.1.1";
        sha256 = "0ckridxf4rvhhp0k1mckbbbpzfs32l4mwg7n9mrmsggldpl7x6f7";
-       buildDepends = [ base time ];
-       testDepends = [
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 time
        ];
@@ -64300,7 +65912,7 @@ self: {
        pname = "hecc";
        version = "0.4.1.1";
        sha256 = "1p7h9mlap8i0w2inhq944r0dgr27rzwk44igylil7gv0dgf4hsyx";
-       buildDepends = [ base cereal crypto-api hF2 ];
+       libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64315,11 +65927,11 @@ self: {
        pname = "hedis";
        version = "0.6.9";
        sha256 = "0yciwxsnqc8d09356fisfb44nbzsnvi01aad86gbx4vhrdnw7n7a";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base BoundedChan bytestring bytestring-lexing mtl
          network resource-pool time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit mtl test-framework test-framework-hunit time
        ];
        homepage = "https://github.com/informatikr/hedis";
@@ -64333,7 +65945,7 @@ self: {
        pname = "hedis-config";
        version = "0.0.2";
        sha256 = "1ism20ddgcdsypbic6ikalvajq3918wm53ppiic68zaqfzwk9gk2";
-       buildDepends = [ aeson base hedis scientific text time ];
+       libraryHaskellDepends = [ aeson base hedis scientific text time ];
        homepage = "https://bitbucket.org/s9gf4ult/hedis-config";
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
@@ -64347,7 +65959,7 @@ self: {
        pname = "hedis-monadic";
        version = "0.0.4";
        sha256 = "1540c4ra65y2kc97n7wxx7rdzf3dkaqqx7r4lwz4qpg3kzfi6q8w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hedis monad-control mtl transformers transformers-base
          transformers-compat
        ];
@@ -64365,11 +65977,11 @@ self: {
        pname = "hedis-pile";
        version = "0.6.3";
        sha256 = "0awwga4hvmfkkkqy68g4ja51szjifs1z20rav0kmbn3gn978248n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hedis hedis-tags string-conversions
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring hedis HUnit lifted-base string-conversions
          test-framework test-framework-hunit transformers
        ];
@@ -64385,7 +65997,7 @@ self: {
        pname = "hedis-simple";
        version = "0.1.0.0";
        sha256 = "1dq7rpqg35caqj664q2ndqgd59mq7cfjahkaka5mlk1k5yjvz7av";
-       buildDepends = [ base bytestring either hedis mtl ];
+       libraryHaskellDepends = [ base bytestring either hedis mtl ];
        jailbreak = true;
        homepage = "http://github.com/sanetracker/hedis-simple";
        description = "A simplified API for hedis";
@@ -64400,8 +66012,8 @@ self: {
        pname = "hedis-tags";
        version = "0.2.3";
        sha256 = "0d9jr26366xjjcc39ma36bs944d11xpw5izww9pw3lajsgdr0d1s";
-       buildDepends = [ base bytestring hedis ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring hedis ];
+       testHaskellDepends = [
          base bytestring hedis HUnit lifted-base test-framework
          test-framework-hunit transformers
        ];
@@ -64420,11 +66032,11 @@ self: {
        pname = "hedn";
        version = "0.1.8.1";
        sha256 = "12r7ndjq59q9pdnhziq7af4jkp2mgpq7qhnnzgv6w1z8v893b9r1";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq mtl old-locale
          stringsearch text time utf8-string vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec HUnit QuickCheck template-haskell
          text time vector
        ];
@@ -64445,7 +66057,7 @@ self: {
        sha256 = "0z3c9pvhnfx9zizzwkyawvzvs4zl7i5w5zkrjpax8rkrh8ai1060";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath http-conduit process
          transformers
        ];
@@ -64464,10 +66076,10 @@ self: {
      mkDerivation {
        pname = "heist";
        version = "0.14.1.1";
-       revision = "1";
        sha256 = "0hwf8d20lw4gn5mal8iqd62npr2859541h3md451hjlbwpjyqd19";
+       revision = "1";
        editedCabalFile = "51f2aa86d7582ba504e26ead511da54db5350cf4bed7f13252c678c0cf19d400";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist either filepath hashable
          map-syntax MonadCatchIO-transformers mtl process random text time
@@ -64486,7 +66098,7 @@ self: {
        pname = "heist-aeson";
        version = "0.5";
        sha256 = "1m0rwrb0gzsajnp5h0w7cf10jf6fram4mjkmny5hk0h5xwcn19dc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers heist monads-fd text
          vector xmlhtml
        ];
@@ -64501,7 +66113,9 @@ self: {
        pname = "heist-async";
        version = "0.6.0.0";
        sha256 = "16ab3cfs6fj66ssf6ypmx2yddq5an115wlmwybk3va0a7kbp58ll";
-       buildDepends = [ base heist template-haskell text xmlhtml ];
+       libraryHaskellDepends = [
+         base heist template-haskell text xmlhtml
+       ];
        homepage = "http://github.com/dbp/heist-async";
        description = "Adding support for asynchronous updates (\"AJAX\") with heist";
        license = stdenv.lib.licenses.bsd3;
@@ -64515,15 +66129,15 @@ self: {
      mkDerivation {
        pname = "helics";
        version = "0.5.1";
-       revision = "1";
        sha256 = "06kj42rmlzlw6zrilq9kc5whk0np5714wwn3nwbpv6fx4ginzg2c";
+       revision = "1";
        editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-show data-default-class time unix
        ];
-       extraLibraries = [
+       librarySystemDepends = [
          newrelic-collector-client newrelic-common newrelic-transaction
        ];
        homepage = "https://github.com/philopon/helics";
@@ -64543,7 +66157,7 @@ self: {
        sha256 = "10rb9l4sf31h59f5pwv54vqjnlm047mbq5gvhv5wblkh53ch1b31";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class helics vault wai
        ];
        homepage = "https://github.com/philopon/helics";
@@ -64560,7 +66174,7 @@ self: {
        sha256 = "1j495j3kc43d34aviln6jrab3ydzsp1hrnk079p53mcnx2rpjz81";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec process ];
+       executableHaskellDepends = [ base containers mtl parsec process ];
        homepage = "http://www.codersbase.com/index.php/Helisp";
        description = "An incomplete Elisp compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -64576,7 +66190,11 @@ self: {
        sha256 = "0vwk8h5fwl63pjcydwndqgpikfjdm37w7gjmmgac95gl66fc5h5j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory filepath lvmlib mtl network parsec
+         process Top transformers wl-pprint
+       ];
+       executableHaskellDepends = [
          base containers directory filepath lvmlib mtl network parsec
          process Top transformers wl-pprint
        ];
@@ -64599,12 +66217,13 @@ self: {
        sha256 = "1kdxkk994g38bl2kcxcs0p9wn1rankn0jw14nlvy9z9appgxalnl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra data-default directory
          filepath ghc ghc-paths haskeline monad-extras mtl pdfinfo process
          process-extras resourcet shell-conduit split template-haskell text
-         time transformers unix utf8-string
+         time transformers unix
        ];
+       executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64621,7 +66240,7 @@ self: {
        sha256 = "1gqz042qycwhka6fyma6fb104mi8wd22nsbywrini3m3nib5ci75";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory hellnet hjpath hjson HTTP Lucu
          mtl network regex-pcre safe stm tar utf8-string zlib
        ];
@@ -64643,10 +66262,13 @@ self: {
        sha256 = "0fb4r9nb39l1qr7xczgkx5i93cv4rqrin0fl22qq4h12ajvrp6m6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers Crypto directory filepath haskell98
-         hjpath hjson HTTP Lucu mtl network old-locale parsec pretty process
-         random regex-posix RSA safe time unix uri utf8-string
+       libraryHaskellDepends = [
+         base bytestring Crypto directory filepath haskell98 hjpath hjson
+         HTTP old-locale parsec pretty process random RSA safe time unix uri
+         utf8-string
+       ];
+       executableHaskellDepends = [
+         base containers Lucu mtl network regex-posix
        ];
        homepage = "http://bitcheese.net/wiki/hellnet/hspawn";
        description = "Simple, distributed, anonymous data sharing network";
@@ -64662,7 +66284,7 @@ self: {
        sha256 = "1x6q7frbrc4jdfx1qhxrydmdp5k7mm3lx504d7rhg6z2m6ibbh57";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/hello/";
        description = "Hello World, an example package";
        license = stdenv.lib.licenses.bsd3;
@@ -64678,11 +66300,11 @@ self: {
        pname = "helm";
        version = "0.7.1";
        sha256 = "04smx6q2k4zj4gjvwy393s4abik9k108c5j31yy3dwksbbhhmygg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers cpu elerea filepath mtl pango random sdl2
          text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cairo containers elerea HUnit sdl2 test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
@@ -64701,7 +66323,7 @@ self: {
        pname = "help-esb";
        version = "0.1.6";
        sha256 = "0fy0dygx3hdkbdip7gppk25akjar0p2px0s5q7sl1lmzgkcl1016";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers MissingH network network-uri text
          uuid
        ];
@@ -64720,7 +66342,7 @@ self: {
        sha256 = "16f1nzpi20j7fza1rs1b89mhyni4162q2x4l3ixrnd82yjmcmc1l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring hemkay-core portaudio
        ];
        description = "A module music mixer and player";
@@ -64734,7 +66356,7 @@ self: {
        pname = "hemkay-core";
        version = "0.1.4";
        sha256 = "0br41879jynw3dzb2hlb07m55zmzgyim6gi8i48bzimbi70c9z89";
-       buildDepends = [ array base binary bytestring ];
+       libraryHaskellDepends = [ array base binary bytestring ];
        description = "A device independent module music mixer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64752,13 +66374,17 @@ self: {
        sha256 = "104387q98qfhykmjkyhg08rji8pljlllp2j57ilhpb7ws9ik2g26";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base base64-bytestring bytestring cairo cipher-aes conduit
-         deepseq deepseq-generics gtk hidapi mtl network-simple
-         optparse-applicative pretty-show robot split svgcairo text time
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cipher-aes conduit deepseq
+         deepseq-generics hidapi mtl network-simple optparse-applicative
+         text vector websockets
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cairo conduit gtk mtl network-simple
+         optparse-applicative pretty-show robot split svgcairo time
          transformers vector vector-fftw websockets
        ];
-       testDepends = [ base bytestring hspec HUnit vector ];
+       testHaskellDepends = [ base bytestring hspec HUnit vector ];
        jailbreak = true;
        homepage = "https://github.com/nh2/haskell-hemokit";
        description = "Haskell port of the Emokit EEG project";
@@ -64774,12 +66400,14 @@ self: {
        pname = "hen";
        version = "0.1.3";
        sha256 = "1ri6brxmc2m09jx2r9p47lgpfn8zkxy147hyyw3x2pw3g6cgsill";
-       buildDepends = [ base bitset exceptions mtl transformers uuid ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bitset exceptions mtl transformers uuid
+       ];
+       librarySystemDepends = [ xenctrl ];
+       testHaskellDepends = [
          base bitset exceptions mtl QuickCheck tasty tasty-quickcheck
          transformers uuid
        ];
-       extraLibraries = [ xenctrl ];
        jailbreak = true;
        homepage = "https://github.com/selectel/hen";
        description = "Haskell bindings to Xen hypervisor interface";
@@ -64794,7 +66422,9 @@ self: {
        pname = "henet";
        version = "1.3.9.3";
        sha256 = "0pm5lnn7rc647ic404c8bmki9wfrkc0mdmmkng50vv0bm2d7z5aq";
-       buildDepends = [ base bitset bytestring network typesafe-endian ];
+       libraryHaskellDepends = [
+         base bitset bytestring network typesafe-endian
+       ];
        description = "Bindings and high level interface for to ENet v1.3.9";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64806,7 +66436,7 @@ self: {
        pname = "hepevt";
        version = "0.5";
        sha256 = "0b7syzfzbcznjb98hi4k8bp46ss08s9qg2763bnnm1b10i7km23z";
-       buildDepends = [ bytestring haskell2010 lha ];
+       libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64818,7 +66448,7 @@ self: {
        pname = "her-lexer";
        version = "0.1.1";
        sha256 = "1hbx48r8zdmyr5qjf0b3pagmamj8pibsp7ca7bxdgk4jz8pxv2my";
-       buildDepends = [ base mtl split ];
+       libraryHaskellDepends = [ base mtl split ];
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A lexer for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
@@ -64831,7 +66461,7 @@ self: {
        pname = "her-lexer-parsec";
        version = "0.0.0";
        sha256 = "1gkcd9ikaxjirxh8haq8b9a372n1dlaq63n9xzq9gsyazkxz7lgn";
-       buildDepends = [ base her-lexer parsec transformers ];
+       libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64847,7 +66477,7 @@ self: {
        sha256 = "1gm1ya1p1i734sxadbmj1zn6mbq1gssmzp897h5xjgb8vsa2fxs6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers ghc-prim indents mtl parsec regex-posix
        ];
        homepage = "https://github.com/danchoi/herbalizer";
@@ -64864,7 +66494,7 @@ self: {
        pname = "here";
        version = "1.2.7";
        sha256 = "1fqjqzfg3fif67ic75pavsnfjb9lxk5cf82chxs2hrkx41gm4gr6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell
        ];
        homepage = "https://github.com/tmhedberg/here";
@@ -64878,7 +66508,7 @@ self: {
        pname = "heredoc";
        version = "0.2.0.0";
        sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://hackage.haskell.org/package/heredoc";
        description = "multi-line string / here document using QuasiQuotes";
        license = stdenv.lib.licenses.publicDomain;
@@ -64896,12 +66526,13 @@ self: {
        sha256 = "1m3dgp22ix3l64basv8bx0k9waagi0rckprpgqnfpxnir7cbhrkv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal array base base-compat containers data-default-class
          directory ghc haskeline kure marked-pretty mtl process stm
          temporary terminfo transformers transformers-compat
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64915,7 +66546,7 @@ self: {
        pname = "hermit-syb";
        version = "0.1.0.0";
        sha256 = "1970n7q88q76dnp2h7h8r1d6psq0d9pdvrim556rqiv8smwi661x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc ghc-prim hermit syb template-haskell
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
@@ -64929,8 +66560,8 @@ self: {
        pname = "heroku";
        version = "0.1.2.3";
        sha256 = "1gldsdpnmj7ljrmyvjfwqdmhhml2yp27icl2qqj9pz42pllq4x2k";
-       buildDepends = [ base network-uri text ];
-       testDepends = [ base hspec network-uri text ];
+       libraryHaskellDepends = [ base network-uri text ];
+       testHaskellDepends = [ base hspec network-uri text ];
        homepage = "https://github.com/gregwebs/haskell-heroku";
        description = "helpers for deploying to Heroku";
        license = stdenv.lib.licenses.bsd3;
@@ -64944,10 +66575,10 @@ self: {
        pname = "heroku-persistent";
        version = "0.1.0";
        sha256 = "1ws4076dk4a8l2yz9mwfwqk57sm7y2ch2c5318agsm7hnwil7wbf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring heroku persistent-postgresql text
        ];
-       testDepends = [ base hspec persistent-postgresql ];
+       testHaskellDepends = [ base hspec persistent-postgresql ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -64962,7 +66593,7 @@ self: {
        pname = "herringbone";
        version = "0.1.1";
        sha256 = "1xpdz24dinm56z4gx51frw19j2169ms9jvasg8xixi944q34hwmk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory http-types mtl old-locale
          process process-listlike system-fileio system-filepath text time
          transformers unix-compat
@@ -64980,7 +66611,7 @@ self: {
        pname = "herringbone-embed";
        version = "0.1.1";
        sha256 = "02i0k29fg0nb4ax0yaw6bnrnb0v0rk2fy7lckd5f5bny557mk1h6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring file-embed herringbone system-fileio
          system-filepath template-haskell text
        ];
@@ -64997,7 +66628,7 @@ self: {
        pname = "herringbone-wai";
        version = "0.1.1";
        sha256 = "1kw0n89qqazyap9w315pa6k4smnw1pf8s82grbm8z9d9xyhk980f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring herringbone http-types system-fileio
          system-filepath text time wai wai-app-static
        ];
@@ -65016,7 +66647,7 @@ self: {
        sha256 = "1xxmm5b3n8wj548lmf7hp05g7qwy0sq7mkh0g98n7z1iqdmfamwa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base filepath haskell-src HDBC HDBC-postgresql hssqlppp parsec
        ];
        jailbreak = true;
@@ -65031,7 +66662,7 @@ self: {
        pname = "hetero-map";
        version = "0.21";
        sha256 = "1fnzj37kya5gqjchm3yq0709ay50n0spb24x5rxkxfbl0yy2nzk7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/hetero-map";
        description = "Pure heterogeneous maps";
        license = stdenv.lib.licenses.bsd3;
@@ -65046,8 +66677,8 @@ self: {
        sha256 = "0sj0grykzb7xq7iz0nj27c4fzhcr9f0yshfcq81xq2wdmg09j8yx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base hscurses old-time random ];
-       extraLibraries = [ ncurses ];
+       executableHaskellDepends = [ array base hscurses old-time random ];
+       executableSystemDepends = [ ncurses ];
        homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/";
        description = "Text Tetris";
        license = "GPL";
@@ -65061,7 +66692,9 @@ self: {
        pname = "heukarya";
        version = "0.2.0.2";
        sha256 = "1ycfy29crdj8ch07wm77lfpg656vm2vl34mdqvsxfxijdxb23cxg";
-       buildDepends = [ base containers deepseq parallel random text ];
+       libraryHaskellDepends = [
+         base containers deepseq parallel random text
+       ];
        homepage = "https://github.com/t3476/heukarya";
        description = "A genetic programming based on tree structure";
        license = stdenv.lib.licenses.bsd3;
@@ -65076,7 +66709,9 @@ self: {
        sha256 = "1ys7xqdrnvwn6z2vgmh49zhfxj73pdmscblqcjk6qrwmpb2xha2s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring cairo filepath haskell98 ];
+       executableHaskellDepends = [
+         base bytestring cairo filepath haskell98
+       ];
        description = "Genetic Mona Lisa problem in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65092,7 +66727,7 @@ self: {
        sha256 = "0jsynxd33r7d5s5vn204z4wdgm4cq6qyjs7afa77p94ni5m2p3kb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cairo dph-seq filepath haskell98
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
@@ -65106,7 +66741,7 @@ self: {
        pname = "hex";
        version = "0.1.2";
        sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Convert strings into hexadecimal and back";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65117,7 +66752,7 @@ self: {
        pname = "hexdump";
        version = "0.1";
        sha256 = "012hknn9qhwr3hn3dbyd9s7vvaz4i3bvimmxkb1jyfckw3wjcnhc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for forming hexdumps";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -65128,7 +66763,7 @@ self: {
        pname = "hexif";
        version = "0.2.0.0";
        sha256 = "1asv5vs694mcifffvm5a4gsplpz7frk3p3zr9lqqv1f172ql9lql";
-       buildDepends = [ base binary bytestring filepath ];
+       libraryHaskellDepends = [ base binary bytestring filepath ];
        jailbreak = true;
        homepage = "http://www.github.com/hansroland/hexif";
        description = "Reading Exif data form a JPEG file with Haskell";
@@ -65143,7 +66778,7 @@ self: {
        pname = "hexpat";
        version = "0.20.9";
        sha256 = "17cx8iafb07f2c8wmfmrfgpz9cjilciba6001klf42z039ghf72x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq List text transformers
          utf8-string
        ];
@@ -65161,7 +66796,7 @@ self: {
        pname = "hexpat-iteratee";
        version = "0.6";
        sha256 = "10cqgrrqg518lhr9mk6gq48fgc0sjzwiakm2amhqgfflva3q0nqn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers extensible-exceptions hexpat iteratee
          List parallel transformers
        ];
@@ -65180,7 +66815,7 @@ self: {
        pname = "hexpat-lens";
        version = "0.1.3";
        sha256 = "0283zpzj1xsav50d4k66i90fhll89flqnb1jv0x7gxppv1460vfr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
        jailbreak = true;
@@ -65196,7 +66831,7 @@ self: {
        pname = "hexpat-pickle";
        version = "0.6";
        sha256 = "1k01s49mz4xxfbw1b7ab0ian2m0d7w5awbwf4jyz5ykgxg11kz9m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers extensible-exceptions hexpat text
          utf8-string
        ];
@@ -65213,8 +66848,8 @@ self: {
        pname = "hexpat-pickle-generic";
        version = "0.1.7";
        sha256 = "0l0h5n1afkg8zjq28h7aidsskdzf1i5lnz9jlq0hblwa9wamamis";
-       buildDepends = [ base bytestring hexpat text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring hexpat text ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -65229,7 +66864,7 @@ self: {
        pname = "hexpat-tagsoup";
        version = "0.1";
        sha256 = "0481446ba5m0h8lxmp216gzll0wr77mhk6hvm087749fwjj597aj";
-       buildDepends = [ base hexpat tagsoup ];
+       libraryHaskellDepends = [ base hexpat tagsoup ];
        description = "Parse (possibly malformed) HTML to hexpat tree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65241,7 +66876,9 @@ self: {
        pname = "hexpr";
        version = "0.0.0.0";
        sha256 = "0wpmbzxdl63r2p398101ywzfs7b4p4x8ds4zzqbhvhs2r0fsg5wv";
-       buildDepends = [ base data-ref either mtl parsec transformers ];
+       libraryHaskellDepends = [
+         base data-ref either mtl parsec transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/Zankoku-Okuno/hexpr/";
        description = "A framework for symbolic, homoiconic languages";
@@ -65256,7 +66893,7 @@ self: {
        pname = "hexquote";
        version = "0.1";
        sha256 = "0fr0sn2k12yvbbwmldqkmwgg0qk6bfd6811h2dgpq77821y62hq8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers parsec template-haskell
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
@@ -65272,10 +66909,10 @@ self: {
        pname = "hexstring";
        version = "0.11.1";
        sha256 = "0509h2fhrpcsjf7gffychf700xca4a5l937jfgdzywpm4bzdpn20";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base16-bytestring binary bytestring text
        ];
-       testDepends = [ base binary bytestring hspec text ];
+       testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Fast and safe representation of a hex string";
        license = stdenv.lib.licenses.mit;
@@ -65295,13 +66932,13 @@ self: {
        sha256 = "0dm9dyn12jgpc317pk5z3rhhgw2hbmbxyfba97jzq34b5z6crz0f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring case-insensitive configurator directory exceptions
          filepath HandsomeSoup http-types hxt iso8601-time MissingH mtl
          multipart optparse-applicative random stm tar temporary text time
          transformers unix unordered-containers utf8-string wai warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring case-insensitive configurator containers directory
          exceptions filepath HandsomeSoup hspec http-types hxt iso8601-time
          MissingH mtl multipart optparse-applicative random silently stm tar
@@ -65321,9 +66958,11 @@ self: {
        sha256 = "09pr24riz63irvykn6csbnm28z35ikwzg52ksah1p7zrywmgq9as";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       extraLibraries = [ doublefann ];
-       pkgconfigDepends = [ fann ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ doublefann ];
+       libraryPkgconfigDepends = [ fann ];
+       executableHaskellDepends = [ base ];
+       executableSystemDepends = [ doublefann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65339,7 +66978,7 @@ self: {
        sha256 = "1n60h76hzkb4avnsl6lybq7ya4p4ghcdlplyml7fqwg7i20cak54";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring haskeline iteratee MissingH
          MonadCatchIO-transformers network transformers
        ];
@@ -65357,7 +66996,8 @@ self: {
        sha256 = "1jsq33cdpdd52yriky989vd8wlafi9dq1bxzild7sjw1mql69d71";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base eprocess mtl wx wxcore ];
+       libraryHaskellDepends = [ base eprocess mtl ];
+       executableHaskellDepends = [ wx wxcore ];
        jailbreak = true;
        homepage = "http://github.com/elbrujohalcon/hfiar";
        description = "Four in a Row in Haskell!!";
@@ -65371,7 +67011,7 @@ self: {
        pname = "hflags";
        version = "0.4";
        sha256 = "17zzx273kmnwwazmmns78cllz3l7wad1gi7hizgcxi68j04blhd4";
-       buildDepends = [ base containers template-haskell text ];
+       libraryHaskellDepends = [ base containers template-haskell text ];
        homepage = "http://github.com/errge/hflags";
        description = "Command line flag parser, very similar to Google's gflags";
        license = "unknown";
@@ -65387,13 +67027,13 @@ self: {
        sha256 = "0jwnyfl1rcd2439738jgs0rgl0p09d1j877z84g0ax3xh7cm4zj1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory haskeline hmatrix HTTP linear not-gloss parsec
          transformers
        ];
+       executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfov" = callPackage
@@ -65402,7 +67042,7 @@ self: {
        pname = "hfov";
        version = "1.0.2";
        sha256 = "04qwmjxm06akvpakc5imcx0ls9zlsz74s4r9p7xzj0q5fv20z09l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/nornagon/hfov";
        description = "Field-of-view calculation for low-resolution 2D raster grids";
@@ -65419,7 +67059,7 @@ self: {
        sha256 = "060qx7wmqhlavamxxyzjyn2ar1cigvfw5ww7c0r70ns54xm0rw5z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base colour containers data-accessor data-accessor-template
          gd GLUT OpenGL OpenGLRaw
        ];
@@ -65435,7 +67075,7 @@ self: {
        pname = "hfsevents";
        version = "0.1.5";
        sha256 = "0hp9jjj59smfcs51d9zjhyvgdbn46l0rl0jr98wbzg3qya0vwj5k";
-       buildDepends = [ base bytestring cereal mtl text unix ];
+       libraryHaskellDepends = [ base bytestring cereal mtl text unix ];
        homepage = "http://github.com/luite/hfsevents";
        description = "File/folder watching for OS X";
        license = stdenv.lib.licenses.bsd3;
@@ -65448,7 +67088,9 @@ self: {
        pname = "hfusion";
        version = "0.0.6.1";
        sha256 = "05pisic8s6n2jqymyd2qjifr8kr824v3mflng1a0y4rp8pvbaj7r";
-       buildDepends = [ base containers haskell-src mtl pretty syb ];
+       libraryHaskellDepends = [
+         base containers haskell-src mtl pretty syb
+       ];
        homepage = "http://www.fing.edu.uy/inco/proyectos/fusion";
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -65465,7 +67107,7 @@ self: {
        sha256 = "0csibld3wrxi4jp35qqhfm17sw9fd5sca5rs9yd7i7l4jvsmfqhq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory HSH hslogger MissingH network parsec regex-compat
          regex-posix unix
        ];
@@ -65480,7 +67122,7 @@ self: {
        pname = "hgal";
        version = "2.0.0.2";
        sha256 = "17qw8izy54042g56mp3hdbmqcyk95cdarg58xggniwd85q2l5dpi";
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
        description = "library for computation automorphism group and canonical labelling of a graph";
        license = "GPL";
      }) {};
@@ -65491,7 +67133,7 @@ self: {
        pname = "hgalib";
        version = "0.2";
        sha256 = "08a8lmh1rg3d1rmpfhcc2fzyc0kybqhzahx4hrvfrqjw7czcnmrw";
-       buildDepends = [ array base haskell98 mtl ];
+       libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65506,8 +67148,8 @@ self: {
        pname = "hgdbmi";
        version = "0.2";
        sha256 = "1gfmpk9a909vc8khf40lr32l3srqqrfbcprp28dp6g02id1xmck4";
-       buildDepends = [ base parsec process stm unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base parsec process stm unix ];
+       testHaskellDepends = [
          base directory HUnit process template-haskell temporary
          test-framework test-framework-hunit
        ];
@@ -65526,7 +67168,7 @@ self: {
        pname = "hgearman";
        version = "0.1.0.2";
        sha256 = "0bfipd7s6czp3aha0jx1yjzfzn8vywiswd07k68q2207j3br8yxk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring monad-control mtl network resource-pool
          transformers transformers-base unordered-containers
        ];
@@ -65542,7 +67184,9 @@ self: {
        sha256 = "190zm0lkr2ymq91ka84a3v2lhxjv9yl43abqcyxj6c3cjqym9ib5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath hylolib mtl random ];
+       executableHaskellDepends = [
+         base directory filepath hylolib mtl random
+       ];
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hgen.php";
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
@@ -65555,7 +67199,7 @@ self: {
        pname = "hgeometric";
        version = "0.0.2.2";
        sha256 = "0l460mmbla7354dldil0d7qzba7dp4jhhsna0s27gdd9aad4flsd";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "ftp://ftp.cs.man.ac.uk/pub/toby/gpc/";
        description = "A geometric library with bindings to GPC";
        license = stdenv.lib.licenses.mit;
@@ -65572,12 +67216,12 @@ self: {
        pname = "hgeometry";
        version = "0.4.0.0";
        sha256 = "00z6xna83j9klba6rj09cdiriqgn45cx15pw22zylywn0s8agc4d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring containers data-clist fixed-vector
          hexpat lens linear mtl parsec random semigroups singletons text
          validation vector vinyl
        ];
-       testDepends = [ array base data-clist doctest lens linear ];
+       testHaskellDepends = [ array base data-clist doctest lens linear ];
        jailbreak = true;
        homepage = "http://fstaals.net/software/hgeometry";
        description = "Data types for geometric objects, geometric algorithms, and data structures";
@@ -65594,10 +67238,10 @@ self: {
        sha256 = "1pgzyd1nqzl7g88pcw7sncija5sd2k4zif9d8qfw96cw6m6kli96";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base Cabal containers directory filepath haskell-src-exts process
-         setlocale uniplate
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath process setlocale
        ];
+       executableHaskellDepends = [ base haskell-src-exts uniplate ];
        homepage = "https://github.com/vasylp/hgettext";
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
@@ -65614,10 +67258,11 @@ self: {
        sha256 = "05dxbz9z457b5nl0wsv95pgah9b74agdfwziqf7x79j5q2qqjc2l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring case-insensitive
-         cmdargs directory http-enumerator text
+         http-enumerator text
        ];
+       executableHaskellDepends = [ base cmdargs directory ];
        jailbreak = true;
        homepage = "https://github.com/noteed/hgithub";
        description = "Haskell bindings to the GitHub API";
@@ -65633,7 +67278,9 @@ self: {
        sha256 = "0bigji3i3311wlphxa0g8lkls0i4cn05d2m57fcrdfan8rayjwxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base HGL HTam random utility-ht ];
+       executableHaskellDepends = [
+         array base HGL HTam random utility-ht
+       ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/hgl-example/";
        description = "Various animations generated using HGL";
@@ -65651,7 +67298,7 @@ self: {
        sha256 = "0amdfdp1xmh506lgfbb4war2spfb4gqls864q18psmvshcwlpsmv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath mtl parsec wl-pprint
        ];
        homepage = "http://github.com/polux/hgom";
@@ -65666,7 +67313,7 @@ self: {
        pname = "hgopher";
        version = "0.1.0.0";
        sha256 = "0j6ybi8f5csa9rpbpy8dc9p6l6vf2qh2zk589a9nqj2phllz7mwf";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        jailbreak = true;
        description = "Gopher server";
        license = stdenv.lib.licenses.bsd3;
@@ -65678,8 +67325,8 @@ self: {
        pname = "hharp";
        version = "0.1.1.0";
        sha256 = "1f7k1jlc2ncxyxmc6rl603nw0lynqwv0dmj11hrcdmv282h4ff6s";
-       buildDepends = [ base ];
-       extraLibraries = [ harp ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ harp ];
        jailbreak = true;
        homepage = "http://www.harphttp.org";
        description = "Binding to libharp";
@@ -65698,12 +67345,17 @@ self: {
        sha256 = "16c3j7pc87mxk9rgk98bicl9jhvnyj2d9spfjvhiknpsixb847h9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bytestring directory filepath
          optparse-applicative parsec process split template temporary text
          time
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         ansi-wl-pprint base bytestring directory filepath
+         optparse-applicative parsec process split template temporary text
+         time
+       ];
+       testHaskellDepends = [
          ansi-wl-pprint base bytestring directory doctest filepath hspec
          HUnit optparse-applicative parsec process silently split template
          temporary text time
@@ -65723,7 +67375,7 @@ self: {
        sha256 = "1skzr5ipxz61zrndwifkngw70zdf2yh5f8qpbmfzaq0bscrzdxg5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers haskell98 HUnit mtl parsec random
          readline time
        ];
@@ -65741,7 +67393,7 @@ self: {
        sha256 = "1f5cqqw9zn1nji0k2vp0ln1fdbzv9iwjqiaw9vd77kz9pz7p0kvq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bytestring mtl network ];
+       executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65755,9 +67407,9 @@ self: {
        pname = "hid";
        version = "0.2.1";
        sha256 = "18svis0bs4cilks71rih9m89mcdrll5hnjy18ccw81wj32cw9mdh";
-       buildDepends = [ base bytestring transformers ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ hidapi-libusb ];
+       libraryHaskellDepends = [ base bytestring transformers ];
+       libraryPkgconfigDepends = [ hidapi-libusb ];
+       libraryToolDepends = [ c2hs ];
        description = "Interface to hidapi library";
        license = stdenv.lib.licenses.bsd3;
      }) { hidapi-libusb = null;};
@@ -65768,8 +67420,8 @@ self: {
        pname = "hidapi";
        version = "0.1.3";
        sha256 = "0ql6avpwi2m89rrglj9zk3fyi8vl91xswagqv8h24b2xgm7pw5i0";
-       buildDepends = [ base bytestring deepseq-generics ];
-       extraLibraries = [ systemd ];
+       libraryHaskellDepends = [ base bytestring deepseq-generics ];
+       librarySystemDepends = [ systemd ];
        homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
@@ -65781,7 +67433,7 @@ self: {
        pname = "hieraclus";
        version = "0.1.2.1";
        sha256 = "11fjfmdjzvid0352d346p5xf44bl7dn8bd8pms5pi34xysdyr7pg";
-       buildDepends = [ base containers HUnit mtl multiset ];
+       libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65794,11 +67446,10 @@ self: {
        pname = "hierarchical-clustering";
        version = "0.4.6";
        sha256 = "1cfcrnxqczqzqgpyipsw9dwfw1j75zd11vpd12i533f3p44pzwbm";
-       buildDepends = [ array base containers ];
-       testDepends = [ base hspec HUnit QuickCheck ];
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hierarchical-clustering-diagrams" = callPackage
@@ -65809,8 +67460,10 @@ self: {
        pname = "hierarchical-clustering-diagrams";
        version = "0.3.2";
        sha256 = "06ncyzhql74ni746a9hzma1v0grw99vas4xglmyvgd6yhdwl08sr";
-       buildDepends = [ base diagrams-lib hierarchical-clustering ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base diagrams-lib hierarchical-clustering
+       ];
+       testHaskellDepends = [
          base diagrams-cairo diagrams-lib hierarchical-clustering hspec
          HUnit
        ];
@@ -65826,7 +67479,7 @@ self: {
        pname = "hierarchical-exceptions";
        version = "1.0.1";
        sha256 = "1yzhw7kgz5iljm8ndh5kyr18367cl6l120m1gkn5x9hpsh9mlamm";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell functions to easily create exception hierarchies";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -65839,7 +67492,7 @@ self: {
        pname = "hiernotify";
        version = "2011.4.12";
        sha256 = "1imgwi6b0cn9y4y7vgqsyfgsyxjvsl1wkmqmrf51jkfqasnqsqh5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath mtl old-time stm timers-updatable
        ];
        homepage = "http://github.com/paolino/hiernotify";
@@ -65856,7 +67509,7 @@ self: {
        sha256 = "1bwvhrzvrf004lypf0zrx6q6k6fn5qwvlk45vppmnv65v9vq519p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghc ];
+       executableHaskellDepends = [ base ghc ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Memory usage statistics";
        license = "GPL";
@@ -65872,11 +67525,11 @@ self: {
        pname = "higher-leveldb";
        version = "0.3.0.0";
        sha256 = "0lghf21l3s4fmwnp3dsndzxqhamgppczzydkvnqlmx1x9jk5g1b6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal data-default leveldb-haskell lifted-base
          monad-control mtl resourcet transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal hspec leveldb-haskell lifted-base
          monad-control mtl process resourcet transformers transformers-base
        ];
@@ -65890,10 +67543,10 @@ self: {
      mkDerivation {
        pname = "higherorder";
        version = "0.0";
-       revision = "1";
        sha256 = "06cqhk9jalyps4v9w6wmpy9jdj3piwsp0wl3fvkzwa5iydlyvisz";
+       revision = "1";
        editedCabalFile = "c587250ea9c4828876f3837e82e5b1543e0dc2cc59bb4ec59ce0d947bae3d459";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65908,11 +67561,11 @@ self: {
        pname = "highjson";
        version = "0.2.0.2";
        sha256 = "07qz7zb53vbpb9ixrw0qwn5qhvgwzvrvfkp343a1cvbb42slpmkz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base buffer-builder bytestring containers hashable hvect
          scientific text unordered-containers vector
        ];
-       testDepends = [ base hspec QuickCheck text ];
+       testHaskellDepends = [ base hspec QuickCheck text ];
        homepage = "https://github.com/agrafix/highjson";
        description = "Very fast JSON serialisation and parsing library";
        license = stdenv.lib.licenses.mit;
@@ -65927,7 +67580,9 @@ self: {
        sha256 = "0nk7kdzzlyq2ml30mj661616h23zar3kqq8xd36lqs1ssr7nqnj7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base Cabal containers hackage-db ];
+       executableHaskellDepends = [
+         ansi-terminal base Cabal containers hackage-db
+       ];
        description = "Highlight package versions which differ from the latest version on Hackage";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65942,7 +67597,10 @@ self: {
        sha256 = "1x381ngd2gg2ff2rj7dyqmhy1achly2wbssjhsrcm0p6sxqab21x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-html bytestring filepath mtl pcre-light text
+       ];
+       executableHaskellDepends = [
          base blaze-html bytestring filepath mtl pcre-light text
        ];
        description = "source code highlighting";
@@ -65959,7 +67617,10 @@ self: {
        sha256 = "1gndzxi2i9hybqj6v14wflw8335v09q832knbx61hq9wcgq1hxwi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-html bytestring containers filepath mtl pcre-light text
+       ];
+       executableHaskellDepends = [
          base blaze-html blaze-markup bytestring containers filepath mtl
          pcre-light text
        ];
@@ -65974,19 +67635,19 @@ self: {
      mkDerivation {
        pname = "highlighting-kate";
        version = "0.6";
-       revision = "1";
        sha256 = "16334fbiyq6017zbgc59qc00h0bk24xh4dcrbqx63dvf72ac37dk";
+       revision = "1";
        editedCabalFile = "7466b389fd27b0520d371b2b225cb6024e9b7dd371cffa78169c219ab449558b";
+       configureFlags = [ "-fpcre-light" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-html containers filepath mtl parsec pcre-light
-         utf8-string
+       libraryHaskellDepends = [
+         base blaze-html containers mtl parsec pcre-light utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [ base blaze-html containers filepath ];
+       testHaskellDepends = [
          base blaze-html containers Diff directory filepath process
        ];
-       configureFlags = [ "-fpcre-light" ];
        homepage = "http://github.com/jgm/highlighting-kate";
        description = "Syntax highlighting";
        license = "GPL";
@@ -66002,7 +67663,7 @@ self: {
        sha256 = "0fankar6p0m6n1ffis4ww5x9dqdbjh9py63jirbimpdcrzcxcym5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring directory filepath optparse-applicative text
          transformers
        ];
@@ -66021,7 +67682,7 @@ self: {
        sha256 = "0ivrl5wymqzwcn7vyr3anychlk35003ksxsvr463qz768vbcql00";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory glib gtk haskell98 mozembed old-time parallel
          process unix
        ];
@@ -66042,7 +67703,10 @@ self: {
        sha256 = "09ya9966fn3ss7xxc1cd0izb5js35gwr2r1km881w4455sknl093";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring directory gtk HTTP http-conduit network temporary
+       ];
+       executableHaskellDepends = [
          base bytestring directory gtk HTTP http-conduit network temporary
        ];
        jailbreak = true;
@@ -66064,7 +67728,7 @@ self: {
        sha256 = "0rpgvv9hq8ai6imhsbfw95igfyqnnzdgx9mw6cpd8ch5kb6wfqig";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base binary bytestring cereal containers MissingH
          NetSNMP network old-time protobuf regex-posix stm text type-level
          unordered-containers vector
@@ -66087,11 +67751,15 @@ self: {
        sha256 = "09pywkm5xjk6djfwml1frnl21zndw03wp47a30vcnqcqf2a3awi0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         applicative-quoters base data-default descriptive directory
-         ghc-prim haskell-src-exts monad-loops mtl text transformers
+       libraryHaskellDepends = [
+         base data-default haskell-src-exts monad-loops mtl text
+         transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         applicative-quoters base descriptive directory ghc-prim
+         haskell-src-exts text
+       ];
+       testHaskellDepends = [
          base data-default directory haskell-src-exts hspec monad-loops mtl
          text
        ];
@@ -66108,7 +67776,7 @@ self: {
        pname = "hinduce-associations-apriori";
        version = "0.0.0.0";
        sha256 = "002ca2mxrmyvg1w5rr1n7ksc89qxqznasq0cw5grfr5h22pxs57z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hinduce-missingh parallel vector
        ];
        homepage = "https://github.com/roberth/hinduce-associations-apriori";
@@ -66122,7 +67790,7 @@ self: {
        pname = "hinduce-classifier";
        version = "0.0.0.1";
        sha256 = "1cdx916xkpsy2ilsmmdkyqax2gb0cx6sgkydvjbiw7qibd76ylza";
-       buildDepends = [ base hinduce-missingh layout ];
+       libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66136,7 +67804,7 @@ self: {
        pname = "hinduce-classifier-decisiontree";
        version = "0.0.0.1";
        sha256 = "1hdz4lbbpy2yc5j7chkagjvslsakmv3hbz2s7lpz0isfq7ls9idl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base convertible hinduce-classifier hinduce-missingh layout
        ];
        description = "Decision Tree Classifiers for hInduce";
@@ -66153,7 +67821,7 @@ self: {
        pname = "hinduce-examples";
        version = "0.0.0.2";
        sha256 = "17jnrc8iji5byqbd08llwk0mw9yi1dq3biaszqp9jyinf50hcb4w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers convertible csv hinduce-associations-apriori
          hinduce-classifier hinduce-classifier-decisiontree hinduce-missingh
          layout vector
@@ -66169,7 +67837,7 @@ self: {
        pname = "hinduce-missingh";
        version = "0.0.0.0";
        sha256 = "1606fz8qhvwqidi798y3mxlmbmwn8yp3a4cl59j4i8s05vgbaj9z";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/roberth/hinduce-missingh";
        description = "Utility functions";
        license = stdenv.lib.licenses.bsd3;
@@ -66181,7 +67849,7 @@ self: {
        pname = "hinotify";
        version = "0.3.7";
        sha256 = "0i7mxg9ilzcgijda6j3ya5xnpbxa3wm9xswdfif95jim9w82sw0b";
-       buildDepends = [ base containers directory unix ];
+       libraryHaskellDepends = [ base containers directory unix ];
        homepage = "https://github.com/kolmodin/hinotify.git";
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
@@ -66195,11 +67863,11 @@ self: {
        pname = "hinquire";
        version = "0.1.1";
        sha256 = "1mm0qi1y2qkiknb5s2jbgc3zljda52mi4mmh0fh7z8ck5rnng1x1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bifunctors QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
@@ -66217,7 +67885,7 @@ self: {
        pname = "hinstaller";
        version = "2008.2.16";
        sha256 = "1ldfqx98w7inpj76xyi0drh2lykfjfq9r34hlbcw7mv4bgxp4l8c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal directory filepath process template-haskell
        ];
        homepage = "http://www.wellquite.org/hinstaller/";
@@ -66233,11 +67901,11 @@ self: {
        pname = "hint";
        version = "0.4.2.3";
        sha256 = "1ds09bd369qmy2672vkhll8igbp63q83wdzwkpky4ab9pac3yayg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory exceptions extensible-exceptions filepath ghc
          ghc-mtl ghc-paths mtl random unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit mtl
        ];
        homepage = "http://hub.darcs.net/jcpetruzza/hint";
@@ -66252,10 +67920,11 @@ self: {
        pname = "hint-server";
        version = "1.4.2";
        sha256 = "1rv6b0vlqs855m3bv047pvdkycmx2mv049cnp9iw8b97d0fsfyf5";
-       buildDepends = [ base eprocess exceptions hint monad-loops mtl ];
+       libraryHaskellDepends = [
+         base eprocess exceptions hint monad-loops mtl
+       ];
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinvaders" = callPackage
@@ -66266,7 +67935,7 @@ self: {
        sha256 = "01v5szci7kbp3w2jsdcnzv9j3lbcl5bvn9ipcvp3v2xvfjik110h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 random ];
+       executableHaskellDepends = [ base haskell98 random ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Space Invaders";
        license = "GPL";
@@ -66279,7 +67948,7 @@ self: {
        pname = "hinze-streams";
        version = "1.0";
        sha256 = "137jjwcs3a9n2zybkqqfdy2m1a2ahpdcmficwfmn7ykdz487xcsq";
-       buildDepends = [ base haskell98 Stream ];
+       libraryHaskellDepends = [ base haskell98 Stream ];
        homepage = "http://code.haskell.org/~dons/code/hinze-streams";
        description = "Streams and Unique Fixed Points";
        license = stdenv.lib.licenses.bsd3;
@@ -66296,10 +67965,10 @@ self: {
      mkDerivation {
        pname = "hipbot";
        version = "0.5";
-       revision = "1";
        sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs";
+       revision = "1";
        editedCabalFile = "6ac1673be45c18dc010eeeef508a021ec9fef4e0a4e05864733f91aec8508ab8";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors blaze-builder bytestring either exceptions
          http-client http-client-tls http-types jwt lens mtl network-uri
          postgresql-simple resource-pool safe stm text time transformers
@@ -66309,6 +67978,7 @@ self: {
        homepage = "https://github.com/purefn/hipbot";
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hipe" = callPackage
@@ -66319,7 +67989,7 @@ self: {
        pname = "hipe";
        version = "0.2.0.0";
        sha256 = "1y8awzmvrvixlba1ndvw5rwm8i38lj1yf4mcfm6h7pmmvpdvr5ah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hgeometry hxt parsec split text text-format
        ];
        homepage = "http://fstaals.net/software/hipe";
@@ -66335,7 +68005,9 @@ self: {
        sha256 = "0m3ribabhpdkwavhywjpc8iqqa9bbdl19d7g3agm4f402gd3rmvr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory functors mtl ];
+       executableHaskellDepends = [
+         base bytestring directory functors mtl
+       ];
        homepage = "http://closure.ath.cx/hips";
        description = "an IPS patcher";
        license = stdenv.lib.licenses.bsd3;
@@ -66351,7 +68023,7 @@ self: {
        sha256 = "1i291m3i3c082nsgg7mx2xx2a0q97kdmyashz26i4varqkwhz7qx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory gtk mtl network old-locale old-time time
          utf8-string
        ];
@@ -66371,7 +68043,7 @@ self: {
        sha256 = "0scn4gljgx0ig2fr4rfavk6k3pcychpxlasffd6gp2k1v3sb850v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base cmdargs containers csv hlbfgsb hmatrix mwc-random
          numeric-extras random statistics text text-format vector
          vector-space
@@ -66391,7 +68063,7 @@ self: {
        pname = "hissmetrics";
        version = "0.5.1";
        sha256 = "1rz0yxng4szhmjj1n6d36ljv3388ch8nih09yjrxk4l83zd6hc6d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit http-conduit http-types text time
        ];
        jailbreak = true;
@@ -66412,10 +68084,13 @@ self: {
        sha256 = "01c6k3f432yhcvcz7k4w29z7kbvhxlcnh57z1m47qbkymm5b4y7b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty base bytestring cmdargs containers hist-pl-dawg
-         hist-pl-fusion hist-pl-lexicon hist-pl-lmf hist-pl-transliter
-         morfeusz pipes polimorf text
+       libraryHaskellDepends = [
+         aeson base containers hist-pl-lexicon hist-pl-transliter morfeusz
+         text
+       ];
+       executableHaskellDepends = [
+         aeson-pretty base bytestring cmdargs containers hist-pl-dawg
+         hist-pl-fusion hist-pl-lexicon hist-pl-lmf pipes polimorf
        ];
        jailbreak = true;
        homepage = "https://github.com/kawu/hist-pl/tree/master/umbrella";
@@ -66431,7 +68106,9 @@ self: {
        pname = "hist-pl-dawg";
        version = "0.2.1";
        sha256 = "1ghhwabi46dimzfk79nkcnk8s4rlcyvqfcpr8ay7sfy7xns2ahjg";
-       buildDepends = [ base binary containers dawg text text-binary ];
+       libraryHaskellDepends = [
+         base binary containers dawg text text-binary
+       ];
        homepage = "https://github.com/kawu/hist-pl/tree/master/dawg";
        description = "A generic, DAWG-based dictionary";
        license = stdenv.lib.licenses.bsd3;
@@ -66445,7 +68122,7 @@ self: {
        pname = "hist-pl-fusion";
        version = "0.5.3";
        sha256 = "0ism9qw3g0x0r40qm6v0gj1b2fj5zdnfik7b4h0b0dqyi08m6sq3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dawg hist-pl-dawg hist-pl-lexicon polimorf
          text text-binary
        ];
@@ -66463,7 +68140,7 @@ self: {
        pname = "hist-pl-lexicon";
        version = "0.6.1";
        sha256 = "1baq1a5l44q56msp2y2m9hyd5v841jkxm0cdlgi816fmc0768cqk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dawg directory filepath hist-pl-dawg
          hist-pl-types pipes text transformers
        ];
@@ -66479,7 +68156,7 @@ self: {
        pname = "hist-pl-lmf";
        version = "0.1.0";
        sha256 = "146vz15fig8k1wcvcw7fg64abxvg1nyarvhigz9jkzf5yngkzwvm";
-       buildDepends = [ base hist-pl-types polysoup text ];
+       libraryHaskellDepends = [ base hist-pl-types polysoup text ];
        jailbreak = true;
        homepage = "https://github.com/kawu/hist-pl/tree/master/lmf";
        description = "LMF parsing for the historical dictionary of Polish";
@@ -66493,7 +68170,7 @@ self: {
        pname = "hist-pl-transliter";
        version = "0.1.1";
        sha256 = "146ywyh67a0hasgcpfmffrj8w1kg6anksaa3mm9f80k83shqhvrb";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        homepage = "https://github.com/kawu/hist-pl/tree/master/transliter";
        description = "A simple EDSL for transliteration rules";
        license = stdenv.lib.licenses.bsd3;
@@ -66505,7 +68182,7 @@ self: {
        pname = "hist-pl-types";
        version = "0.1.0";
        sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v";
-       buildDepends = [ base binary text text-binary ];
+       libraryHaskellDepends = [ base binary text text-binary ];
        jailbreak = true;
        homepage = "https://github.com/kawu/hist-pl/tree/master/types";
        description = "Types in the historical dictionary of Polish";
@@ -66520,7 +68197,7 @@ self: {
        pname = "histogram-fill";
        version = "0.8.4.1";
        sha256 = "0zamqza4ky90l27sjgv55rp7s1g4hs0k0qn2qza7lfwk991ijn9q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq ghc-prim monad-primitive primitive vector
        ];
        homepage = "https://github.com/Shimuuar/histogram-fill/";
@@ -66534,7 +68211,7 @@ self: {
        pname = "histogram-fill-binary";
        version = "0.6.2.1";
        sha256 = "0bv70h1q8h50x3sr8ia6855vw0rrbvnzlnnh45k4i1dfadj6zsi2";
-       buildDepends = [ base binary histogram-fill vector ];
+       libraryHaskellDepends = [ base binary histogram-fill vector ];
        homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Binary instances for histogram-fill package";
        license = stdenv.lib.licenses.bsd3;
@@ -66546,7 +68223,7 @@ self: {
        pname = "histogram-fill-cereal";
        version = "0.6.2.0";
        sha256 = "17bnn6cb64333ak0qh841192jh2zwxg73rbc3zh5agp00wi23ism";
-       buildDepends = [ base cereal histogram-fill vector ];
+       libraryHaskellDepends = [ base cereal histogram-fill vector ];
        homepage = "http://bitbucket.org/Shimuuar/histogram-fill-cereal/";
        description = "Library for histograms creation";
        license = stdenv.lib.licenses.bsd3;
@@ -66562,7 +68239,7 @@ self: {
        sha256 = "1lgajnq092jk4izy86qcw71ghxz6b8mprm4ha3ybrm5i2rlh12r6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath process regex-compat regex-posix
        ];
        jailbreak = true;
@@ -66583,12 +68260,12 @@ self: {
        sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base byteable bytestring containers cryptohash hourglass
          mtl parsec patience random system-fileio system-filepath
          unix-compat utf8-string vector zlib zlib-bindings
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytedump bytestring hourglass tasty tasty-quickcheck
        ];
        homepage = "http://github.com/vincenthz/hit";
@@ -66604,7 +68281,7 @@ self: {
        pname = "hjcase";
        version = "0.2.0.0";
        sha256 = "0d1pb24jqk2dj635hy1way9axr9719g1ppxmxr4jpbb0sj6xphjk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers vector
        ];
@@ -66620,7 +68297,7 @@ self: {
        pname = "hjpath";
        version = "3.0.1";
        sha256 = "0wmzxwi24q7r0yxnalzqnn3k0bzf7wc4ql26dv94pvzir156kahj";
-       buildDepends = [ base containers hjson parsec ];
+       libraryHaskellDepends = [ base containers hjson parsec ];
        homepage = "http://bitcheese.net/wiki/code/hjpath";
        description = "XPath-like syntax for querying JSON";
        license = stdenv.lib.licenses.bsd3;
@@ -66636,7 +68313,7 @@ self: {
        sha256 = "0gk4misxbkc2x8hh7ynrj1ma91fs0h6q702w6r0kjq136fh48zhi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory mtl parsec regex-compat
        ];
        homepage = "http://www.haskell.org/haskellwiki/Libraries_and_tools/HJS";
@@ -66656,11 +68333,14 @@ self: {
        sha256 = "1mzi7czzw1b8avkfzmsl79hqg57dcrcfp6klzx15drnbl7c1zn7l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript text
+       ];
+       executableHaskellDepends = [
          base blaze-builder bytestring containers language-javascript
          optparse-applicative text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring Cabal containers HUnit
          language-javascript QuickCheck test-framework test-framework-hunit
          text
@@ -66676,7 +68356,7 @@ self: {
        pname = "hjson";
        version = "1.3.2";
        sha256 = "1r59g5ypqjsldflsddg7pzpa6j8jps5nwm4h9cwiw7qk734rjik8";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        description = "JSON parsing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66687,7 +68367,7 @@ self: {
        pname = "hjson-query";
        version = "1.0.2";
        sha256 = "0sj86rm5pz0q9079f5kjnpz51dxvvq72waaf8h64jzrrhkpz8mlx";
-       buildDepends = [ base containers hjson ];
+       libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66700,8 +68380,10 @@ self: {
        pname = "hjsonpointer";
        version = "0.2.0.3";
        sha256 = "13n0fzhd2fmy7k5iafmg3cxd2lmpsfvvbg1a0q793wz5f3glw0l3";
-       buildDepends = [ aeson base text unordered-containers vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         aeson base text unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson base http-types HUnit test-framework test-framework-hunit
          text unordered-containers vector
        ];
@@ -66721,11 +68403,11 @@ self: {
        pname = "hjsonschema";
        version = "0.6.0.1";
        sha256 = "1m7fg179khkmyhnhqa32gbaf2dgg27i4n36fafqm60pyc5kzhz69";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring file-embed hashable hjsonpointer http-client
          http-types regexpr scientific text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base bytestring directory filepath HUnit test-framework
          test-framework-hunit text unordered-containers vector
          wai-app-static warp
@@ -66747,10 +68429,12 @@ self: {
        sha256 = "03v8law4yfm63f44zyiqngjmpismk8clqisq4sl4gcp1yc1hn704";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base-unicode-symbols containers derive directory filepath
-         frquotes mtl process template-haskell transformers uniplate
-         utf8-string
+       libraryHaskellDepends = [
+         base base-unicode-symbols containers derive directory filepath mtl
+         process template-haskell transformers uniplate utf8-string
+       ];
+       executableHaskellDepends = [
+         base base-unicode-symbols containers frquotes mtl transformers
        ];
        description = "A library to build valid LaTeX files";
        license = stdenv.lib.licenses.bsd3;
@@ -66765,12 +68449,12 @@ self: {
        pname = "hlbfgsb";
        version = "0.0.1.0";
        sha256 = "0nar59rbi5zr6gi2k0f49f09fnxcmshnq9bb2dh973a4y3gcw6dx";
-       buildDepends = [ base vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ gfortran ];
+       libraryToolDepends = [ gfortran ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit vector
        ];
-       buildTools = [ gfortran ];
-       extraLibraries = [ gfortran ];
        homepage = "http://people.ksp.sk/~ivan/hlbfgsb";
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
@@ -66787,7 +68471,10 @@ self: {
        sha256 = "14yqc02kfp2c9i22inma29cprqz9k8yx6c7m90kwimv4psv8766a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring haskell98 parallel
+       ];
+       executableHaskellDepends = [
          array base bytestring bytestring-csv containers haskell98 parallel
        ];
        jailbreak = true;
@@ -66811,13 +68498,19 @@ self: {
        sha256 = "1gixj6i99rqbn6ziwpni2scgv9sdd3yvxj6d3i1ivirmsx2rd3bm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat cmdargs containers csv directory filepath
          haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
          pretty-show process regex-tdfa safe shakespeare split tabular
          terminfo text time unordered-containers utf8-string wizards
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base base-compat cmdargs containers csv directory filepath
+         haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
+         pretty-show process regex-tdfa safe shakespeare split tabular text
+         time unordered-containers utf8-string wizards
+       ];
+       testHaskellDepends = [
          base base-compat cmdargs containers csv directory filepath
          haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
          pretty-show process regex-tdfa safe shakespeare split tabular
@@ -66838,7 +68531,7 @@ self: {
        sha256 = "1yk563032ir98gqdvxazjjl1alg6q1pflzawh11pr3zrdnriracn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Chart cmdargs colour containers hledger hledger-lib HUnit safe
          time
        ];
@@ -66857,7 +68550,7 @@ self: {
        sha256 = "1p0b2xc2axsigmbc5lhl12acsjjvn0j8gjlwp3v4ggyanwyj686r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hledger-lib time ];
+       executableHaskellDepends = [ base hledger-lib time ];
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
@@ -66871,7 +68564,9 @@ self: {
        sha256 = "16knk1cwrpg5jn6vgcab7hqpjzg33ysz57x1f2glrmhhv1slmbfn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal Decimal hledger-lib mtl time ];
+       executableHaskellDepends = [
+         base Cabal Decimal hledger-lib mtl time
+       ];
        homepage = "http://github.com/peti/hledger-interest";
        description = "computes interest for a given account";
        license = stdenv.lib.licenses.bsd3;
@@ -66887,7 +68582,9 @@ self: {
        sha256 = "1gi7v5xsx1hv4lljlx19v4rwvnh7raglxzh4mgyiwlnwqybc2cr4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal Decimal hledger-lib statistics time ];
+       executableHaskellDepends = [
+         base Cabal Decimal hledger-lib statistics time
+       ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66903,12 +68600,12 @@ self: {
        pname = "hledger-lib";
        version = "0.26";
        sha256 = "0cm5d65kfxha6280q9iibrj4a0p5g6srfl28x1f8vay41xjg80nh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv Decimal directory filepath HUnit mtl mtl-compat old-time parsec
          pretty-show regex-tdfa safe split time transformers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base base-compat blaze-markup cmdargs containers csv Decimal
          directory filepath HUnit mtl mtl-compat old-time parsec pretty-show
          regex-tdfa safe split test-framework test-framework-hunit time
@@ -66929,7 +68626,7 @@ self: {
        sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs hledger hledger-lib HUnit safe time vty
        ];
        jailbreak = true;
@@ -66954,7 +68651,7 @@ self: {
        sha256 = "019r4jy0kss62ya883rgzkc6lkp14f0dfkdfiahpl4587fcvpxsi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat blaze-html blaze-markup bytestring clientsession
          cmdargs conduit-extra data-default directory filepath hjsmin
          hledger hledger-lib http-client http-conduit HUnit json parsec safe
@@ -66962,7 +68659,15 @@ self: {
          wai-handler-launch warp yaml yesod yesod-core yesod-form
          yesod-static
        ];
-       testDepends = [ base base-compat hspec yesod yesod-test ];
+       executableHaskellDepends = [
+         base base-compat blaze-html blaze-markup bytestring clientsession
+         cmdargs conduit-extra data-default directory filepath hjsmin
+         hledger hledger-lib http-client http-conduit HUnit json parsec safe
+         shakespeare template-haskell text time transformers wai wai-extra
+         wai-handler-launch warp yaml yesod yesod-core yesod-form
+         yesod-static
+       ];
+       testHaskellDepends = [ base base-compat hspec yesod yesod-test ];
        homepage = "http://hledger.org";
        description = "A web interface for the hledger accounting tool";
        license = "GPL";
@@ -66975,9 +68680,9 @@ self: {
        pname = "hlibBladeRF";
        version = "0.1.0.6";
        sha256 = "15k15afy04kld6ar317lk441js873fcyk8qh92r98hnhbpq3nrmw";
-       buildDepends = [ base bindings-DSL bytestring ];
-       testDepends = [ base hlint ];
-       pkgconfigDepends = [ libbladeRF ];
+       libraryHaskellDepends = [ base bindings-DSL bytestring ];
+       libraryPkgconfigDepends = [ libbladeRF ];
+       testHaskellDepends = [ base hlint ];
        jailbreak = true;
        homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF";
        description = "Haskell binding to libBladeRF SDR library";
@@ -66990,8 +68695,8 @@ self: {
        pname = "hlibev";
        version = "0.4.0";
        sha256 = "0416w0k5ahnj57gc6n15ihpsyznmm36s1sjkycl35l7s8bxdldyw";
-       buildDepends = [ base network ];
-       extraLibraries = [ ev ];
+       libraryHaskellDepends = [ base network ];
+       librarySystemDepends = [ ev ];
        homepage = "http://github.com/aycanirican/hlibev";
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
@@ -67004,26 +68709,26 @@ self: {
        pname = "hlibfam";
        version = "0.2";
        sha256 = "10rxwfq2ppmqs3kjb8cq6l04g0qsxqy7w7ri7dj013kiz7rzk1yd";
-       buildDepends = [ base ];
-       extraLibraries = [ fam ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) fam;};
 
   "hlibgit2" = callPackage
-    ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }:
+    ({ mkDerivation, base, bindings-DSL, openssl, process, zlib }:
      mkDerivation {
        pname = "hlibgit2";
        version = "0.18.0.14";
        sha256 = "0fxglcgi0iwj9xqgx1f3dixia9pqfzz0yq9iq7flaggpr9pvn3n0";
-       buildDepends = [ base bindings-DSL zlib ];
-       testDepends = [ base process ];
-       buildTools = [ git ];
-       extraLibraries = [ openssl ];
+       libraryHaskellDepends = [ base bindings-DSL zlib ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base process ];
        description = "Low-level bindings to libgit2";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) git;  inherit (pkgs) openssl;};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) { inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
     ({ mkDerivation, base, hspec, sass }:
@@ -67031,13 +68736,12 @@ self: {
        pname = "hlibsass";
        version = "0.1.4.0";
        sha256 = "062qsg5mr0qsa5ah1d0xx7njkpn4j4g6x4sv3skgvgc9855gywr6";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
-       extraLibraries = [ sass ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ sass ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/jakubfijalkowski/hlibsass";
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { sass = null;};
 
   "hlint" = callPackage
@@ -67051,10 +68755,11 @@ self: {
        sha256 = "14v3rdjjlml9nimdk7d5dvir2bw78ai49yylvms9lnzmw29s3546";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base cmdargs containers cpphs directory extra
          filepath haskell-src-exts hscolour process transformers uniplate
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://community.haskell.org/~ndm/hlint/";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
@@ -67066,7 +68771,7 @@ self: {
        pname = "hlogger";
        version = "0.0.3.0";
        sha256 = "1q3jsnxy7x0lv7wqfv9hlqnr22661k4agbb8yjbhj32fxyjqrn4f";
-       buildDepends = [ base old-locale time ];
+       libraryHaskellDepends = [ base old-locale time ];
        homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent, extendable and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
@@ -67083,8 +68788,9 @@ self: {
        sha256 = "1njj7cvj9zjy0gghkr33bzwsv6lj27xvf56kicsr0pyyn76wplv5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring curl json regex-base regex-posix
+       libraryHaskellDepends = [ base curl json ];
+       executableHaskellDepends = [
+         base bytestring curl regex-base regex-posix
        ];
        description = "Library and utility interfacing to longurl.org";
        license = stdenv.lib.licenses.bsd3;
@@ -67096,7 +68802,7 @@ self: {
        pname = "hls";
        version = "0.15";
        sha256 = "0h32fyvnqkxx8c9vfpdjvnqaxkvr8b15myjavxmnm6kwh7v2796l";
-       buildDepends = [ base containers hcg-minus hps ];
+       libraryHaskellDepends = [ base containers hcg-minus hps ];
        homepage = "http://rd.slavepianos.org/t/hls";
        description = "Haskell Lindenmayer Systems";
        license = "GPL";
@@ -67107,12 +68813,17 @@ self: {
      mkDerivation {
        pname = "hlwm";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "1vp21440v9gq4mvnqnsw1ha72ywgc4hmp137pkpvs5p13ixyfrgi";
+       revision = "1";
        editedCabalFile = "ce22b9186e03c83f13e56b33630f4af561b604c51374c23dc1ef4e24ced9a54e";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base monads-tf stm transformers unix X11 ];
+       libraryHaskellDepends = [
+         base monads-tf stm transformers unix X11
+       ];
+       executableHaskellDepends = [
+         base monads-tf stm transformers unix X11
+       ];
        jailbreak = true;
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
@@ -67124,7 +68835,7 @@ self: {
        pname = "hly";
        version = "0.15";
        sha256 = "192szfq39g3fdcdsxj4bsi13bfha8gjbqbixav3iywmdsgxp1hj8";
-       buildDepends = [ base directory filepath hmt process ];
+       libraryHaskellDepends = [ base directory filepath hmt process ];
        homepage = "http://rd.slavepianos.org/t/hly";
        description = "Haskell LilyPond";
        license = "GPL";
@@ -67141,9 +68852,10 @@ self: {
        sha256 = "1s4ichb5dchcimcq9pvdddv2ibbdk2cb2b7p0l7p9s5lxn53bxgg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring random safe tokyocabinet-haskell utf8-string
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://bitcheese.net/wiki/code/hmark";
        description = "A tool and library for Markov chains based text generation";
        license = stdenv.lib.licenses.bsd3;
@@ -67156,7 +68868,9 @@ self: {
        pname = "hmarkup";
        version = "3000.0.1";
        sha256 = "0p6f1jd1b01dvzffiac17f8z0l403f54vrph8k9b3549lpjfh452";
-       buildDepends = [ base containers mtl network parsec xhtml ];
+       libraryHaskellDepends = [
+         base containers mtl network parsec xhtml
+       ];
        description = "Simple wikitext-like markup format implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67164,21 +68878,21 @@ self: {
 
   "hmatrix" = callPackage
     ({ mkDerivation, array, base, binary, blas, bytestring, deepseq
-     , liblapack, random, split, storable-complex, vector
+     , lapack, random, split, storable-complex, vector
      }:
      mkDerivation {
        pname = "hmatrix";
        version = "0.16.1.5";
        sha256 = "1da1iy2rzz51l69nixacsl7gqhkzld1w8z5h0klkha3mcnf1kkkq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring deepseq random split storable-complex
          vector
        ];
-       extraLibraries = [ blas liblapack ];
+       librarySystemDepends = [ blas lapack ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) blas;  inherit (pkgs) liblapack;};
+     }) { inherit (pkgs) blas;  lapack = null;};
 
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, lapack, transformers }:
@@ -67186,8 +68900,8 @@ self: {
        pname = "hmatrix-banded";
        version = "0.0";
        sha256 = "05jgm3hnlylnfhavcicjbhbxq929whm6mapggfwbxkzajhh0paaj";
-       buildDepends = [ base hmatrix transformers ];
-       extraLibraries = [ lapack ];
+       libraryHaskellDepends = [ base hmatrix transformers ];
+       librarySystemDepends = [ lapack ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/hmatrix-banded/";
        description = "HMatrix interface to LAPACK functions for banded matrices";
@@ -67201,7 +68915,7 @@ self: {
        pname = "hmatrix-csv";
        version = "0.1.0.2";
        sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb";
-       buildDepends = [ base bytestring cassava hmatrix vector ];
+       libraryHaskellDepends = [ base bytestring cassava hmatrix vector ];
        homepage = "https://github.com/grtlr/hmatrix-csv";
        description = "CSV encoding and decoding for hmatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -67213,8 +68927,8 @@ self: {
        pname = "hmatrix-glpk";
        version = "0.4.1.0";
        sha256 = "0jy00mblbqp7bx0nxmvzfpa94b21fbl4cam0mha673hzq11rfrxi";
-       buildDepends = [ base containers hmatrix ];
-       extraLibraries = [ glpk ];
+       libraryHaskellDepends = [ base containers hmatrix ];
+       librarySystemDepends = [ glpk ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Linear Programming based on GLPK";
        license = "GPL";
@@ -67227,8 +68941,10 @@ self: {
        pname = "hmatrix-gsl";
        version = "0.16.0.3";
        sha256 = "07hg9rfrr1029n9q8xyicyh4rr9x4c02cqn1xxnks9p9qyccf4kg";
-       buildDepends = [ array base hmatrix process random vector ];
-       pkgconfigDepends = [ gsl ];
+       libraryHaskellDepends = [
+         array base hmatrix process random vector
+       ];
+       libraryPkgconfigDepends = [ gsl ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numerical computation";
        license = "GPL";
@@ -67240,8 +68956,8 @@ self: {
        pname = "hmatrix-gsl-stats";
        version = "0.4.1";
        sha256 = "113gi92xdck75zrllpncrnm72fj8wd2wcbf237jflkpbqcmzf8zq";
-       buildDepends = [ base binary hmatrix storable-complex ];
-       pkgconfigDepends = [ gsl ];
+       libraryHaskellDepends = [ base binary hmatrix storable-complex ];
+       libraryPkgconfigDepends = [ gsl ];
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
        description = "GSL Statistics interface";
        license = stdenv.lib.licenses.bsd3;
@@ -67254,7 +68970,7 @@ self: {
        pname = "hmatrix-mmap";
        version = "0.0.5";
        sha256 = "03z1f1xqw4hqh41q6hh8p103cl7dg9hqcawqlinapfmkvw5mzy8d";
-       buildDepends = [ base hmatrix mmap ];
+       libraryHaskellDepends = [ base hmatrix mmap ];
        homepage = "http://github.com/alanfalloon/hmatrix-mmap";
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
@@ -67268,7 +68984,7 @@ self: {
        sha256 = "0afmpwfi4hqz5bpcsm579mcvz1dx7vxqmqj2rb6axnw9512xyarj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hmatrix ];
+       libraryHaskellDepends = [ base hmatrix ];
        homepage = "http://github.com/alanfalloon/hmatrix-nipals";
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
@@ -67280,8 +68996,8 @@ self: {
        pname = "hmatrix-quadprogpp";
        version = "0.2.0.2";
        sha256 = "02ysxyy7ixpnrghl0ignfmjy6j358i5xbmklmpxykkg27jgzvic3";
-       buildDepends = [ base hmatrix vector ];
-       extraLibraries = [ QuadProgpp ];
+       libraryHaskellDepends = [ base hmatrix vector ];
+       librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67293,24 +69009,23 @@ self: {
        pname = "hmatrix-repa";
        version = "0.1.2.1";
        sha256 = "0xx02kll13c2zw5x13p9746av2yhgpybfxi508qgi84drfa8caa8";
-       buildDepends = [ base hmatrix repa vector ];
+       libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "http://code.haskell.org/hmatrix-repa";
        description = "Adaptors for interoperability between hmatrix and repa";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hmatrix-special" = callPackage
-    ({ mkDerivation, base, gsl, hmatrix, hmatrix-gsl }:
+    ({ mkDerivation, base, hmatrix, hmatrix-gsl }:
      mkDerivation {
        pname = "hmatrix-special";
        version = "0.3.0.1";
        sha256 = "1ziqzbfrk7xyah5n0cys1ccnmj2z91wxdamanv3y5v717zhdrqix";
-       buildDepends = [ base hmatrix hmatrix-gsl ];
-       extraLibraries = [ gsl ];
+       libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Interface to GSL special functions";
        license = "GPL";
-     }) { inherit (pkgs) gsl;};
+     }) {};
 
   "hmatrix-static" = callPackage
     ({ mkDerivation, array, base, haskell-src-meta, hmatrix, parsec
@@ -67320,7 +69035,7 @@ self: {
        pname = "hmatrix-static";
        version = "0.3.0.2";
        sha256 = "1qjxj8k4cracinyyjpk0nr3c5n119v39kpxig78c11cjhvhm3zgi";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base haskell-src-meta hmatrix parsec template-haskell tfp
        ];
        jailbreak = true;
@@ -67338,7 +69053,8 @@ self: {
        sha256 = "0mi41n31i4bjnqjnsmqs4mbrprg3sx4vx4wqixgyp3qk0jm6lijm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hmatrix ];
+       libraryHaskellDepends = [ base hmatrix ];
+       executableHaskellDepends = [ base hmatrix ];
        homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -67352,7 +69068,7 @@ self: {
        pname = "hmatrix-syntax";
        version = "0.1.2.1";
        sha256 = "0qy5dx480hf9i03d16kylg2l8dsj10lzwfbik5ijqa4x3h7h038b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta hmatrix template-haskell
        ];
        jailbreak = true;
@@ -67370,10 +69086,10 @@ self: {
        pname = "hmatrix-tests";
        version = "0.4.1.0";
        sha256 = "0jrq9719japf9a7v14xbwqj4fs8y14wkji13jhyn00x1xpp4nkh3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hmatrix hmatrix-gsl HUnit QuickCheck random
        ];
-       testDepends = [ base HUnit QuickCheck random ];
+       testHaskellDepends = [ base HUnit QuickCheck random ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -67388,7 +69104,7 @@ self: {
        pname = "hmeap";
        version = "0.15";
        sha256 = "19hip2xzlsgj1fd8y4l4zhn4lcj8n8qyrayn6idzvlskx4vca0bh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-lexing delimited-text parsec
        ];
        homepage = "http://rd.slavepianos.org/t/hmeap";
@@ -67407,7 +69123,7 @@ self: {
        sha256 = "1dnmvzy7vkx2rfbkkqapfpql8h0gm9sq0333r90hy5nsyl9hhbq8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring bytestring-lexing delimited-text gnuplot
          hmatrix hmeap hosc hsc3 parsec
        ];
@@ -67426,7 +69142,7 @@ self: {
        pname = "hmemdb";
        version = "0.4.0.0";
        sha256 = "0zdz9nkianzviy0rn7fvzs01ymnz89p25kiis64rfvj3zwxk535w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers monad-stm stm transformers
        ];
        description = "In-memory relational database";
@@ -67441,10 +69157,11 @@ self: {
        sha256 = "0ym3nzyx1jwcc7m6qj8zchs2q73rj82d7f1r2rvykhns7ca20hrp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base MissingH process ];
+       executableHaskellDepends = [ base MissingH process ];
        jailbreak = true;
        description = "CLI fuzzy finder and launcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmidi" = callPackage
@@ -67453,7 +69170,7 @@ self: {
        pname = "hmidi";
        version = "0.2.2.0";
        sha256 = "1khqhw69c3bf3qj8pzxz876xisr099rgdgf2rr101x83h9hj8acb";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Binding to the OS level MIDI services";
        license = stdenv.lib.licenses.bsd3;
@@ -67469,7 +69186,8 @@ self: {
        sha256 = "08cq1lk1nkhkcjjjvkzy4xrr0gx6j2lpsv2vmj25kg6j9j33ilxh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath mtl parsec pcre-light
          process unix
        ];
@@ -67488,7 +69206,7 @@ self: {
        pname = "hmm";
        version = "0.2.1.1";
        sha256 = "08gdicnhls8y180il2k51zrcra1acw8m1qw0s2nz5w57mhfnxq31";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base data-memocombinators list-extras logfloat
        ];
        homepage = "https://github.com/mikeizbicki/hmm";
@@ -67505,7 +69223,7 @@ self: {
        pname = "hmm-hmatrix";
        version = "0.0.1";
        sha256 = "1kkikv3spnvqms59980p8aappw3wh26y9qs2c8ykia5fpz9zag4h";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers explicit-exception hmatrix lazy-csv non-empty
          random semigroups transformers utility-ht
        ];
@@ -67527,11 +69245,11 @@ self: {
        sha256 = "0kfqzydilajcpaazpbhmpv3h18n3lx839wxmcbjlzvjc78ajblb3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers directory mersenne-random
          old-time pcre-light process unix zlib
        ];
-       extraLibraries = [ ncurses ];
+       executableSystemDepends = [ ncurses ];
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
@@ -67544,8 +69262,8 @@ self: {
        pname = "hmpfr";
        version = "0.3.3.5";
        sha256 = "00gqrmfwg7hk21iyfbma8h4ahpxgj21wi9fcxjdms506ahk7rwf4";
-       buildDepends = [ base integer-gmp ];
-       extraLibraries = [ mpfr ];
+       libraryHaskellDepends = [ base integer-gmp ];
+       librarySystemDepends = [ mpfr ];
        homepage = "http://code.google.com/p/hmpfr/";
        description = "Haskell binding to the MPFR library";
        license = stdenv.lib.licenses.bsd3;
@@ -67562,7 +69280,7 @@ self: {
        pname = "hmt";
        version = "0.15";
        sha256 = "051kgsh9nl5f1nw8a24x7ds18g6ppzbhk3d9lf74nvvnccnzg3a9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring colour containers data-ordlist directory
          filepath lazy-csv logict multiset-comb parsec permutation primes
          safe split utf8-string
@@ -67580,7 +69298,7 @@ self: {
        pname = "hmt-diagrams";
        version = "0.15";
        sha256 = "1g64b31bz31x0kiivazn20s22y2w7dz9f2gw5cnfkcnjd20k7glm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo colour filepath hcg-minus hcg-minus-cairo hmt
          html-minimalist process xml
        ];
@@ -67599,7 +69317,7 @@ self: {
        sha256 = "06bixsd7vzfj0gwv0b2880p4xx3f9j7y1snindlnlcfr1qdp9jn2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskeline mtl parsec QuickCheck regex-compat syb
          text
        ];
@@ -67621,17 +69339,19 @@ self: {
        sha256 = "1309kzb5jrc9yy18bir3dy3r5xhmfnbd180ky9x4l3i1m4q5r31s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers either errors filepath hmatrix repa transformers
          vector
        ];
-       testDepends = [
+       librarySystemDepends = [ netcdf ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base containers hmatrix repa vector ];
+       testHaskellDepends = [
          base containers directory errors hmatrix HUnit QuickCheck repa
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ netcdf ];
+       testSystemDepends = [ netcdf ];
        jailbreak = true;
        homepage = "https://github.com/ian-ross/hnetcdf";
        description = "Haskell NetCDF library";
@@ -67649,17 +69369,19 @@ self: {
        sha256 = "1y10w6ylgrdgy271a372f14rqdkvzlmpkjl08d5zg3r84jxhy6ia";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base containers data-fix parsers text transformers
          trifecta unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         ansi-wl-pprint base containers data-fix
+       ];
+       testHaskellDepends = [
          base containers data-fix tasty tasty-hunit tasty-th text
        ];
        homepage = "http://github.com/jwiegley/hnix";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnn" = callPackage
@@ -67670,7 +69392,7 @@ self: {
        pname = "hnn";
        version = "0.2.0.0";
        sha256 = "13i2rs1ab7kh2mzf34hckkihpbrxpxzwfcdd529zd7dynhd3psjw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hmatrix mwc-random random vector
          vector-binary-instances zlib
        ];
@@ -67688,7 +69410,7 @@ self: {
        sha256 = "0sfw9gmcn7qclgsgzqm9zalyxhz0mig91fabcfq3g0r98krgjnr2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        license = stdenv.lib.licenses.unfree;
      }) {};
 
@@ -67699,8 +69421,10 @@ self: {
        pname = "ho-rewriting";
        version = "0.1";
        sha256 = "1hmnqck385mhk140kgf8882lfa91bmip4pxbjnfpf62dwh0z39a3";
-       buildDepends = [ base compdata containers mtl patch-combinators ];
-       testDepends = [ base compdata patch-combinators ];
+       libraryHaskellDepends = [
+         base compdata containers mtl patch-combinators
+       ];
+       testHaskellDepends = [ base compdata patch-combinators ];
        homepage = "https://github.com/emilaxelsson/ho-rewriting";
        description = "Generic rewrite rules with safe treatment of variables and binders";
        license = stdenv.lib.licenses.bsd3;
@@ -67715,7 +69439,7 @@ self: {
        pname = "hoauth";
        version = "0.3.5";
        sha256 = "06vk3dv2dby7wadxg4qq2bzy10hl8ix2x4vpxggwd13xy3kpzjqp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring crypto-pubkey-types curl dataenc entropy mtl
          old-locale random RSA SHA time utf8-string
        ];
@@ -67734,7 +69458,10 @@ self: {
        sha256 = "14rhhk9667asdvdri9xm6jr4blrj5q1mb1g54mi94sz1vqh9hj3f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit http-types text
+       ];
+       executableHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
        homepage = "https://github.com/freizl/hoauth2";
@@ -67753,12 +69480,15 @@ self: {
        sha256 = "1m2sxbw5il818g50b0650cm5vrb7njclk09m0na6i3amx3q10xjc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers directory filepath glib
-         gtk-largeTreeStore gtk3 gtksourceview3 mtl pango system-filepath
-         text transformers vector
+       libraryHaskellDepends = [
+         base containers filepath glib gtk-largeTreeStore gtk3
+         gtksourceview3 mtl pango system-filepath text transformers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory filepath gtk3 gtksourceview3
+         mtl text
+       ];
+       testHaskellDepends = [
          base containers gtk3 gtksourceview3 hspec mtl text
        ];
        jailbreak = true;
@@ -67778,13 +69508,14 @@ self: {
        sha256 = "1pri63d59q918jv1hdp2ib06m6lzw9a2b6bjyn86b2qrrx2512xd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base filemanip filepath fsnotify system-filepath text
        ];
        jailbreak = true;
        homepage = "http://github.com/jhickner/hobbes";
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hobbits" = callPackage
@@ -67796,7 +69527,7 @@ self: {
        pname = "hobbits";
        version = "1.1.1";
        sha256 = "0q668jvlpqs7y3l27fk9m96aa8rzhdkz8jf0whifdb2gahlhx9hs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq haskell-src-exts haskell-src-meta mtl syb tagged
          template-haskell th-expand-syns transformers type-equality
        ];
@@ -67816,7 +69547,7 @@ self: {
        sha256 = "0g8528jllh90f8zbrs229ms07lg7b397pm2zjccd6kriqpq1vfv0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base exceptions hint mtl optparse-declarative regex-posix split
          text time
        ];
@@ -67831,7 +69562,7 @@ self: {
        pname = "hofix-mtl";
        version = "1.0";
        sha256 = "1xlsddrdv56n7ww7a377jwz43xkkckl5zygghwxs9k88wxzskvvd";
-       buildDepends = [ base mtl star-to-star template-haskell ];
+       libraryHaskellDepends = [ base mtl star-to-star template-haskell ];
        jailbreak = true;
        description = "defining @mtl@-ready monads as * -> * fixed-points";
        license = "unknown";
@@ -67848,7 +69579,7 @@ self: {
        sha256 = "0mmp7ymmzvhpwmwjjnin9493a81vijai7hcyqwv9wrfhdjnykb1d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs filepath irc network old-locale time unix
        ];
        jailbreak = true;
@@ -67867,7 +69598,7 @@ self: {
        sha256 = "0djgbgahhrfdpxknqfjqkqwzy7ra3d7mnxyv6n76kpldalhihklw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers HUnit mtl old-locale random time
        ];
        homepage = "http://www.kfish.org/software/hogg/";
@@ -67882,10 +69613,10 @@ self: {
        pname = "hogre";
        version = "0.1.5";
        sha256 = "0ndgnflcj885ylxf8q8l71cykrpm4j6svzqxlpdynf054safq174";
-       buildDepends = [ base cgen ];
-       buildTools = [ cgen cgen-hs grgen ];
-       extraLibraries = [ OgreMain ];
-       pkgconfigDepends = [ OGRE ];
+       libraryHaskellDepends = [ base cgen ];
+       librarySystemDepends = [ OgreMain ];
+       libraryPkgconfigDepends = [ OGRE ];
+       libraryToolDepends = [ cgen cgen-hs grgen ];
        homepage = "http://anttisalonen.github.com/hogre";
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
@@ -67901,8 +69632,8 @@ self: {
        sha256 = "10zq4qch5bs0aawvs0zg3yyz41lykg1jrna5jqxlrvbq0wfz2s5g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hogre ];
-       extraLibraries = [ OgreMain ];
+       executableHaskellDepends = [ base hogre ];
+       executableSystemDepends = [ OgreMain ];
        homepage = "http://github.com/anttisalonen/hogre-examples";
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
@@ -67917,8 +69648,9 @@ self: {
        sha256 = "0awb7dfa77y7n88ljkcdxs63g37qyc5xkr0j7lqwzx23q83a5c4k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base X11 ];
-       extraLibraries = [ OIS ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ OIS ];
+       executableHaskellDepends = [ base X11 ];
        jailbreak = true;
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -67930,10 +69662,10 @@ self: {
      mkDerivation {
        pname = "hoist-error";
        version = "0.1.0.2";
-       revision = "2";
        sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z";
+       revision = "2";
        editedCabalFile = "fca4ac245a1bddf638317290deb580d05d1539c6a700b02744ce61e259e2e879";
-       buildDepends = [ base either mtl ];
+       libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67944,7 +69676,7 @@ self: {
        pname = "hold-em";
        version = "0.1.0.0";
        sha256 = "1j2ql6izsd85skd6l9j1qfg7pj5rf513096s9bkvqip9bb4ibr4r";
-       buildDepends = [ base random safe ];
+       libraryHaskellDepends = [ base random safe ];
        jailbreak = true;
        description = "An engine for Texas hold'em Poker";
        license = stdenv.lib.licenses.bsd3;
@@ -67956,7 +69688,7 @@ self: {
        pname = "hole";
        version = "0.1.1";
        sha256 = "05ba87wk9b5i5b4gsfvsj16rv91dqsmzyys6b5fkssrxh2ika36c";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67986,13 +69718,18 @@ self: {
        sha256 = "05lns2xkw44g2jf2fbrpzdi5iqzq7hxkhhv86ah08hr14qiyp3sg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring directory filepath hastache
+         http-conduit lens lens-aeson process random split syb text time
+         unix
+       ];
+       executableHaskellDepends = [
          aeson ansi-terminal base bytestring Cabal directory filepath
          hastache http-conduit HUnit lens lens-aeson process QuickCheck
          random smallcheck split syb tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring Cabal HUnit QuickCheck smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
@@ -68007,7 +69744,7 @@ self: {
        pname = "homeomorphic";
        version = "0.1";
        sha256 = "1wm15bdz02sjgpz2n266xd50q3p6mncnv8mhimky6ps1kmzb5r6c";
-       buildDepends = [ base containers mtl QuickCheck ];
+       libraryHaskellDepends = [ base containers mtl QuickCheck ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/homeomorphic/";
        description = "Homeomorphic Embedding Test";
        license = stdenv.lib.licenses.bsd3;
@@ -68020,7 +69757,9 @@ self: {
        pname = "hommage";
        version = "0.0.6";
        sha256 = "053zv30ghm7c9idb6za44zasnn88g85z4bzbdpfpixlkvcm4sbck";
-       buildDepends = [ array base directory haskell98 random time ];
+       libraryHaskellDepends = [
+         array base directory haskell98 random time
+       ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68032,7 +69771,9 @@ self: {
        pname = "hommage-ds";
        version = "0.0.5";
        sha256 = "0gnwpzs6kwhf2wm0nqcgwqa1pp7xwbnqh337pr62w40i76g252v4";
-       buildDepends = [ array base DirectSound haskell98 hommage ];
+       libraryHaskellDepends = [
+         array base DirectSound haskell98 hommage
+       ];
        jailbreak = true;
        homepage = "substitut-fuer-feinmotorik/projects/haskellommage";
        description = "DirectSound extension (Windows) for the Hommage sound library";
@@ -68051,12 +69792,12 @@ self: {
        sha256 = "0xw3fkbzb3jqi5sr28a69ga632c30g4xwykgd0cq8imrz70jlvam";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers cpphs deepseq directory filepath haskell-src-exts
          hflags template-haskell uniplate
        ];
-       testDepends = [ base haskell-src-exts uniplate ];
-       buildTools = [ happy ];
+       executableToolDepends = [ happy ];
+       testHaskellDepends = [ base haskell-src-exts uniplate ];
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
@@ -68070,12 +69811,13 @@ self: {
        pname = "honi";
        version = "0.1.0.0";
        sha256 = "0g1w1i78a93d10zgdy9ixkflblx9xixa493hh2cc8jzznqsp5yfi";
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base freenect hspec HUnit OpenNI2 ];
-       extraLibraries = [ freenect OpenNI2 ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ freenect OpenNI2 ];
+       testHaskellDepends = [ base hspec HUnit ];
+       testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
-       broken = true;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { OpenNI2 = null;  freenect = null;};
 
   "honk" = callPackage
@@ -68084,7 +69826,7 @@ self: {
        pname = "honk";
        version = "1.3.0.0";
        sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://lambda.xyz/honk/";
        description = "Cross-platform interface to the PC speaker";
        license = stdenv.lib.licenses.asl20;
@@ -68100,7 +69842,7 @@ self: {
        sha256 = "0l1q6h0irfv3275jajvylajm2rhkfmvi1kpfan6n6z5adibh9and";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring Cabal directory filepath hoogle monad-loops
          mtl process yaml
        ];
@@ -68116,11 +69858,10 @@ self: {
        pname = "hood";
        version = "0.2.1";
        sha256 = "1f98v1bqrmh6cmmbsmcsdm3f250imp4rk0zi34di8fzlyqfcf2yh";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood";
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hood-off" = callPackage
@@ -68129,7 +69870,7 @@ self: {
        pname = "hood-off";
        version = "0.2";
        sha256 = "15rj6qfyhihzc5svl3dwkn387x7bbkl5am7h0kj5jjj8hv2q1pnc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68141,7 +69882,7 @@ self: {
        pname = "hood2";
        version = "0.2.1";
        sha256 = "0iyi1zljywamfaqc0mbd1xw3gn1hq0lcdgx688rr8zliw23jix02";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood";
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
@@ -68157,7 +69898,7 @@ self: {
        sha256 = "1q3wpsqz833vypqnd7ljiraiyn1klxid35mh5vyizldk3i0qqf6w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array astar base containers hfov monad-loops mtl ncurses random
        ];
        jailbreak = true;
@@ -68176,10 +69917,11 @@ self: {
        sha256 = "0ygmizbhag16ifdyp8gcvs0m9vinvirn8v7jfbi2m457bllmbsmq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cmdargs configurator containers directory filepath hoodle-core
          mtl
        ];
+       executableHaskellDepends = [ base cmdargs hoodle-core ];
        homepage = "http://ianwookim.org/hoodle";
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
@@ -68194,7 +69936,7 @@ self: {
        pname = "hoodle-builder";
        version = "0.3.0";
        sha256 = "0g4a3gf1mgf5gyniif0i2b89dz416h28171mwx7k7ivjw23gjvm7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring double-conversion hoodle-types lens
          strict text
        ];
@@ -68219,7 +69961,7 @@ self: {
        pname = "hoodle-core";
        version = "0.15.0";
        sha256 = "04007hbnv4n3dl2yngfjzl6vrqd40yk5h9lq0ws2z33k4xa3a3rk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring binary
          bytestring cairo case-insensitive cereal configurator containers
          coroutine-object Diff directory either errors filepath fsnotify gd
@@ -68230,7 +69972,7 @@ self: {
          transformers-free unordered-containers uuid vector websockets
          xournal-parser
        ];
-       extraLibraries = [ libX11 libXi ];
+       librarySystemDepends = [ libX11 libXi ];
        homepage = "http://ianwookim.org/hoodle";
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
@@ -68251,7 +69993,7 @@ self: {
        sha256 = "1mqx4qia457n8v4pdyd8mc8h7ybzx5asxm2d4p9ws5g2q4ybmshy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty attoparsec base base64-bytestring binary
          bytestring cmdargs conduit containers directory either filepath
          hoodle-parser hoodle-types http-conduit lens monad-loops mtl
@@ -68273,7 +70015,7 @@ self: {
        pname = "hoodle-parser";
        version = "0.3.0";
        sha256 = "0qp7x6csacf4w9crvmyrs7qsm9caici95qiwm11zyzyz2k9nm52g";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers either hoodle-types lens mtl
          strict text transformers xournal-types
        ];
@@ -68296,12 +70038,15 @@ self: {
        sha256 = "1nx2y4f000gid9mps0xxx4l6h0nh120568h9cl45gsp6qlw3sa5m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cairo cmdargs containers directory
+       libraryHaskellDepends = [
+         attoparsec base bytestring cairo containers directory
          directory-tree filepath gtk hoodle-parser hoodle-render
          hoodle-types HTTP io-streams lens mtl network-uri pdf-toolbox-core
          pdf-toolbox-document process transformers unordered-containers uuid
        ];
+       executableHaskellDepends = [
+         base cmdargs directory directory-tree filepath gtk
+       ];
        homepage = "http://ianwookim.org/hoodle";
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
@@ -68318,7 +70063,7 @@ self: {
        pname = "hoodle-render";
        version = "0.5.0";
        sha256 = "0460j9flj5cnvgv6cnchc6am0r5sw81lp67qf45rgcyjpz9q424i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cairo containers directory
          filepath gd gtk hashable hoodle-types lens monad-loops mtl poppler
          stm strict svgcairo time transformers unix unordered-containers
@@ -68337,7 +70082,7 @@ self: {
        pname = "hoodle-types";
        version = "0.3.0";
        sha256 = "0mkx3n1sni43665dk5ify890wdfxamxvkx1h61kzsk3c3bazngr5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers lens mtl strict text uuid
        ];
        description = "Data types for programs for hoodle file format";
@@ -68359,15 +70104,20 @@ self: {
        sha256 = "1gm1sw7d88vzh53myqjzls2sxc3cnk1ni31dcagkj54khh0h7f56";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary blaze-builder bytestring case-insensitive conduit
+         containers deepseq directory filepath haskell-src-exts http-types
+         parsec process QuickCheck random resourcet safe text transformers
+         uniplate unix vector vector-algorithms wai
+       ];
+       executableHaskellDepends = [
          aeson array base binary blaze-builder bytestring Cabal
          case-insensitive cmdargs conduit containers deepseq directory
          filepath haskell-src-exts http-types old-locale parsec process
          QuickCheck random resourcet safe shake tagsoup text time
          transformers uniplate unix vector vector-algorithms wai warp
        ];
-       testDepends = [ base directory filepath process temporary ];
-       testTarget = "--test-option=--no-net";
+       testHaskellDepends = [ base directory filepath process temporary ];
        homepage = "http://www.haskell.org/hoogle/";
        description = "Haskell API Search";
        license = stdenv.lib.licenses.bsd3;
@@ -68384,7 +70134,7 @@ self: {
        sha256 = "12hsajans11csbhiz7d187hx17h7s736g26cvmnahx9lgmgjgada";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory errors filepath hoogle
          optparse-applicative process temporary transformers
        ];
@@ -68399,7 +70149,7 @@ self: {
        pname = "hooks-dir";
        version = "0.1.1.0";
        sha256 = "0gwdqpml8kn8xxxaq628d4way29k2f31f5av49fx7qj150h5qs5b";
-       buildDepends = [ base directory process text ];
+       libraryHaskellDepends = [ base directory process text ];
        homepage = "https://github.com/ibotty/hooks-dir";
        description = "run executables in a directory as hooks";
        license = stdenv.lib.licenses.bsd3;
@@ -68411,7 +70161,7 @@ self: {
        pname = "hoopl";
        version = "3.10.1.0";
        sha256 = "1m62dcgzd17xay2nd87607ryb6hswzhsgr9irzf705h5skgibxks";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://ghc.cs.tufts.edu/hoopl/";
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
@@ -68430,7 +70180,7 @@ self: {
        sha256 = "1g486kj7pwfvdr0a0mpfjxv9hifrkbp7120hxcfyrhx2zjmmc449";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder bytestring configurator directory enumerator
          file-embed filepath HDBC HDBC-sqlite3 mtl network network-info
          network-multicast old-locale old-time process regex-compat
@@ -68451,10 +70201,10 @@ self: {
        pname = "hopencc";
        version = "0.1.0.0";
        sha256 = "1ygldh3r09qzpws28mnmhm3ai7h162gsafdc7nwl2f10kjnpjhyw";
-       buildDepends = [ base bytestring utf8-string ];
-       testDepends = [ base QuickCheck ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ opencc ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
+       libraryPkgconfigDepends = [ opencc ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/MnO2/hopencc";
        description = "Haskell binding to libopencc";
@@ -68470,13 +70220,13 @@ self: {
        pname = "hopencl";
        version = "0.2.1";
        sha256 = "1kdrjr1y5wfq8bb31bkh360pvgb7ryhn9awnqszbq5d4wdwplqk8";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ OpenCL ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ OpenCL ];
        homepage = "https://github.com/merijn/hopencl";
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
@@ -68498,7 +70248,7 @@ self: {
        sha256 = "1qzp1lhbg9v6q7f8yq0abfwak80krmsdih86fpmfc6riiamfin7g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       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
@@ -68506,7 +70256,7 @@ self: {
          optparse-applicative resourcet text time transformers
          unordered-containers wl-pprint-extras yaml
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://floss.scru.org/hopenpgp-tools";
        description = "hOpenPGP-based command-line tools";
        license = "unknown";
@@ -68518,8 +70268,8 @@ self: {
        pname = "hopenssl";
        version = "1.7";
        sha256 = "1zs69kxwz5fnm62mdscbpfz78vwnda75gyx1vxmmlisfhfslprly";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ openssl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ openssl ];
        homepage = "http://github.com/peti/hopenssl";
        description = "FFI bindings to OpenSSL's EVP digest interface";
        license = stdenv.lib.licenses.bsd3;
@@ -68527,8 +70277,8 @@ self: {
 
   "hopfield" = callPackage
     ({ mkDerivation, array, base, deepseq, directory, erf
-     , exact-combinatorics, hmatrix, hspec, HUnit, JuicyPixels
-     , MagickCore, MagickWand, monad-loops, MonadRandom
+     , exact-combinatorics, hmatrix, hspec, HUnit, imagemagick
+     , JuicyPixels, MagickCore, monad-loops, MonadRandom
      , optparse-applicative, parallel, probability, QuickCheck, random
      , random-fu, rvar, split, vector
      }:
@@ -68538,21 +70288,25 @@ self: {
        sha256 = "1cpr3540fdrqr39p6xhb64iz2fz8mzryd19515c55522s7xjk1zw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base deepseq directory erf exact-combinatorics hmatrix
-         JuicyPixels monad-loops MonadRandom optparse-applicative parallel
-         probability QuickCheck random random-fu rvar split vector
+       libraryHaskellDepends = [
+         array base deepseq erf exact-combinatorics hmatrix monad-loops
+         MonadRandom parallel probability QuickCheck random random-fu rvar
+         split vector
        ];
-       testDepends = [
+       librarySystemDepends = [ imagemagick MagickCore ];
+       executableHaskellDepends = [
+         base directory JuicyPixels MonadRandom optparse-applicative random
+         vector
+       ];
+       testHaskellDepends = [
          base erf exact-combinatorics hspec HUnit MonadRandom parallel
          QuickCheck random vector
        ];
-       extraLibraries = [ MagickCore MagickWand ];
        homepage = "https://github.com/imperialhopfield/hopfield";
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { MagickCore = null;  MagickWand = null;};
+     }) { MagickCore = null;  inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
     ({ mkDerivation, base, matrix, MonadRandom, QuickCheck, split
@@ -68564,8 +70318,11 @@ self: {
        sha256 = "1d3jcjk6s7raack7rvm1jzyh2fvaha6xy7k97fmq4cx22fzb48sd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base matrix MonadRandom QuickCheck split vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base matrix MonadRandom split vector ];
+       executableHaskellDepends = [
+         base matrix MonadRandom QuickCheck split vector
+       ];
+       testHaskellDepends = [
          base matrix MonadRandom QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
@@ -68580,8 +70337,8 @@ self: {
        pname = "hopfli";
        version = "0.2.1.0";
        sha256 = "1rx5kvacnzm3qmc0z8n9fhrcrac059akzh9ccq0qswl7w9m4iby3";
-       buildDepends = [ base bytestring zlib ];
-       testDepends = [ base bytestring hspec QuickCheck zlib ];
+       libraryHaskellDepends = [ base bytestring zlib ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
        jailbreak = true;
        homepage = "https://github.com/ananthakumaran/hopfli";
        description = "zlib compatible compression using Zopfli Compression Algorithm";
@@ -68598,10 +70355,10 @@ self: {
        sha256 = "0h9cq1qzai1kbzc77bjlm0dbkrasfj0d21ydrh86kv9jd6gr7gb7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bifunctors bytestring filepath mtl pretty readline void
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://github.com/valis/hoq";
        description = "A language based on homotopy type theory with an interval type";
        license = stdenv.lib.licenses.gpl2;
@@ -68614,7 +70371,7 @@ self: {
        pname = "horizon";
        version = "0.1.1";
        sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4";
-       buildDepends = [ AC-Angle base time ];
+       libraryHaskellDepends = [ AC-Angle base time ];
        jailbreak = true;
        homepage = "https://github.com/intractable/horizon";
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
@@ -68630,11 +70387,11 @@ self: {
        pname = "hosc";
        version = "0.15";
        sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder bytestring data-binary-ieee754 network
          time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -68651,7 +70408,7 @@ self: {
        pname = "hosc-json";
        version = "0.15";
        sha256 = "0sask4nr5njf9grzigldflrbp7460z55fsam1pc3wcnsa575hxhi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring hosc json text
          unordered-containers utf8-string vector
        ];
@@ -68671,7 +70428,7 @@ self: {
        sha256 = "0zk59ig52vqym4n47yl9jgv21gszcwwbc0qc9ff0080allp6ddml";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cgi haskeline hosc hosc-json hsc3 json text
          transformers utf8-string websockets www-minus
        ];
@@ -68688,7 +70445,7 @@ self: {
        pname = "hostname";
        version = "1.0";
        sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A very simple package providing a cross-platform means of determining the hostname";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68699,7 +70456,7 @@ self: {
        pname = "hostname-validate";
        version = "1.0.0";
        sha256 = "0my8g4kqf9mz7ii79ff53rwkx3yv9kkn4jbm60q4b7g1rzhb3bvz";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Validate hostnames e.g. localhost or foo.co.uk.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68714,7 +70471,7 @@ self: {
        sha256 = "1g5kga58c5iqm3svs2d0d2akkibxjnh0hc1jjhjf7dzxghg2paqy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring data-default dns iproute network
        ];
        jailbreak = true;
@@ -68734,7 +70491,7 @@ self: {
        sha256 = "0pnp0xkqk2l29p5kr3kjmxl7hb8g1qd198n36vmfx1x8kc8bahdy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers cpphs filepath haskell-src-exts
          optparse-applicative split
        ];
@@ -68749,7 +70506,7 @@ self: {
        pname = "hotswap";
        version = "0.1.9.13";
        sha256 = "1c614gvwypfqaj4gqsdimqq40i34w393vikq5hhy3d4qll2qp8hv";
-       buildDepends = [ base plugins ];
+       libraryHaskellDepends = [ base plugins ];
        jailbreak = true;
        homepage = "https://github.com/mikeplus64/hotswap";
        description = "Simple code hotswapping";
@@ -68765,8 +70522,8 @@ self: {
        pname = "hourglass";
        version = "0.2.9";
        sha256 = "1xha17nwzxdjizbcp63d2142c6q051y77facs7xribgcl5iz2m4v";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
        ];
        homepage = "https://github.com/vincenthz/hs-hourglass";
@@ -68780,7 +70537,7 @@ self: {
        pname = "hourglass-fuzzy-parsing";
        version = "0.1.0.1";
        sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37";
-       buildDepends = [ base hourglass parsec ];
+       libraryHaskellDepends = [ base hourglass parsec ];
        homepage = "https://gitlab.com/doshitan/hourglass-fuzzy-parsing";
        description = "A small library for parsing more human friendly date/time formats";
        license = stdenv.lib.licenses.bsd3;
@@ -68794,7 +70551,7 @@ self: {
        pname = "hp2any-core";
        version = "0.11.2";
        sha256 = "1gmw9bggw8hsp6pi0xgrryf0sqjb1aaxbwh85q5h72h4ixskwn1y";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers directory filepath network
          old-locale process time
        ];
@@ -68815,11 +70572,12 @@ self: {
        sha256 = "1yj1miqn265pxq2dfhx87s20vjnnxmsl3d9xdy88cbzglpx2v9il";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base hp2any-core OpenGL ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath GLUT hp2any-core
          network OpenGL parseargs process
        ];
-       extraLibraries = [ freeglut mesa ];
+       executableSystemDepends = [ freeglut mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
@@ -68837,7 +70595,7 @@ self: {
        sha256 = "143j3ylvzyq1s2l357vzqrwdcgg6rqhnmv0awb3nvm66c9smaarv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring cairo containers directory filepath glade
          glib gtk gtkglext hp2any-core hp2any-graph OpenGL time
        ];
@@ -68855,7 +70613,7 @@ self: {
        sha256 = "11v0w5406d9lql5jaj2kwrvdgai9y76kbdlwpjnn2wjn36b8hdwa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers filepath ];
+       executableHaskellDepends = [ base containers filepath ];
        description = "A tool for converting GHC heap-profiles to HTML";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68870,7 +70628,7 @@ self: {
        sha256 = "1bma881ljhwhzirj2q9rqf0bxx9xfy0ng2z9mrhdnaywnw4d8v4c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array attoparsec base containers filepath floatshow mtl text
        ];
        homepage = "http://code.mathr.co.uk/hp2pretty";
@@ -68889,11 +70647,15 @@ self: {
        sha256 = "1ghj80w5hx736hkr9z827s4f2fli5r4y0q3ka9ay706k5lj0g9xa";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base-compat deepseq directory filepath Glob text
          unordered-containers yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base base-compat deepseq directory filepath Glob text
+         unordered-containers yaml
+       ];
+       testHaskellDepends = [
          aeson aeson-qq base base-compat deepseq directory filepath Glob
          hspec interpolate mockery text unordered-containers yaml
        ];
@@ -68912,7 +70674,7 @@ self: {
        sha256 = "03h634wwyj4d5ycvn7nmm94qcxwq9vayd7d9l44hqhka1ach4sx9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base cmdargs filepath hpaco-lib strict utf8-string yaml
        ];
        jailbreak = true;
@@ -68930,7 +70692,7 @@ self: {
        pname = "hpaco-lib";
        version = "0.28.0.5";
        sha256 = "1n6lmkip1is6y4x5vivqv30if5di8cy35l6fs2kyg8wjxcqcsyqm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-variant file-embed filepath
          mtl parsec safe split strict transformers
        ];
@@ -68951,7 +70713,7 @@ self: {
        sha256 = "0sl2qh3l5vbijln2al7vmvxm4zhn3qsz8axvprs6jxjfbndmk78j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal cabal-macosx containers directory eprocess
          filepath FindBin haskell-src-exts hint hint-server monad-loops mtl
          process time wx wxcore
@@ -68969,8 +70731,8 @@ self: {
        pname = "hpapi";
        version = "0.0.1.0";
        sha256 = "0n07nr6mm9ssf632h30s6bqxsgvlfzpr39dhdl7vwrfyj2jvdg2s";
-       buildDepends = [ base ];
-       extraLibraries = [ papi ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68991,7 +70753,7 @@ self: {
        sha256 = "1p8dfqm93598zcnz1ksj8px6l8i7kfn9514d68gx7qxvd4xw0fnm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring cgi
          ConfigFile containers css Diff directory download-curl feed
          filepath haskell-src-exts HJScript hlint hscolour mime-mail
@@ -69017,7 +70779,7 @@ self: {
        sha256 = "1jj5q1gpnajnafikwf9jmayvaimi5486fvi90fk8q4b3lg7z9awm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath http-conduit http-types
          lifted-base network optparse-applicative process safe utf8-string
        ];
@@ -69034,7 +70796,9 @@ self: {
        pname = "hpc";
        version = "0.6.0.2";
        sha256 = "1bqa9jmnjqk4jbvx2y90rz717hf2rhzbpmy9xqan97pyrkjz3rlm";
-       buildDepends = [ base containers directory filepath time ];
+       libraryHaskellDepends = [
+         base containers directory filepath time
+       ];
        description = "Code Coverage Library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69050,11 +70814,15 @@ self: {
        sha256 = "0ika073kkm8kivd0m2dhb7ysk5h7q9vsj02xf4azh3c4xpvw4086";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring cmdargs containers curl directory
+         directory-tree hpc process pureMD5 retry safe split
+       ];
+       executableHaskellDepends = [
          aeson async base bytestring cmdargs containers curl directory
          directory-tree hpc process pureMD5 regex-posix retry safe split
        ];
-       testDepends = [ base HUnit ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
@@ -69067,7 +70835,7 @@ self: {
        pname = "hpc-strobe";
        version = "0.1";
        sha256 = "1fgw4pf72684mi7s5pqvfj75s8y004rxf3ww377kyrlw1mb7405c";
-       buildDepends = [ base filepath hpc ];
+       libraryHaskellDepends = [ base filepath hpc ];
        description = "Hpc-generated strobes for a running Haskell program";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69082,7 +70850,7 @@ self: {
        sha256 = "1mahyall1p96nc8z270002cdk8is9ahrd0zn0663w36ic158i3li";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers haskell98 hpc network parsec pretty process
          unix
        ];
@@ -69099,7 +70867,7 @@ self: {
        pname = "hplayground";
        version = "0.1.3.1";
        sha256 = "15yri40046lap05b762k4nk9nly8k6cbypic790zfmhj9ljjq1bv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default haste-compiler haste-perch monads-tf
          transformers
        ];
@@ -69117,7 +70885,7 @@ self: {
        sha256 = "01xkpsb8fjlifdz6fckwfawj1s5c4rs4slizcdr1hpij6mcdcg6y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69134,7 +70902,7 @@ self: {
        sha256 = "0gi94phkqxffxf3sq5al3cmn3zhc9vz6jql4hjsvz5nbhpdjhwda";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile directory filepath HaXml HDBC HDBC-sqlite3 hslogger
          MissingH mtl network old-time parsec process unix
        ];
@@ -69158,13 +70926,18 @@ self: {
        sha256 = "0jmc7m47gidmhnf2dz7hqzlypw1l72n948naccab6j58hkn683kk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default-class exceptions
-         HUnit lifted-base monad-control mtl QuickCheck random resource-pool
-         scientific test-framework test-framework-hunit text time
-         transformers transformers-base unordered-containers vector
+         lifted-base monad-control mtl resource-pool text time transformers
+         transformers-base vector
+       ];
+       librarySystemDepends = [ postgresql ];
+       executableHaskellDepends = [
+         aeson base bytestring exceptions HUnit lifted-base monad-control
+         mtl QuickCheck random scientific test-framework
+         test-framework-hunit text time transformers-base
+         unordered-containers vector
        ];
-       extraLibraries = [ postgresql ];
        homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
@@ -69181,16 +70954,21 @@ self: {
        sha256 = "01848yssmpi0fgkgnlgwmcrmkmpdqc6yc19z91kj46sl187k2k8j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath
          haskell-src-exts mtl parsec protocol-buffers
          protocol-buffers-descriptor utf8-string
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory filepath
+         haskell-src-exts mtl parsec protocol-buffers
+         protocol-buffers-descriptor utf8-string
+       ];
+       executableToolDepends = [ alex ];
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -69205,12 +70983,18 @@ self: {
        sha256 = "1fbpdi4mcc66z3ina01dkqxhy8slcjs4irh03ll2msp6p5vdqw9r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath
          haskell-src-exts mtl parsec protocol-buffers-descriptor-fork
          protocol-buffers-fork utf8-string
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory filepath
+         haskell-src-exts mtl parsec protocol-buffers-descriptor-fork
+         protocol-buffers-fork utf8-string
+       ];
+       executableToolDepends = [ alex ];
        jailbreak = true;
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Parse Google Protocol Buffer specifications";
@@ -69226,7 +71010,10 @@ self: {
        sha256 = "0kmmrjg93rr6cjmg5n821p00qr4m3q46nnyfhql2s2nf20p7kprh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath hcg-minus random ];
+       libraryHaskellDepends = [ base hcg-minus ];
+       executableHaskellDepends = [
+         base directory filepath hcg-minus random
+       ];
        homepage = "http://rd.slavepianos.org/?t=hps";
        description = "Haskell Postscript";
        license = "GPL";
@@ -69240,7 +71027,8 @@ self: {
        sha256 = "1xyk0q6qiqcqd849km86jns4bcfmyrvikg0zw44929wlmlbf0hg7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cairo gtk hps random ];
+       libraryHaskellDepends = [ base cairo gtk hps ];
+       executableHaskellDepends = [ base cairo gtk hps random ];
        jailbreak = true;
        homepage = "http://slavepianos.org/rd/?t=hps-cairo";
        description = "Cairo rendering for the haskell postscript library";
@@ -69254,7 +71042,7 @@ self: {
        pname = "hps-kmeans";
        version = "0.1.0.0";
        sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "http://stathacking.com/hps-kmeans";
        description = "A nice implementation of the k-Means algorithm";
@@ -69267,8 +71055,8 @@ self: {
        pname = "hpuz";
        version = "1.1.2";
        sha256 = "04k9hdbc3ipn9z0qzzpm6xsiv0bkr1v48sfs2haapawd49bw7rhk";
-       buildDepends = [ array base bytestring parsec ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ array base bytestring parsec ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/ccasin/hpuz";
        description = "Haskell bindings for libpuz";
        license = "unknown";
@@ -69281,7 +71069,9 @@ self: {
        pname = "hpygments";
        version = "0.1.3";
        sha256 = "1hb9yslb94ynzlphsp0i4f547zqxblrj49hqy4d7zivdqp38lqla";
-       buildDepends = [ aeson base bytestring process process-extras ];
+       libraryHaskellDepends = [
+         aeson base bytestring process process-extras
+       ];
        jailbreak = true;
        homepage = "https://github.com/davidlazar/hpygments";
        description = "Highlight source code using Pygments";
@@ -69297,7 +71087,9 @@ self: {
        sha256 = "1vdpy9x3bg43zj9rcrnkz0jfsd9mrp4k5y2hn6jb2ar2bvq0iwha";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers EEConfig GLUT OpenGL ];
+       executableHaskellDepends = [
+         array base containers EEConfig GLUT OpenGL
+       ];
        homepage = "http://sourceforge.net/projects/hpylos/";
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
@@ -69312,7 +71104,9 @@ self: {
        sha256 = "00ddyiznx07qkh3s4qjls39x991fqxvdw2bj245ypbxpxsk9fvsw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base lens optparse-applicative parsec text ];
+       executableHaskellDepends = [
+         base lens optparse-applicative parsec text
+       ];
        description = "pyrg utility done right";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69327,11 +71121,11 @@ self: {
        pname = "hquantlib";
        version = "0.0.2.5";
        sha256 = "1n84j2bha8cgv38rl8jxsjiybwws2sc60x8pjmnkn83jpscgcqv0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random
          parallel statistics time vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -69349,8 +71143,8 @@ self: {
        pname = "hquery";
        version = "0.1.1.0";
        sha256 = "0phlbbvkifw65ndjb4nc8ar0xx6z4sqn8xj41bg8qgr31ffpcjf8";
-       buildDepends = [ base containers parsec text xmlhtml ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec text xmlhtml ];
+       testHaskellDepends = [
          base bytestring filepath HUnit parsec test-framework
          test-framework-hunit text xmlhtml
        ];
@@ -69366,7 +71160,7 @@ self: {
        sha256 = "0hg2qjjr5pcnx62382r3d3rqvb3z7h1926lpym68869n4s19wz7d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HCL NonEmpty ];
+       executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69380,7 +71174,7 @@ self: {
        pname = "hreader";
        version = "0.2.0";
        sha256 = "1a0zllljfjpz6fwq2h0l5wwl1wg1v68n6r84fs70vnny0c3wl6hg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions hset mmorph monad-control mtl transformers-base
        ];
        homepage = "https://bitbucket.org/s9gf4ult/hreader";
@@ -69396,7 +71190,7 @@ self: {
        sha256 = "1zhp9w0rki3chb27jbzvwifsgcjxzczn3q7hh7g3d0akfbg1v47f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/Raynes/Hricket";
        description = "A Cricket scoring application";
@@ -69411,12 +71205,14 @@ self: {
        pname = "hruby";
        version = "0.3.1.5";
        sha256 = "1x9j3rc3kk64l8idkar35ap4y5kxh4abfssd2iphp8dqnjld3jxa";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
        ];
-       testDepends = [ aeson attoparsec base QuickCheck text vector ];
-       extraLibraries = [ ruby ];
+       librarySystemDepends = [ ruby ];
+       testHaskellDepends = [
+         aeson attoparsec base QuickCheck text vector
+       ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ruby;};
@@ -69427,8 +71223,8 @@ self: {
        pname = "hs-GeoIP";
        version = "0.3";
        sha256 = "135bl4cjijq6mr485waz7aaxgkaji2fsdjhdy4v4756q6ahzcpwf";
-       buildDepends = [ base bytestring deepseq ];
-       extraLibraries = [ GeoIP ];
+       libraryHaskellDepends = [ base bytestring deepseq ];
+       librarySystemDepends = [ GeoIP ];
        homepage = "http://github.com/ozataman/hs-GeoIP";
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
        license = stdenv.lib.licenses.bsd3;
@@ -69441,7 +71237,7 @@ self: {
        pname = "hs-bibutils";
        version = "5.5";
        sha256 = "0pf5lh179rw9jkmw16ss3kiwydlj6zgfk868mjl5s57kx55z7ycm";
-       buildDepends = [ base syb ];
+       libraryHaskellDepends = [ base syb ];
        homepage = "http://istitutocolli.org/repos/hs-bibutils/";
        description = "Haskell bindings to bibutils, the bibliography conversion utilities";
        license = "GPL";
@@ -69455,17 +71251,17 @@ self: {
        pname = "hs-blake2";
        version = "0.0.2";
        sha256 = "0i0yqci0z5gqmpgb0gk76grcd8mn7xql6gjalm78z6cl84vzsgh4";
-       buildDepends = [ base bytestring ];
-       testDepends = [
-         b2 base bytestring bytestring-arbitrary QuickCheck tasty
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ b2 ];
+       testHaskellDepends = [
+         base bytestring bytestring-arbitrary QuickCheck tasty
          tasty-quickcheck
        ];
-       extraLibraries = [ b2 ];
+       testSystemDepends = [ b2 ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
      }) { b2 = null;};
 
   "hs-captcha" = callPackage
@@ -69474,7 +71270,7 @@ self: {
        pname = "hs-captcha";
        version = "1.0";
        sha256 = "02dd7kli8nm01jxs0p8imqvbdr4yzqizi6bwyyr228p3wscbdsn8";
-       buildDepends = [ base bytestring gd random ];
+       libraryHaskellDepends = [ base bytestring gd random ];
        homepage = "http://www.dankna.com/software/";
        description = "Generate images suitable for use as CAPTCHAs in online web-form security";
        license = stdenv.lib.licenses.bsd3;
@@ -69486,11 +71282,10 @@ self: {
        pname = "hs-carbon";
        version = "0.1.1.0";
        sha256 = "0frip4q5vxvdkc4f8bigpp066i53f4786cj2znyq21h65zndaq53";
-       buildDepends = [ base deepseq mtl parallel random ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base deepseq mtl parallel random ];
+       testHaskellDepends = [ base HUnit ];
        description = "A Haskell framework for parallel monte carlo simulations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-carbon-examples" = callPackage
@@ -69503,7 +71298,7 @@ self: {
        sha256 = "1hcg6z3slzry4lkxnv5bllmlfsr50hcyxmpz3qhsb487j9r76c2z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base deepseq gloss hs-carbon monad-loops mtl tf-random
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
@@ -69519,7 +71314,7 @@ self: {
        pname = "hs-cdb";
        version = "0.1.1";
        sha256 = "07pkz35mmk7qaa9ahfxmj4dddja23ksn7dm1fp8g9v8z8d9r9zl0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-mmap directory filepath mtl
        ];
        homepage = "http://github.com/adamsmasher/hs-cdb";
@@ -69534,8 +71329,8 @@ self: {
        pname = "hs-dotnet";
        version = "0.4.0";
        sha256 = "1l2h1zv63c25k80gljnan3vg2r25a4b7byf5yryj3cjwa9xcg457";
-       buildDepends = [ base ghc-prim ];
-       extraLibraries = [ ole32 oleaut32 ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69549,7 +71344,7 @@ self: {
        pname = "hs-excelx";
        version = "0.6.0.0";
        sha256 = "12hpfad8wn4r811md6269w10inx6nbipryhn8vdhbbcj9mmda3l5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl text time xml-conduit zip-archive
        ];
        jailbreak = true;
@@ -69563,7 +71358,7 @@ self: {
        pname = "hs-ffmpeg";
        version = "0.3.4";
        sha256 = "0j52drd3pb6ssgngfqxdsvvjjnx11nsmxwjsin6cmbv0nifpyq51";
-       buildDepends = [ base bytestring haskell98 ];
+       libraryHaskellDepends = [ base bytestring haskell98 ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/VasylPasternak/hs-ffmpeg";
        description = "Bindings to FFMPEG library";
@@ -69577,8 +71372,8 @@ self: {
        pname = "hs-fltk";
        version = "0.2.5";
        sha256 = "0nbxfy219mz0k27d16r3ir7hk0j450gxba9wrvrz1j17mr3gvqzx";
-       buildDepends = [ base ];
-       extraLibraries = [ fltk fltk_images ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ fltk fltk_images ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/";
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
@@ -69591,7 +71386,7 @@ self: {
        pname = "hs-gchart";
        version = "0.4.1";
        sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://github.com/deepakjois/hs-gchart";
        description = "Haskell wrapper for the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
@@ -69608,13 +71403,12 @@ self: {
        sha256 = "1mvzpn7zpk5ffyyqh214yd315dcis8zmm9p4m5099bqhfr735kws";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers filepath haskell-names haskell-packages
          haskell-src-exts hse-cpp mtl tagged
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -69625,7 +71419,7 @@ self: {
        pname = "hs-gizapp";
        version = "0.1.0.3";
        sha256 = "1j7ws3jm52n910p08432k60w09971bpcz4j5w48a305nz1dbkscm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath parsec process
        ];
        jailbreak = true;
@@ -69639,8 +71433,8 @@ self: {
        pname = "hs-inspector";
        version = "0.5.2.0";
        sha256 = "0w9ijl56v0gnx6arz0vvrg740kkhw0vqgkzdvmgf22z9vn99fny8";
-       buildDepends = [ base haskell-src ];
-       testDepends = [ base haskell-src hspec ];
+       libraryHaskellDepends = [ base haskell-src ];
+       testHaskellDepends = [ base haskell-src hspec ];
        description = "Haskell source code analyzer";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69655,7 +71449,7 @@ self: {
        pname = "hs-java";
        version = "0.3.4";
        sha256 = "1qv6zwp9fws9s6502d9afwwbsh025xfpw4vsq8wgh2i0gvlskzq7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary binary-state bytestring containers
          control-monad-exception data-binary-ieee754 data-default directory
          filepath Glob LibZip MissingH mtl parsec utf8-string
@@ -69671,7 +71465,9 @@ self: {
        pname = "hs-json-rpc";
        version = "0.0.0.1";
        sha256 = "0qlzylkplcb0bvh7pd8mwmc0pg69jjh8229a1hg3rhaix08mmj3c";
-       buildDepends = [ aeson base bytestring HTTP network text ];
+       libraryHaskellDepends = [
+         aeson base bytestring HTTP network text
+       ];
        homepage = "http://patch-tag.com/r/Azel/hs-json-rpc";
        description = "JSON-RPC client library";
        license = stdenv.lib.licenses.bsd3;
@@ -69690,11 +71486,11 @@ self: {
        sha256 = "0ypr4jpc12f771g3gsahbj0yjzd0ns8mmwjl90knwg267d712i13";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs colour containers diagrams-core diagrams-lib
          diagrams-svg mtl parsec parsec-numbers random
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs colour containers diagrams-core diagrams-lib
          diagrams-svg HUnit mtl parsec parsec-numbers QuickCheck random
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -69717,12 +71513,16 @@ self: {
        sha256 = "1d9mf35i5nwpnr5l5v75rrcwihfkpfy3ji9jwhk9k0g285bfr5dh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring lens managed template-haskell ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring lens managed template-haskell
+       ];
+       librarySystemDepends = [ mesos protobuf ];
+       executableHaskellDepends = [ base bytestring lens ];
+       executableSystemDepends = [ mesos ];
+       testHaskellDepends = [
          base bytestring lens managed QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
-       extraLibraries = [ mesos protobuf ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) mesos;  inherit (pkgs) protobuf;};
@@ -69735,7 +71535,7 @@ self: {
        sha256 = "1bk278ni5bk8qcc8mbb7h26g9k5hcdl4h1ilrh8prc0kvngz8g4w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HandsomeSoup hxt random ];
+       executableHaskellDepends = [ base HandsomeSoup hxt random ];
        jailbreak = true;
        description = "Name generator";
        license = stdenv.lib.licenses.mit;
@@ -69752,7 +71552,8 @@ self: {
        sha256 = "064sk0g8mzkqm80hfxg03qn6g1awydlw15ylikk3rs4wf7fclw30";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ array base MonadPrompt mtl random ];
+       executableHaskellDepends = [
          array base directory glib gtk MonadPrompt mtl random
        ];
        description = "Programmer's Mine Sweeper in Haskell";
@@ -69766,7 +71567,7 @@ self: {
        pname = "hs-php-session";
        version = "0.0.9.3";
        sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/elblake/hs-php-session";
        description = "PHP session and values serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -69777,10 +71578,10 @@ self: {
      mkDerivation {
        pname = "hs-pkg-config";
        version = "0.2.1.0";
-       revision = "1";
        sha256 = "09v2kp643asl3zpv8rbb8a7zv0h3bn5l4gxz44d71kly9qr3jkhh";
+       revision = "1";
        editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784";
-       buildDepends = [ base data-default-class text ];
+       libraryHaskellDepends = [ base data-default-class text ];
        homepage = "https://github.com/trskop/hs-pkg-config";
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
@@ -69796,7 +71597,7 @@ self: {
        pname = "hs-pkpass";
        version = "0.4";
        sha256 = "01jcl2ia8p29gg5yazpxm6cdxyskl6z895lmgh888qkf9jlzf5mf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit directory
          filesystem-conduit old-locale random shakespeare-text shelly
          system-filepath text time transformers unordered-containers uuid
@@ -69815,7 +71616,7 @@ self: {
        pname = "hs-re";
        version = "0.1.0";
        sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb";
-       buildDepends = [ array base regex-base regex-posix ];
+       libraryHaskellDepends = [ array base regex-base regex-posix ];
        jailbreak = true;
        description = "Easy to use Regex";
        license = stdenv.lib.licenses.mit;
@@ -69830,11 +71631,11 @@ self: {
        pname = "hs-scrape";
        version = "0.1.0.0";
        sha256 = "0w5zrd7xj3ccw4xkdsq20j1ki2j8sy3glzijsq5m2227szwv7y6v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default exceptions hspec
          html-conduit lens retry safe text transformers url wreq xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec tasty tasty-hunit xml-conduit
        ];
        jailbreak = true;
@@ -69851,7 +71652,7 @@ self: {
        pname = "hs-twitter";
        version = "0.2.8";
        sha256 = "1r8bd5q7d5mxmd6012mpp1yx353wzib174xd9v0mvkbb009b4mph";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HTTP json mime network old-locale old-time random utf8-string
        ];
        description = "Haskell binding to the Twitter API";
@@ -69867,7 +71668,7 @@ self: {
        sha256 = "077mc8dn2f6x3s29pm80qi7mj6s2crdhky0vygzfqd8v23gmhqcg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HTTP json mtl network pretty ];
+       executableHaskellDepends = [ base HTTP json mtl network pretty ];
        homepage = "https://github.com/deepakjois/hs-twitterarchiver";
        description = "Commandline Twitter feed archiver";
        license = "GPL";
@@ -69880,7 +71681,7 @@ self: {
        pname = "hs-vcard";
        version = "0.1";
        sha256 = "0qb7gsbki3ciqddxp9j46rnx64vv622n2p9vidv1b000wbmmrz15";
-       buildDepends = [ base old-locale time ];
+       libraryHaskellDepends = [ base old-locale time ];
        homepage = "http://qrcard.us/";
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
@@ -69897,8 +71698,9 @@ self: {
        sha256 = "1hm9lwhq1b8i04gl3z2iw6g67slrjcrymp2fxxvykxgkff6dmkps";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base random ];
-       testDepends = [
+       libraryHaskellDepends = [ base random ];
+       executableHaskellDepends = [ base random ];
+       testHaskellDepends = [
          base doctest Glob hlint hspec HUnit process QuickCheck random
          regex-compat
        ];
@@ -69918,7 +71720,7 @@ self: {
        sha256 = "1lx0px0gicwry5i4rwgzz6jasjhp24f620w2iby9xpbvn6h3zflm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath haskell-src mtl
        ];
        homepage = "http://www.xanxys.net/hs2bf/";
@@ -69937,7 +71739,7 @@ self: {
        sha256 = "0pfbclqpndlnxnvs630q8x272q13z9dfp35gp9dj6m527x78fapx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory haskell-src haskell-src-exts haskell98 split
        ];
        jailbreak = true;
@@ -69952,10 +71754,10 @@ self: {
      mkDerivation {
        pname = "hsConfigure";
        version = "0.1.0.2";
-       revision = "2";
        sha256 = "199sza2jh3d5046yyb141b0jwh1m1p68hv4x3b5xz6vw9dzfbw3c";
+       revision = "2";
        editedCabalFile = "ab3264ebf799e07e40fd913b9061197b346a7d84145908566155231e62a45c02";
-       buildDepends = [ base directory filepath process unix ];
+       libraryHaskellDepends = [ base directory filepath process unix ];
        homepage = "http://github.com/YoshikuniJujo/hsConfigure/wiki";
        description = "By using this package, you can make application configurable";
        license = "LGPL";
@@ -69969,7 +71771,7 @@ self: {
        pname = "hsSqlite3";
        version = "0.1";
        sha256 = "0wmsswccwcz2zd3zap0wsapzbya72cxdyzhlcch4akvwqcl9hz6a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-sqlite3 bytestring mtl utf8-string
        ];
        jailbreak = true;
@@ -69984,8 +71786,8 @@ self: {
        pname = "hsXenCtrl";
        version = "0.2.0";
        sha256 = "0zxmlyckp9c0i5s8vi62d3qvnilh8kl093ckqr7dchgmki4az7rp";
-       buildDepends = [ array base bytestring dlist mtl ];
-       extraLibraries = [ xenctrl ];
+       libraryHaskellDepends = [ array base bytestring dlist mtl ];
+       librarySystemDepends = [ xenctrl ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/HsXenCtrl";
        description = "FFI bindings to the Xen Control library";
@@ -70002,17 +71804,16 @@ self: {
        pname = "hsass";
        version = "0.3.0";
        sha256 = "15x5f8zcikg1bh10sk5b2gqjfldgp4jdgwhl2k20i6h8mxjkpmdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class filepath hlibsass monad-loops
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring data-default-class hspec hspec-discover temporary
        ];
        homepage = "https://github.com/jakubfijalkowski/hsass";
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsay" = callPackage
@@ -70023,7 +71824,7 @@ self: {
        sha256 = "0qar7y4190dfv63jmzx8saxqxzh73spc2q3i6pqywdbv7zb6zvrl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Hclip HTTP process unix ];
+       executableHaskellDepends = [ base Hclip HTTP process unix ];
        jailbreak = true;
        description = "(ab)Use Google Translate as a speech synthesiser";
        license = stdenv.lib.licenses.gpl3;
@@ -70039,7 +71840,7 @@ self: {
        sha256 = "1n7rj2q87j544d82alxhrsqhz4ix8qpwxpw3l2np7wjl0n101n4a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath preprocessor-tools
        ];
        description = "Preprocesses a file, adding blobs from files as string literals";
@@ -70056,7 +71857,7 @@ self: {
        sha256 = "1g1lb43f7cdm5fjmdd64n9vl2nxlm8jpng94hyyldwv8a6x7555z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs directory filepath hashed-storage
          old-locale strict time
        ];
@@ -70075,11 +71876,11 @@ self: {
        pname = "hsbencher";
        version = "1.20.0.5";
        sha256 = "1fqp0n106dnqik3p6fa60xkamls8wgg8c5sp2klgp36n3xflvy9h";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers data-default directory filepath
          GenericPretty io-streams mtl process random time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory HUnit test-framework
          test-framework-hunit text time
        ];
@@ -70096,7 +71897,7 @@ self: {
        pname = "hsbencher-codespeed";
        version = "0.1.0.1";
        sha256 = "1a3hac73mzd0q25b1xbdh121k33m12phpxfn6hh7qcg5yys2i8l5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default directory filepath
          hsbencher HTTP http-conduit http-types json mtl network resourcet
          time
@@ -70116,10 +71917,13 @@ self: {
        sha256 = "0xp2jm5zvrx5sz2mniachd7hjmhmf0sv9as3dzln8693n6l1ak4r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers criterion csv data-default directory
-         filepath handa-gdata hsbencher http-conduit mtl network split
-         statistics text time
+       libraryHaskellDepends = [
+         base bytestring containers data-default directory filepath
+         handa-gdata hsbencher http-conduit mtl network time
+       ];
+       executableHaskellDepends = [
+         base bytestring containers criterion csv handa-gdata hsbencher mtl
+         split statistics text
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
        license = stdenv.lib.licenses.bsd3;
@@ -70133,7 +71937,7 @@ self: {
        sha256 = "0kfvpsapgslxywpmqba5vcx79xmbj87dwg8fjjjk517x28wisivz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory process ];
+       executableHaskellDepends = [ base containers directory process ];
        jailbreak = true;
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
@@ -70149,7 +71953,7 @@ self: {
        pname = "hsc3";
        version = "0.15.1";
        sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-default data-ordlist
          directory filepath hashable hosc network process random safe split
          transformers
@@ -70166,7 +71970,9 @@ self: {
        pname = "hsc3-auditor";
        version = "0.15";
        sha256 = "02p4y06p08mizdrbvl52364szksrwnx28s992prw8b2ilav11563";
-       buildDepends = [ base filepath hmt hosc hsc3 hsc3-sf-hsndfile ];
+       libraryHaskellDepends = [
+         base filepath hmt hosc hsc3 hsc3-sf-hsndfile
+       ];
        homepage = "http://rd.slavepianos.org/t/hsc3-auditor";
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
@@ -70178,7 +71984,7 @@ self: {
        pname = "hsc3-cairo";
        version = "0.14";
        sha256 = "1f62mfjssky7igbp1nx2zf1azbih76m65xydnf5akp8pim7nzmis";
-       buildDepends = [ base cairo gtk hosc hsc3 split ];
+       libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsc3-cairo";
        description = "haskell supercollider cairo drawing";
@@ -70194,7 +72000,7 @@ self: {
        pname = "hsc3-data";
        version = "0.15";
        sha256 = "0321rnajfiwldwwpns78im842hypykc1js7flnasld7al6m7487d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors Glob hcg-minus hmt hsc3-lang hsc3-plot
          hsc3-sf-hsndfile safe split SVGPath xml
        ];
@@ -70210,7 +72016,7 @@ self: {
        pname = "hsc3-db";
        version = "0.15";
        sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl";
-       buildDepends = [ base hsc3 safe ];
+       libraryHaskellDepends = [ base hsc3 safe ];
        homepage = "http://rd.slavepianos.org/t/hsc3-db";
        description = "Haskell SuperCollider Unit Generator Database";
        license = "GPL";
@@ -70222,7 +72028,7 @@ self: {
        pname = "hsc3-dot";
        version = "0.15";
        sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m";
-       buildDepends = [ base directory filepath hsc3 process ];
+       libraryHaskellDepends = [ base directory filepath hsc3 process ];
        homepage = "http://rd.slavepianos.org/t/hsc3-dot";
        description = "haskell supercollider graph drawing";
        license = "GPL";
@@ -70238,7 +72044,7 @@ self: {
        sha256 = "0b3q6w1r12wv1fl05armkrprlkx2s7n08mimkxxndsd9kl6zl8lw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath hashable hosc hsc3 hsc3-db
          hsc3-dot mtl unix
        ];
@@ -70261,11 +72067,17 @@ self: {
        sha256 = "1d59gl0shwkwi9581j7x7yy1j63acns9ccpwin4y5lwk0k5x6s38";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cairo containers data-default
-         directory filepath hashable hls hmt hosc hps hsc3 hsc3-cairo
-         hsc3-lang hsc3-sf hsc3-unsafe hsc3-utils hsharc MonadRandom primes
-         process random random-shuffle sc3-rdu she split
+         directory filepath hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang
+         hsc3-sf hsc3-unsafe hsc3-utils hsharc MonadRandom primes random
+         random-shuffle sc3-rdu she split
+       ];
+       executableHaskellDepends = [
+         array base binary bytestring cairo containers directory filepath
+         hashable hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang hsc3-sf
+         hsc3-unsafe hsharc MonadRandom primes process random random-shuffle
+         sc3-rdu split
        ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/t/hsc3-graphs";
@@ -70284,7 +72096,7 @@ self: {
        pname = "hsc3-lang";
        version = "0.15";
        sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bifunctors bytestring containers data-default
          data-ordlist dlist hashable hmatrix-special hosc hsc3 MonadRandom
          random random-shuffle split transformers vector
@@ -70305,7 +72117,7 @@ self: {
        sha256 = "1k45ipivvlfymvh6rzxsv1kfvd11spsn3skmsswg2vd76bcgh20x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath hashable hosc hsc3 hsc3-dot
          husk-scheme mtl safe unix
        ];
@@ -70323,7 +72135,7 @@ self: {
        pname = "hsc3-plot";
        version = "0.15";
        sha256 = "1v5n4k54qp8ifwka2bhrq9w1kfzd3ldzhqyhvkcgl0z46xcf7lk3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath hosc hsc3 hsc3-lang process split
          statistics vector
        ];
@@ -70344,10 +72156,11 @@ self: {
        sha256 = "1h769akpd5gsmmlzmhya3dh56rhpf4fkj0vl6zngahc5hl4s7qxc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default directory filepath hosc
          hsc3 process time time-compat transformers
        ];
+       executableHaskellDepends = [ base data-default hosc hsc3 ];
        homepage = "https://github.com/kaoskorobase/hsc3-process";
        description = "Create and control scsynth processes";
        license = "GPL";
@@ -70359,7 +72172,7 @@ self: {
        pname = "hsc3-rec";
        version = "0.14.1";
        sha256 = "0m814vr41i0mm0c001vbih9i93048niljv3z8czaz32wysa8xpfl";
-       buildDepends = [ base hsc3 ];
+       libraryHaskellDepends = [ base hsc3 ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsc3-rec";
        description = "Haskell SuperCollider Record Variants";
@@ -70375,7 +72188,7 @@ self: {
        pname = "hsc3-rw";
        version = "0.15";
        sha256 = "1jcnw0a1nf4wwf5bz61bkpwd3jfgccfxmcqq06vy43pc98223z8p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory haskell-src-exts parsec polyparse split syb
          transformers
        ];
@@ -70397,12 +72210,15 @@ self: {
        sha256 = "00lw0mj76i2fqhx81d258mqdwqxy8313574i2i8vrjn0mn4bbg2p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitset bytestring containers data-default failure hashtables
-         hosc hsc3 hsc3-process lifted-base ListZipper monad-control random
-         resourcet transformers transformers-base unix
+         hosc hsc3 hsc3-process lifted-base ListZipper monad-control
+         resourcet transformers transformers-base
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base hosc hsc3 random transformers unix
+       ];
+       testHaskellDepends = [
          base failure QuickCheck random test-framework
          test-framework-quickcheck2 transformers
        ];
@@ -70418,7 +72234,7 @@ self: {
        pname = "hsc3-sf";
        version = "0.15";
        sha256 = "1dg3gqhvi2rshfqnw7i89bd4bvqjvbk4f9g17x18swyrvgkz9wr7";
-       buildDepends = [ base bytestring hosc ];
+       libraryHaskellDepends = [ base bytestring hosc ];
        homepage = "http://rd.slavepianos.org/t/hsc3-sf";
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
@@ -70432,7 +72248,7 @@ self: {
        pname = "hsc3-sf-hsndfile";
        version = "0.15";
        sha256 = "11ksss2g8a7lqpjqvdwj4j9y3kdc8algc9mhlyjmj38mgg4raa2i";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base hsc3-sf hsndfile hsndfile-vector vector
        ];
        homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile";
@@ -70446,7 +72262,7 @@ self: {
        pname = "hsc3-unsafe";
        version = "0.14";
        sha256 = "0kywqx7x10hqzhq8by0f62aznrnq4y3013cxkccx1r0naajpz3yj";
-       buildDepends = [ base hsc3 ];
+       libraryHaskellDepends = [ base hsc3 ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe";
        description = "Unsafe Haskell SuperCollider";
@@ -70464,9 +72280,11 @@ self: {
        sha256 = "1pvg2z6n2r7jhwgwx9rv4q94jdj2ql3kgjh4smjq4xafnzzlyrix";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base directory filepath hashable hosc hsc3 hsc3-dot hsc3-rw hsc3-sf
-         process
+       libraryHaskellDepends = [
+         base directory filepath hashable hosc hsc3 hsc3-sf
+       ];
+       executableHaskellDepends = [
+         base filepath hsc3 hsc3-dot hsc3-rw process
        ];
        homepage = "http://rd.slavepianos.org/t/hsc3-utils";
        description = "Haskell SuperCollider Utilities";
@@ -70481,8 +72299,8 @@ self: {
        pname = "hscamwire";
        version = "0.2.1";
        sha256 = "0alnwc170hd2dyq718nvfq5dsbnyp29j3z49w2w5k59pi9pnqybc";
-       buildDepends = [ array base time unix ];
-       extraLibraries = [ camwire_1394 dc1394_control raw1394 ];
+       libraryHaskellDepends = [ array base time unix ];
+       librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ];
        jailbreak = true;
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
@@ -70498,7 +72316,7 @@ self: {
        pname = "hscassandra";
        version = "0.0.7";
        sha256 = "06jr17karspq3qpan9iqh0zk2w3b2d7ghdvl8wd4hjz73yacw6f4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cassandra-thrift containers mtl network old-time
          Thrift
        ];
@@ -70516,7 +72334,8 @@ self: {
        sha256 = "1wjf3gba1gfbd54d0r4xpkfq7lyvyamhfw21wnsnqsl4hvp335jr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring ghc-prim HTTP ];
+       libraryHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
+       executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        jailbreak = true;
        homepage = "https://bitbucket.org/sebasmagri/hscd";
        description = "Command line client and library for SoundCloud.com";
@@ -70531,7 +72350,7 @@ self: {
        sha256 = "0g853fq9vv33nga05rhls6hk5h4gaby8mws0i8yq2iday6j576nf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo glib gtk old-time ];
+       executableHaskellDepends = [ base cairo glib gtk old-time ];
        homepage = "http://haskell.org/gtk2hs/archives/2006/01/26/cairo-eye-candy/";
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
@@ -70546,7 +72365,8 @@ self: {
        sha256 = "1c4i2zpami8g3w9949nm3f92g7xwh5c94vkx658zz7ihrjp7w5lp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
        description = "Colourise Haskell code";
        license = "GPL";
@@ -70563,11 +72383,13 @@ self: {
        sha256 = "1m5mp45pvf64pnpc3lsig382177vfc232bbm9g3a8q58jrwridy7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cereal cpphs deepseq directory haskell-src-exts mtl
          process pure-cdb uniplate vector
        ];
-       testDepends = [ base directory mtl process test-simple Unixutils ];
+       testHaskellDepends = [
+         base directory mtl process test-simple Unixutils
+       ];
        jailbreak = true;
        homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
@@ -70584,13 +72406,12 @@ self: {
        sha256 = "1az51cv6wqjdkw0fqgi5s75rmfka3sly85022rhvk44w1vd45iii";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory process regex-compat time time-locale-compat
        ];
        homepage = "http://hub.darcs.net/dino/hscrtmpl";
        description = "Haskell shell script template";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscuid" = callPackage
@@ -70601,10 +72422,10 @@ self: {
        pname = "hscuid";
        version = "1.2.0.0";
        sha256 = "01dmxckv9rlgb87ms5xbysw2cc7prmfww8g2n98ncgnc0lh3pc5l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base formatting hostname random text time transformers unix
        ];
-       testDepends = [ base containers ];
+       testHaskellDepends = [ base containers ];
        homepage = "https://github.com/eightyeight/hscuid";
        description = "Collision-resistant IDs";
        license = stdenv.lib.licenses.bsd3;
@@ -70617,11 +72438,12 @@ self: {
        pname = "hscurses";
        version = "1.4.2.0";
        sha256 = "0msf80475l3ncpnb1lcpnyscl1svmqg074ylb942rx7dbvck71bj";
-       buildDepends = [ base exceptions mtl old-locale old-time unix ];
+       libraryHaskellDepends = [
+         base exceptions mtl old-locale old-time unix
+       ];
        homepage = "https://github.com/skogsbaer/hscurses";
        description = "NCurses bindings for Haskell";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscurses-fish-ex" = callPackage
@@ -70632,7 +72454,7 @@ self: {
        sha256 = "1s7b2v3cl0nl2b55agn5wkvxn30f2bgp6mznkn33148vlbya1mzs";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hscurses random safe unix ];
+       executableHaskellDepends = [ base hscurses random safe unix ];
        homepage = "http://ui3.info/darcs/hscurses-fish-ex/";
        description = "hscurses swimming fish example";
        license = stdenv.lib.licenses.bsd3;
@@ -70656,7 +72478,7 @@ self: {
        sha256 = "180xrxamas2fg2366k3cpy7al8mq82d1hgjrs7i1r2s3gr877xz8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base bin-package-db bytestring
          Cabal containers deepseq directory exceptions filepath fsnotify ghc
          ghc-mod ghc-paths haddock-api haskell-src-exts hdocs hlint HTTP
@@ -70666,7 +72488,12 @@ self: {
          transformers transformers-base uniplate unix unordered-containers
          vector
        ];
-       testDepends = [ base ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring containers deepseq directory
+         exceptions filepath ghc haskell-src-exts lens monad-loops mtl
+         network process text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
@@ -70679,7 +72506,7 @@ self: {
        pname = "hsdif";
        version = "0.14";
        sha256 = "1wxms6z8mpyf4l1qqxi6gvscls3mwlj5aq6g3ldashzrmb7pcimm";
-       buildDepends = [ base bytestring hosc ];
+       libraryHaskellDepends = [ base bytestring hosc ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsdif";
        description = "Haskell SDIF";
@@ -70694,7 +72521,7 @@ self: {
        sha256 = "0hqwpcf2bcrj36wg02mxd2zdg07dqh4b5mv9yn295xp64snrdw84";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cairo containers HUnit parsec ];
+       libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        homepage = "http://neugierig.org/software/darcs/hsdip/";
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
@@ -70707,8 +72534,8 @@ self: {
        pname = "hsdns";
        version = "1.6.1";
        sha256 = "0s63acjy1n75k7gjm4kam7v5d4a5kn0aw178mygkqwr5frflghb4";
-       buildDepends = [ base containers network ];
-       extraLibraries = [ adns ];
+       libraryHaskellDepends = [ base containers network ];
+       librarySystemDepends = [ adns ];
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.gpl3;
@@ -70722,7 +72549,7 @@ self: {
        pname = "hsdns-cache";
        version = "1.0.4";
        sha256 = "1f0822kly602izwzxfi46w668k0jybn3khfacnxmc1744jpqr89i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hsdns network SafeSemaphore text time unordered-containers
        ];
        homepage = "https://github.com/bazqux/hsdns-cache";
@@ -70737,7 +72564,7 @@ self: {
        pname = "hse-cpp";
        version = "0.1";
        sha256 = "0f1bgi1hnpnry1pm7jhi626afdvymzy7k0a70n07n41js46pjxd0";
-       buildDepends = [ base cpphs haskell-src-exts ];
+       libraryHaskellDepends = [ base cpphs haskell-src-exts ];
        description = "Preprocess+parse haskell code";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -70750,7 +72577,7 @@ self: {
        pname = "hsebaysdk";
        version = "0.3.0.0";
        sha256 = "1bmkka53dxaizbiazici0i60qrqq2zbff95xqxlfp11v3cclcffg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-client http-types text time transformers
          unordered-containers
        ];
@@ -70765,8 +72592,8 @@ self: {
        pname = "hsemail";
        version = "1.7.7";
        sha256 = "16wqrpzi5njv26za1rckn74jsqmyswndb6k38yz1567h1y4w7ai5";
-       buildDepends = [ base mtl old-time parsec ];
-       testDepends = [ base doctest hspec old-time parsec ];
+       libraryHaskellDepends = [ base mtl old-time parsec ];
+       testHaskellDepends = [ base doctest hspec old-time parsec ];
        homepage = "http://github.com/peti/hsemail";
        description = "Internet Message Parsers";
        license = stdenv.lib.licenses.bsd3;
@@ -70778,7 +72605,7 @@ self: {
        pname = "hsemail-ns";
        version = "1.3.2";
        sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s";
-       buildDepends = [ base mtl old-time parsec ];
+       libraryHaskellDepends = [ base mtl old-time parsec ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/hsemail-ns/home";
        description = "Internet Message Parsers";
@@ -70796,7 +72623,7 @@ self: {
        sha256 = "1kjj9p8x6369g9ah9h86xlyvcm4jkahvlz2pvj1m73javbgyyf03";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal directory file-embed filepath http-streams
          io-streams mtl process safe split unix
        ];
@@ -70814,7 +72641,7 @@ self: {
        sha256 = "1dvnkd3nwgdz9hq8zafvmn75hczsiflbf05j10nmrj8imhyh70j3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cmdargs wai-app-static warp ];
+       executableHaskellDepends = [ base cmdargs wai-app-static warp ];
        homepage = "http://github.com/rejuvyesh/hserv";
        description = "Simple http server in haskell";
        license = stdenv.lib.licenses.mit;
@@ -70826,8 +72653,8 @@ self: {
        pname = "hset";
        version = "1.1.0";
        sha256 = "15ls3wkk29mf2nyrm80dcmg66q0dd0srgwyv46ix3zkaxs239mbl";
-       buildDepends = [ base mtl ];
-       testDepends = [ base HUnit mtl ];
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base HUnit mtl ];
        homepage = "https://bitbucket.org/s9gf4ult/hset";
        description = "Primitive heterogenous read-only set";
        license = stdenv.lib.licenses.bsd3;
@@ -70841,16 +72668,15 @@ self: {
        pname = "hsexif";
        version = "0.6.0.4";
        sha256 = "0k9a6d6c2n0x5g6vls4848gydnvw790lf1nyy5piz1rdzsd6bx3k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers iconv text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring containers hspec HUnit iconv text time
        ];
        homepage = "https://github.com/emmanueltouzery/hsexif";
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsfacter" = callPackage
@@ -70859,7 +72685,7 @@ self: {
        pname = "hsfacter";
        version = "0.2.1";
        sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q";
-       buildDepends = [ base containers language-puppet text ];
+       libraryHaskellDepends = [ base containers language-puppet text ];
        homepage = "http://lpuppet.banquise.net";
        description = "A small and ugly library that emulates the output of the puppet facter program";
        license = stdenv.lib.licenses.gpl3;
@@ -70874,7 +72700,9 @@ self: {
        sha256 = "1fc1fk33wslfkpb83c3ax251h60d5zn2qiqyw81v19wd5r2a6kqc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hdaemonize hslogger network process ];
+       executableHaskellDepends = [
+         base hdaemonize hslogger network process
+       ];
        jailbreak = true;
        homepage = "https://github.com/Yuras/hsfcsh";
        description = "Incremental builder for flash";
@@ -70889,7 +72717,7 @@ self: {
        sha256 = "063k5f64734wvrl45nrp1yvh3bf51w3dzzf3jj4fmj1gjp07zy48";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghc ];
+       executableHaskellDepends = [ base ghc ];
        jailbreak = true;
        description = "Z-decoder";
        license = stdenv.lib.licenses.mit;
@@ -70901,8 +72729,8 @@ self: {
        pname = "hsgnutls";
        version = "0.2.3.2";
        sha256 = "1nd3z8kb4qjaj0hic9b305c15a7g6sfx6dixz8pspvqg1x84cjnm";
-       buildDepends = [ base bytestring mtl old-time ];
-       extraLibraries = [ gcrypt gnutls ];
+       libraryHaskellDepends = [ base bytestring mtl old-time ];
+       librarySystemDepends = [ gcrypt gnutls ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
@@ -70915,8 +72743,8 @@ self: {
        pname = "hsgnutls-yj";
        version = "0.2.3.3";
        sha256 = "05dn7kvjxk2pnzv040hyw71nvr83jvdvajq4a9v76kcyjhhwiv0w";
-       buildDepends = [ base bytestring mtl old-time ];
-       extraLibraries = [ gcrypt gnutls ];
+       libraryHaskellDepends = [ base bytestring mtl old-time ];
+       librarySystemDepends = [ gcrypt gnutls ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
@@ -70929,7 +72757,7 @@ self: {
        pname = "hsgsom";
        version = "0.2.0";
        sha256 = "1043lavrimaxmscayg4knx7ly0yc0gsb729pg72g897hc455r2dn";
-       buildDepends = [ base containers random stm time ];
+       libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70945,7 +72773,7 @@ self: {
        sha256 = "0rsi54zhznqdycjkbkdblbfcx7lbvwdwvw0zlxqspyiz2px6lqc6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base containers directory haskeline mtl
        ];
        homepage = "http://www.mlesniak.com/haskell/gettings-things-done-in-haskell/";
@@ -70959,7 +72787,7 @@ self: {
        pname = "hsharc";
        version = "0.14";
        sha256 = "1mzi074iiz48pcy6rvgqz6ckm0zx115kmvax60bx9bfcanw686vf";
-       buildDepends = [ base xml ];
+       libraryHaskellDepends = [ base xml ];
        homepage = "http://rd.slavepianos.org/?t=hsharc";
        description = "Haskell SHARC bindings";
        license = "GPL";
@@ -70974,12 +72802,12 @@ self: {
        pname = "hsignal";
        version = "0.2.7.1";
        sha256 = "1dzga1cgxrk7i65zrmpg22521islp4xzfc95ph7kla2acxzr6q0x";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats
          hstatistics mtl storable-complex
        ];
-       extraLibraries = [ blas lapack ];
-       pkgconfigDepends = [ gsl ];
+       librarySystemDepends = [ blas lapack ];
+       libraryPkgconfigDepends = [ gsl ];
        homepage = "http://code.haskell.org/hsignal";
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
@@ -70994,7 +72822,7 @@ self: {
        sha256 = "001wwlwxd3qb3mcpn0l5qmd7nvpy8qlrcr5j3s5111pgfi8ib0sn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskeline ];
+       executableHaskellDepends = [ base haskeline ];
        homepage = "https://github.com/Rnhmjoj/hsilop";
        description = "RPN calculator";
        license = stdenv.lib.licenses.mit;
@@ -71011,11 +72839,12 @@ self: {
        sha256 = "10h19rdzqskjvaax30znqpvx765x0lj58wp1zgf8dv6mgvaz77zy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base cmdargs directory dyre haskell-src-exts lens mtl
          split text
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base filepath haskell-src-exts tasty tasty-golden
        ];
        jailbreak = true;
@@ -71031,8 +72860,8 @@ self: {
        pname = "hsini";
        version = "0.4.2";
        sha256 = "1zkrfc2zyhcwy7l1k8kn0k2qv6jkxw0d6h6bifzh6d5h01ws72mr";
-       buildDepends = [ base bytestring containers mtl parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers mtl parsec ];
+       testHaskellDepends = [
          base bytestring containers HUnit mtl parsec QuickCheck tasty
          tasty-hunit tasty-quickcheck tasty-th
        ];
@@ -71046,7 +72875,7 @@ self: {
        pname = "hskeleton";
        version = "0.1.1";
        sha256 = "0f06xir28rzpwphk14gkpww8l7gbws4habhm26915idpnd4bva2w";
-       buildDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71060,7 +72889,9 @@ self: {
        sha256 = "0j4wkw6hqajgwzik8flfzs2m5rlmy9blm98n5ym56svjypshl55q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process unix ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process unix
+       ];
        homepage = "http://code.haskell.org/~arossato/hslackbuilder";
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
@@ -71073,8 +72904,8 @@ self: {
        pname = "hslibsvm";
        version = "2.89.0.1";
        sha256 = "00smw10j2ipw10133qc38famar5r6rkswj7bhvb9hdj2rrdyx6sf";
-       buildDepends = [ base containers ];
-       extraLibraries = [ svm ];
+       libraryHaskellDepends = [ base containers ];
+       librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71089,7 +72920,9 @@ self: {
        sha256 = "1dqicdvklkczn216qxb7gnjjgvgmr0s6iljyb33qhmmabrx5a7x1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal hint MemoTrie process regex-compat ];
+       executableHaskellDepends = [
+         base Cabal hint MemoTrie process regex-compat
+       ];
        description = "Resolves links to Haskell identifiers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71104,7 +72937,7 @@ self: {
        sha256 = "0xml1xgkj4hjjxypnjiia7y330a0nh5fcnkwhmnrwsw7hckwqqmy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
        homepage = "http://software.complete.org/hslogger";
@@ -71118,7 +72951,7 @@ self: {
        pname = "hslogger-template";
        version = "2.0.3";
        sha256 = "1q5g2jgx4yjzvbrc22qcxrb3r9cma64jg90wzx9yc19yxq0fa95k";
-       buildDepends = [ base hslogger mtl template-haskell ];
+       libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -71129,7 +72962,7 @@ self: {
        pname = "hslogger4j";
        version = "0.2";
        sha256 = "0mypcdj8npygj9g8d276rhr2wagk96zc4rjimwx2ylw4qm0scv5n";
-       buildDepends = [ hslogger ];
+       libraryHaskellDepends = [ hslogger ];
        homepage = "http://hslogger4j.googlecode.com/";
        description = "DEPRECATED hslogger handlers for log4j's XMLLayout";
        license = "LGPL";
@@ -71148,13 +72981,13 @@ self: {
        pname = "hslogstash";
        version = "0.3.7.1";
        sha256 = "040564f4wxmdhglziahava5cbyhvwbiw1ifi1g3cfb9zna2xl8p6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring conduit containers
          data-default hedis http-conduit http-types iconv lens network
          network-conduit parallel-io stm stm-chans stm-conduit stm-firehose
          text text-format time transformers unordered-containers vector wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit hspec QuickCheck split stm transformers
        ];
        jailbreak = true;
@@ -71171,13 +73004,15 @@ self: {
      mkDerivation {
        pname = "hslua";
        version = "0.4.0";
-       revision = "2";
        sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p";
+       revision = "2";
        editedCabalFile = "43f6956aba870857548523718d3d5645e422187964e5158d14a9c17d96671ccb";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hspec hspec-contrib HUnit text ];
-       extraLibraries = [ lua ];
        configureFlags = [ "-fsystem-lua" ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ lua ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-contrib HUnit text
+       ];
        description = "A Lua language interpreter embedding in Haskell";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) lua;};
@@ -71191,11 +73026,15 @@ self: {
        pname = "hsmagick";
        version = "0.5";
        sha256 = "1bfzbwddss0m0z4jf7i0b06pmxy9rvknpqnzhf0v5jggv5nr442p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath pretty process
        ];
-       extraLibraries = [ bzip2 jasper libjpeg libpng tiff wmflite zlib ];
-       pkgconfigDepends = [ freetype2 GraphicsMagick lcms libxml2 ];
+       librarySystemDepends = [
+         bzip2 jasper libjpeg libpng tiff wmflite zlib
+       ];
+       libraryPkgconfigDepends = [
+         freetype2 GraphicsMagick lcms libxml2
+       ];
        homepage = "https://github.com/vincentg/hsmagick";
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
@@ -71214,12 +73053,13 @@ self: {
        pname = "hsmisc";
        version = "1.2";
        sha256 = "1n2na14a5qaph0f457zvkjwr2zkbgh3mfli2ir5wkm7m1bm671aj";
-       buildDepends = [ base containers mtl old-locale parsec time ];
-       testDepends = [ base containers HUnit mtl ];
+       libraryHaskellDepends = [
+         base containers mtl old-locale parsec time
+       ];
+       testHaskellDepends = [ base containers HUnit mtl ];
        homepage = "http://hub.darcs.net/dino/hsmisc";
        description = "A collection of miscellaneous modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsmtpclient" = callPackage
@@ -71228,7 +73068,7 @@ self: {
        pname = "hsmtpclient";
        version = "1.0";
        sha256 = "08gbrwrc85in34nrgjm0zr5sjz2zbjc7hk2zlpvk1dq8x62a6wsg";
-       buildDepends = [ array base directory network old-time ];
+       libraryHaskellDepends = [ array base directory network old-time ];
        homepage = "http://code.google.com/p/hsmtpclient/";
        description = "Simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
@@ -71241,9 +73081,9 @@ self: {
        pname = "hsndfile";
        version = "0.7.1";
        sha256 = "1254r811sspd7h8a4yr4ff3a6c39ywp1zjrkxbsczpxbyg9bdnv2";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ libsndfile ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ libsndfile ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile";
        license = stdenv.lib.licenses.lgpl21;
@@ -71255,7 +73095,7 @@ self: {
        pname = "hsndfile-storablevector";
        version = "0.5.2";
        sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z";
-       buildDepends = [ base hsndfile storablevector ];
+       libraryHaskellDepends = [ base hsndfile storablevector ];
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.StorableVector interface)";
        license = stdenv.lib.licenses.lgpl2;
@@ -71268,7 +73108,7 @@ self: {
        pname = "hsndfile-vector";
        version = "0.5.2";
        sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig";
-       buildDepends = [ base hsndfile vector ];
+       libraryHaskellDepends = [ base hsndfile vector ];
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.Vector interface)";
        license = stdenv.lib.licenses.lgpl2;
@@ -71284,8 +73124,9 @@ self: {
        sha256 = "1hh4lyrd2ki79q6pfz62icp3igzyljwa5bz8ba9vk4kxxawrnbhw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec readline ];
-       testDepends = [
+       libraryHaskellDepends = [ base parsec readline ];
+       executableHaskellDepends = [ base parsec readline ];
+       testHaskellDepends = [
          base HUnit parsec QuickCheck readline test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -71301,7 +73142,7 @@ self: {
        pname = "hsnoise";
        version = "0.0.2";
        sha256 = "0f8xpmzmg71l7qn1vjvzncsx8r7vfpzvlnlq0029ixf64gshbmzl";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "https://github.com/colinhect/hsnoise";
        description = "A coherent 3d noise library";
        license = stdenv.lib.licenses.bsd3;
@@ -71315,7 +73156,7 @@ self: {
        sha256 = "0r3z9h5l4hxbjfcqsfk67jp2r964wgvrisk352lpx550vwd6chbf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base network pcap ];
+       executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71330,7 +73171,7 @@ self: {
        pname = "hsnsq";
        version = "0.1.2.0";
        sha256 = "0chmcyfar29rnsni47yx286a308rll098lxrr1zhyi7kxvh9j4fb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec attoparsec-binary base bytestring containers
          hostname hslogger mtl network pipes pipes-attoparsec pipes-network
          stm stm-chans text
@@ -71350,7 +73191,8 @@ self: {
        sha256 = "0pw5l6z1yjjvcxgw71i00gfnjdqcvg09bsacazq9ahvnwsn4aayd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base mtl network old-time random unix ];
+       libraryHaskellDepends = [ array base mtl network old-time random ];
+       executableHaskellDepends = [ unix ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/util/";
        description = "Libraries to use SNTP protocol and small client/server implementations";
        license = stdenv.lib.licenses.bsd3;
@@ -71368,10 +73210,11 @@ self: {
        sha256 = "1c4sigmagwbs3g5pj3as4f930mvba090p7cjq4cy8hbmv6cz0fn1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory parsec regex-compat regex-posix
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base containers directory HUnit parsec QuickCheck regex-compat
          regex-posix test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -71389,7 +73232,7 @@ self: {
        pname = "hsp";
        version = "0.10.0";
        sha256 = "1ayfywgrlmzivsq6lirmgvl65x1shf8041lzw2yh245rkmd91lsf";
-       buildDepends = [ base mtl text ];
+       libraryHaskellDepends = [ base mtl text ];
        homepage = "http://hub.darcs.net/nibro/hsp";
        description = "Haskell Server Pages is a library for writing dynamic server-side web pages";
        license = stdenv.lib.licenses.bsd3;
@@ -71401,7 +73244,7 @@ self: {
        pname = "hsp-cgi";
        version = "0.4.4";
        sha256 = "0m1xylqzmi2c1c92zk5bq6232id9fmjlx4s88ic2fvf5a389n11n";
-       buildDepends = [ base containers harp hsp network ];
+       libraryHaskellDepends = [ base containers harp hsp network ];
        homepage = "http://code.google.com/p/hsp";
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
        license = stdenv.lib.licenses.bsd3;
@@ -71414,7 +73257,7 @@ self: {
        pname = "hsparklines";
        version = "0.1.0";
        sha256 = "10za4f07a5agg3zgy32fdz02vg9fl344qswhzj5mnx8wpnxmr3y6";
-       buildDepends = [ base bytestring dataenc gd ];
+       libraryHaskellDepends = [ base bytestring dataenc gd ];
        homepage = "http://www.jasani.org/search/label/hsparklines";
        description = "Sparklines for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -71429,11 +73272,11 @@ self: {
        pname = "hsparql";
        version = "0.2.6";
        sha256 = "1vgdp4gz7zwh1n3iilg6kwdasfy4w48pjjgj6swr17k37irwzal4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HTTP MissingH mtl network network-uri rdf4h text
          xml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers http-types HUnit network-uri rdf4h test-framework
          test-framework-hunit text wai warp
        ];
@@ -71451,7 +73294,7 @@ self: {
        pname = "hspear";
        version = "0.14";
        sha256 = "1h3av9mpgsqfdrd817fz0isqrxn3lxmjyanw33dk9jax136ivi1h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing split utf8-string zlib
        ];
        homepage = "http://rd.slavepianos.org/?t=hspear";
@@ -71469,11 +73312,11 @@ self: {
        pname = "hspec";
        version = "2.1.10";
        sha256 = "0m51afa2n187jjx0fwarg11chakhv3z7fbmqq5rr7j60d9ix9ypq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory hspec-core hspec-meta stringbuilder
        ];
        homepage = "http://hspec.github.io/";
@@ -71489,10 +73332,10 @@ self: {
        pname = "hspec-attoparsec";
        version = "0.1.0.2";
        sha256 = "0r7v6x0k5r8jxl0rnsq8h3gqhbiimsic3kiphn6dxaw954zqnypa";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring hspec-expectations text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring hspec hspec-expectations text
        ];
        homepage = "http://github.com/alpmestan/hspec-attoparsec";
@@ -71506,8 +73349,8 @@ self: {
        pname = "hspec-checkers";
        version = "0.1.0";
        sha256 = "043qzgjp9ch9wqm269dd87jn8wk5c90q25098hnz8ilv5pnywk6d";
-       buildDepends = [ base checkers hspec ];
-       testDepends = [ base checkers hspec ];
+       libraryHaskellDepends = [ base checkers hspec ];
+       testHaskellDepends = [ base checkers hspec ];
        description = "Allows to use checkers properties from hspec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71518,8 +73361,8 @@ self: {
        pname = "hspec-contrib";
        version = "0.3.0";
        sha256 = "006syw8xagfhsx06ws9ywig1qx5lk4cgl7sq6pbid1s64c72mxn4";
-       buildDepends = [ base hspec-core HUnit ];
-       testDepends = [ base hspec hspec-core HUnit QuickCheck ];
+       libraryHaskellDepends = [ base hspec-core HUnit ];
+       testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
        description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
@@ -71535,11 +73378,11 @@ self: {
        pname = "hspec-core";
        version = "2.1.10";
        sha256 = "1q0fnag7lw54zf6aj55cckcfzs5ykpc841bczap6q9gnwrvpwbk8";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal async base deepseq hspec-expectations hspec-meta
          HUnit process QuickCheck quickcheck-io random setenv silently
          tf-random time transformers
@@ -71557,8 +73400,8 @@ self: {
        sha256 = "02qs0y7nn8wczjjs606d8ivixxib0024kny2al6mgvxyp524xcgg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
-       testDepends = [ base directory filepath hspec-meta ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [ base directory filepath hspec-meta ];
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
@@ -71570,7 +73413,7 @@ self: {
        pname = "hspec-expectations";
        version = "0.7.1";
        sha256 = "0n52k7qwqc5awig08fvajvymb9bb235q6pp8w0cbcb9a96rwdjmg";
-       buildDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/sol/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
@@ -71584,8 +73427,10 @@ self: {
        pname = "hspec-expectations-lens";
        version = "0.4.0";
        sha256 = "17c9qn525bmg113mw30sc35gm207rl0d6h156c7c1npnkyp1pw0k";
-       buildDepends = [ base hspec hspec-expectations HUnit lens ];
-       testDepends = [ base hspec lens silently ];
+       libraryHaskellDepends = [
+         base hspec hspec-expectations HUnit lens
+       ];
+       testHaskellDepends = [ base hspec lens silently ];
        homepage = "http://supki.github.io/hspec-expectations-lens/";
        description = "Hspec expectations for the lens stuff";
        license = stdenv.lib.licenses.bsd2;
@@ -71596,11 +73441,11 @@ self: {
      mkDerivation {
        pname = "hspec-expectations-lifted";
        version = "0.5.0";
-       revision = "1";
        sha256 = "0c3fxgwxjwqgwpnlxlbp2amhk44m34iq2lxs1rxkp3vjwkqi2m8b";
+       revision = "1";
        editedCabalFile = "43e88e0e7587ba1965ba3f2416500c239ad44ba19043bb249c6f307665e85208";
-       buildDepends = [ base hspec-expectations transformers ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base hspec-expectations transformers ];
+       testHaskellDepends = [ base hspec ];
        description = "A version of hspec-expectations generalized to MonadIO";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -71613,7 +73458,7 @@ self: {
        pname = "hspec-expectations-pretty";
        version = "0.1";
        sha256 = "1x8xpc9b2m33sqwf7j643wjzja956m4vcdvaqrwlpxwqn887sxn5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo
        ];
        jailbreak = true;
@@ -71628,8 +73473,8 @@ self: {
        pname = "hspec-experimental";
        version = "0.1.0";
        sha256 = "197c9x25r41xmaq84xqhi0kizxi7as7jn7k9klj7pq9fmd9hcg7m";
-       buildDepends = [ base hspec HUnit QuickCheck ];
-       testDepends = [ base hspec-meta ];
+       libraryHaskellDepends = [ base hspec HUnit QuickCheck ];
+       testHaskellDepends = [ base hspec-meta ];
        jailbreak = true;
        description = "An experimental DSL for testing on top of Hspec";
        license = stdenv.lib.licenses.mit;
@@ -71642,7 +73487,7 @@ self: {
        pname = "hspec-jenkins";
        version = "0.1.1";
        sha256 = "16aql0fyssc16z85isskccq93dj5i1pydblnf2q1np7z6pl1azy2";
-       buildDepends = [ base blaze-markup hspec ];
+       libraryHaskellDepends = [ base blaze-markup hspec ];
        homepage = "https://github.com/worksap-ate/hspec-jenkins";
        description = "Jenkins-friendly XML formatter for Hspec";
        license = stdenv.lib.licenses.mit;
@@ -71654,8 +73499,8 @@ self: {
        pname = "hspec-laws";
        version = "0.0.0";
        sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j";
-       buildDepends = [ base hspec QuickCheck ];
-       testDepends = [ base hspec markdown-unlit QuickCheck ];
+       libraryHaskellDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [ base hspec markdown-unlit QuickCheck ];
        description = "Document and test laws for standard type classes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -71671,11 +73516,11 @@ self: {
        sha256 = "0yh9yf9859cimd1qrh3bn65c89n16fpxzrcsily3xzr4miri7r7z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ansi-terminal async base deepseq directory filepath
-         hspec-expectations HUnit QuickCheck quickcheck-io random setenv
-         time transformers
+       libraryHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations HUnit
+         QuickCheck quickcheck-io random setenv time transformers
        ];
+       executableHaskellDepends = [ base directory filepath ];
        homepage = "http://hspec.github.io/";
        description = "A version of Hspec which is used to test Hspec itself";
        license = stdenv.lib.licenses.mit;
@@ -71689,7 +73534,7 @@ self: {
        pname = "hspec-monad-control";
        version = "0.1.0.0";
        sha256 = "07ry4nghrjbrlv6slv2a1m67r5ajdss7ifyzph0zwa96bjl1w124";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec-core monad-control transformers transformers-base
        ];
        description = "Orphan instances of MonadBase and MonadBaseControl for SpecM";
@@ -71705,11 +73550,11 @@ self: {
        pname = "hspec-server";
        version = "0.4.1";
        sha256 = "17bn5v3fqcmcd0qi4q9n9fj27kpw4iqyrjpjvvc4gwz1bc5bhf5q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hspec hspec-core hspec-expectations HUnit process
          regex-posix temporary transformers
        ];
-       testDepends = [ base hspec hspec-contrib transformers ];
+       testHaskellDepends = [ base hspec hspec-contrib transformers ];
        description = "Test Framework for checking server's status";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71720,7 +73565,7 @@ self: {
        pname = "hspec-shouldbe";
        version = "0.0.1";
        sha256 = "0b4y84vqyx22kihr0sbbxzr6sdz99hi2rhyl09r8ddzkzqadfii3";
-       buildDepends = [ hspec test-shouldbe ];
+       libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71732,8 +73577,8 @@ self: {
        pname = "hspec-smallcheck";
        version = "0.3.0";
        sha256 = "1yybyrbbj0fv62cf8nh851rgbb8phyhpsm57mzn7s5vqz7lf7dxw";
-       buildDepends = [ base hspec smallcheck ];
-       testDepends = [ base hspec QuickCheck smallcheck ];
+       libraryHaskellDepends = [ base hspec smallcheck ];
+       testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
@@ -71748,11 +73593,11 @@ self: {
        pname = "hspec-snap";
        version = "0.3.3.0";
        sha256 = "1ch58zz5yhvp4dq91ls05bgraf2p36aixl189zm3ipc9naidjrg4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers digestive-functors HandsomeSoup
          hspec hspec-core hxt lens mtl snap snap-core text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers digestive-functors directory
          HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text
          transformers
@@ -71760,7 +73605,6 @@ self: {
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -71771,7 +73615,7 @@ self: {
        pname = "hspec-test-framework";
        version = "0.1.0";
        sha256 = "13rlyn4yibajj469hzvw6hmvm3lyra11fl73g49zc3nvcial5ldv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec hspec-contrib hspec-core HUnit QuickCheck
        ];
        homepage = "http://hspec.github.io/";
@@ -71787,10 +73631,10 @@ self: {
        pname = "hspec-test-framework-th";
        version = "0.1.0";
        sha256 = "1apzvrbyksz5jai0i6x5y8lz1rpi2px5x9rwirhm1flbzvpdypma";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec-test-framework language-haskell-extract template-haskell
        ];
-       testDepends = [ base hspec-test-framework HUnit ];
+       testHaskellDepends = [ base hspec-test-framework HUnit ];
        homepage = "http://hspec.github.io/";
        description = "Run test-framework tests with Hspec";
        license = stdenv.lib.licenses.mit;
@@ -71802,8 +73646,8 @@ self: {
        pname = "hspec-test-sandbox";
        version = "0.1.0";
        sha256 = "1kg7lpm1is5yxwcjhmdayxv8g52d2q215d9f8f8h33qvc7w0a8yp";
-       buildDepends = [ base hspec hspec-core test-sandbox ];
-       testDepends = [ base hspec test-sandbox ];
+       libraryHaskellDepends = [ base hspec hspec-core test-sandbox ];
+       testHaskellDepends = [ base hspec test-sandbox ];
        description = "Hspec convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71817,11 +73661,11 @@ self: {
        pname = "hspec-wai";
        version = "0.6.3";
        sha256 = "0vydfzpfwrld6wi47bk1d27hm5mz8hll3fc0ckzy7dyyzrgfnp4i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive hspec-core hspec-expectations
          http-types text transformers wai wai-extra
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring case-insensitive hspec hspec-core
          hspec-expectations http-types QuickCheck text transformers wai
          wai-extra
@@ -71838,11 +73682,11 @@ self: {
        pname = "hspec-wai-json";
        version = "0.6.1";
        sha256 = "0sbw6iddywxdg4n8npnz6m0lmcf9nrq3ib7kckpx7shpq9khwgih";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-qq base bytestring case-insensitive hspec-wai
          template-haskell
        ];
-       testDepends = [ base hspec hspec-wai ];
+       testHaskellDepends = [ base hspec hspec-wai ];
        homepage = "https://github.com/hspec/hspec-wai#readme";
        description = "Testing JSON APIs with hspec-wai";
        license = stdenv.lib.licenses.mit;
@@ -71857,7 +73701,7 @@ self: {
        pname = "hspec-webdriver";
        version = "1.0.2";
        sha256 = "1wkdv129arxbfby1214a93sfqbi1kvkgvqpp4z6qzh45q74hhd9c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default hashable hspec hspec-core HUnit lifted-base stm
          text transformers unordered-containers webdriver
        ];
@@ -71871,10 +73715,10 @@ self: {
      mkDerivation {
        pname = "hspec2";
        version = "0.6.1";
-       revision = "1";
        sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4";
+       revision = "1";
        editedCabalFile = "d41ebaf2f80c6ae149a944cd77e31fce98c0eea45cf47a561c5c25d48e03107f";
-       buildDepends = [ base hspec hspec-discover ];
+       libraryHaskellDepends = [ base hspec hspec-discover ];
        homepage = "http://hspec.github.io/";
        description = "Alpha version of Hspec 2.0";
        license = stdenv.lib.licenses.mit;
@@ -71886,7 +73730,7 @@ self: {
        pname = "hspr-sh";
        version = "0.3";
        sha256 = "1qnqg2gg93l5dp2nyvvaq7n58gsnljvbafbhfpvys48g5ry2dk7a";
-       buildDepends = [ base old-time ];
+       libraryHaskellDepends = [ base old-time ];
        homepage = "http://www.cs.chalmers.se/~d00nibro/hsp/";
        description = "Session handler for HSP";
        license = stdenv.lib.licenses.publicDomain;
@@ -71900,7 +73744,7 @@ self: {
        pname = "hspread";
        version = "0.3.3";
        sha256 = "1z7v5awagmhxyz4cl020s4gk4yxp0i62z3hqm9kwf73b3b69x2kf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers extensible-exceptions network
        ];
        description = "A client library for the spread toolkit";
@@ -71916,7 +73760,7 @@ self: {
        sha256 = "0x4f3y8l8vj1498bnw4fxw9nzf7q2y4vjys72j73h50c7hr83j07";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base bytestring vty ];
+       libraryHaskellDepends = [ array base bytestring vty ];
        jailbreak = true;
        description = "A terminal presentation tool";
        license = stdenv.lib.licenses.bsd3;
@@ -71935,11 +73779,12 @@ self: {
        sha256 = "1g47g3i8fgknzyf7pp7g1mk2bfn7r7igm0c6j2v9fnahhrpj4a5z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base bytestring containers ];
+       executableHaskellDepends = [
          base bytestring containers directory easy-file filepath hint
          MonadCatchIO-mtl process stringsearch time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec HUnit QuickCheck test-framework
          test-framework-hunit
        ];
@@ -71954,7 +73799,7 @@ self: {
        pname = "hsql";
        version = "1.8.2";
        sha256 = "0i53n42ynq22fzlz4kpmri4q4abmi4dz8bz0izn307is1pmk4bby";
-       buildDepends = [ base old-time ];
+       libraryHaskellDepends = [ base old-time ];
        description = "Database access from Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71964,11 +73809,11 @@ self: {
      mkDerivation {
        pname = "hsql-mysql";
        version = "1.8.3";
-       revision = "1";
        sha256 = "0834jr5jrr1m7ap93wvmb5ir0906f7f7xx52x21i1l1jfpan34j9";
+       revision = "1";
        editedCabalFile = "e1bbb71ecb6e310acf23a93e4a5e0121c8bd332e7a81dfa5bfe27ae94cbf14ab";
-       buildDepends = [ base Cabal hsql ];
-       extraLibraries = [ mysqlclient ];
+       libraryHaskellDepends = [ base Cabal hsql ];
+       librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71980,8 +73825,8 @@ self: {
        pname = "hsql-odbc";
        version = "1.8.2";
        sha256 = "0lz9zjy1xgjjbabbi2hcrvsnfid6c78y2cb2703qjwr93xy54f1f";
-       buildDepends = [ base hsql old-time ];
-       extraLibraries = [ unixODBC ];
+       libraryHaskellDepends = [ base hsql old-time ];
+       librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) unixODBC;};
@@ -71992,8 +73837,8 @@ self: {
        pname = "hsql-postgresql";
        version = "1.8.2";
        sha256 = "0yj0jalpapjvpxmc79yd6bn93ax13pp87dipbg2c9mxf3p38jc9z";
-       buildDepends = [ base hsql old-time ];
-       extraLibraries = [ postgresql ];
+       libraryHaskellDepends = [ base hsql old-time ];
+       librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) postgresql;};
@@ -72004,8 +73849,8 @@ self: {
        pname = "hsql-sqlite3";
        version = "1.8.2";
        sha256 = "15f7f4f4k1afrpmkw2k6lyx1b81hlwvwv660yh0vm2vz269mxycl";
-       buildDepends = [ base hsql ];
-       extraLibraries = [ sqlite ];
+       libraryHaskellDepends = [ base hsql ];
+       librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) sqlite;};
@@ -72018,12 +73863,14 @@ self: {
        pname = "hsqml";
        version = "0.3.3.0";
        sha256 = "0m0g822182q45cvl3k7ir1c6g5wzwb1c9137g1c62f3npinb0kmz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath tagged text transformers
        ];
-       testDepends = [ base containers directory QuickCheck tagged text ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ qt5 ];
+       libraryPkgconfigDepends = [ qt5 ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base containers directory QuickCheck tagged text
+       ];
        jailbreak = true;
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
@@ -72036,11 +73883,12 @@ self: {
        pname = "hsqml-datamodel";
        version = "0.0.0.1";
        sha256 = "16q92q00q96kyg41xh8smp5vvkvlfrps6nj7ds1y09msdqvihw9v";
-       buildDepends = [ base hsqml template-haskell text ];
-       pkgconfigDepends = [ qt5 ];
+       libraryHaskellDepends = [ base hsqml template-haskell text ];
+       libraryPkgconfigDepends = [ qt5 ];
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel";
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -72051,7 +73899,9 @@ self: {
        pname = "hsqml-datamodel-vinyl";
        version = "0.1.0.0";
        sha256 = "0jg3jl1h4jf92vazyf7wb88dhrl89zm9hh21hymzy3pnc5kssd91";
-       buildDepends = [ base exceptions hsqml-datamodel type-list vinyl ];
+       libraryHaskellDepends = [
+         base exceptions hsqml-datamodel type-list vinyl
+       ];
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl";
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
@@ -72067,7 +73917,7 @@ self: {
        sha256 = "0zkjcll4hgsv1ji4rd48fx95hn90vl9vvdzxbirqfaf40xai58md";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord text
        ];
        jailbreak = true;
@@ -72087,7 +73937,7 @@ self: {
        sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers hsqml sqlite-simple text transformers
        ];
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
@@ -72103,7 +73953,7 @@ self: {
        sha256 = "072k2vc6wk8r2zn2isp37p9xhi8dbg15sy5hmpj868lzbq3mzyac";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hsqml OpenGL OpenGLRaw text ];
+       executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        jailbreak = true;
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML sample programs";
@@ -72121,7 +73971,7 @@ self: {
        sha256 = "1qisi1r8lljgkwc9v5p3nqq6b78vdn9wyydsp31dxqnbd1lyg5ax";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord tagged
        ];
        jailbreak = true;
@@ -72139,14 +73989,14 @@ self: {
      mkDerivation {
        pname = "hsreadability";
        version = "1.0.0.0";
-       revision = "1";
        sha256 = "0q4sqx7xjsa8jplrdzirdlh6170ckqags02idjknwpc48plarnaw";
+       revision = "1";
        editedCabalFile = "e0b87a28497a4730024ce1459c7812d519027e8b90aa863dac85dd251558fa23";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring data-default http-conduit
          http-types text xsd
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base file-embed HUnit test-framework test-framework-hunit
          text
        ];
@@ -72162,8 +74012,8 @@ self: {
        pname = "hsshellscript";
        version = "3.3.3";
        sha256 = "0g8qm1nx2dzsmkn2rp1vwqgvgqpxgjambnmq81qyky66d83mgbz1";
-       buildDepends = [ base directory parsec random unix ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base directory parsec random unix ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://www.volker-wysk.de/hsshellscript/";
        description = "Haskell for Unix shell scripting tasks";
        license = "LGPL";
@@ -72177,7 +74027,9 @@ self: {
        sha256 = "07g1wsm4131ymp4ym33fx8yfs0bsqn9as65lkyg21ajc0dz2j1qa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory filepath regexpr ];
+       executableHaskellDepends = [
+         base containers directory filepath regexpr
+       ];
        description = "get haskell source code info";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72191,11 +74043,11 @@ self: {
        pname = "hssqlppp";
        version = "0.4.2";
        sha256 = "083mczqb5ca52ly88xhmd8244q8j1iyf0kkxmgp4w13w6sa5lwzl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl parsec pretty syb template-haskell transformers
          uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers groom HUnit mtl parsec pretty syb template-haskell
          test-framework test-framework-hunit transformers uniplate
        ];
@@ -72213,7 +74065,7 @@ self: {
        pname = "hstatistics";
        version = "0.2.5.2";
        sha256 = "08bkffx3d87c3cb3zp0gdj10cw1cb2m55lbqkh6b6lvxjy26igvp";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base hmatrix hmatrix-gsl-stats random vector
        ];
        homepage = "http://code.haskell.org/hstatistics";
@@ -72228,7 +74080,7 @@ self: {
        pname = "hstats";
        version = "0.3";
        sha256 = "04v03gha4p0i9ymjladmzpw8mwk72s60aihk50k2ixqja976y9hj";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://github.com/unmarshal/hstats/";
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -72241,7 +74093,7 @@ self: {
        pname = "hstatsd";
        version = "0.1";
        sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4";
-       buildDepends = [ base bytestring mtl network text ];
+       libraryHaskellDepends = [ base bytestring mtl network text ];
        homepage = "https://github.com/mokus0/hstatsd";
        description = "Quick and dirty statsd interface";
        license = stdenv.lib.licenses.publicDomain;
@@ -72257,7 +74109,7 @@ self: {
        sha256 = "0afvl5b82alnbdj0l26scg1qy7rln94qk9an252p83zlg5nd16gd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath ghc ghc-paths HUnit mtl QuickCheck random
        ];
        jailbreak = true;
@@ -72275,7 +74127,7 @@ self: {
        sha256 = "1hjsdxl0vn42n5kfiq42yvrr3j31sjy9g7iwjlnj2x72jff79vxs";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts ];
+       executableHaskellDepends = [ base haskell-src-exts ];
        homepage = "http://code.haskell.org/~morrow/code/haskell/hstidy";
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
        license = stdenv.lib.licenses.bsd3;
@@ -72294,11 +74146,14 @@ self: {
        sha256 = "1d87s6f6qgq7sbqzdgidnn3gxz9panhdk2mfhd7263hb9mrq1k3c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base containers hsqml network process random safecopy
-         socks tagged text
+       libraryHaskellDepends = [
+         attoparsec base containers hsqml network random safecopy socks
+         tagged text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base containers hsqml network process text
+       ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -72320,10 +74175,13 @@ self: {
        sha256 = "10wyvfha6vngrj8h8i9dx1skyz3c4g1pcx13cafix5cpim6dr64w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive conduit
          configurator containers hoauth http-conduit lifted-base numbers
-         old-locale resourcet RSA safe text time transformers vector
+         old-locale resourcet RSA safe text time vector
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit resourcet transformers
        ];
        jailbreak = true;
        description = "Tradeking API bindings for Haskell";
@@ -72341,7 +74199,7 @@ self: {
        sha256 = "1a63i54zd9ls1lii4p2qzpds3q8xbcl8w8b6m53ix3n6ikpa4n35";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory filepath haskell-src-exts syb text vector
        ];
        jailbreak = true;
@@ -72360,7 +74218,7 @@ self: {
        sha256 = "1hjf5n7m5d9bnj1rwnsf2pvs6vcfvv2hf53a6pbyb63c4rgqzk2m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers directory filepath glade gtk parallel
          QuickCheck random xml
        ];
@@ -72383,7 +74241,7 @@ self: {
        sha256 = "1sl7dxqi47x937wivdlx5yg6a4niczcz22xs3flvgsrxbx1ahy9w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs general-prelude gitlib hslogger lens mtl
          parallel-io regex-posix stringable svndump system-fileio
          system-filepath text text-format time transformers unix
@@ -72402,8 +74260,10 @@ self: {
        pname = "hsverilog";
        version = "0.1.0";
        sha256 = "1qk34zl1894ra9w0w2gzg8ivz230ymgyjghsd2cwn00fcsyafa7a";
-       buildDepends = [ base containers shakespeare text transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers shakespeare text transformers
+       ];
+       testHaskellDepends = [
          base containers hspec hspec-contrib hspec-expectations-lifted
          shakespeare text transformers
        ];
@@ -72417,8 +74277,8 @@ self: {
        pname = "hswip";
        version = "0.3";
        sha256 = "11nlpnfjnypz76m2padkz7ppjdir1vz3bp65s9wzphvnsmp3a681";
-       buildDepends = [ base haskell98 mtl ];
-       extraLibraries = [ ncurses readline swipl ];
+       libraryHaskellDepends = [ base haskell98 mtl ];
+       librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72433,7 +74293,7 @@ self: {
        sha256 = "046428y16h6za41lwqkp5pnqfd74zw8jiz8xw7j7sq0rhylg134v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts mtl utf8-string ];
+       libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/nibro/hsx";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
@@ -72449,7 +74309,7 @@ self: {
        pname = "hsx-jmacro";
        version = "7.3.6";
        sha256 = "1fr60b57z2ri2pfs890xvrzrh4n75p2j4nmb7b819cf4rhgshgnh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base happstack-hsp hsp jmacro mtl text wl-pprint-text
        ];
        homepage = "http://www.happstack.com/";
@@ -72464,7 +74324,7 @@ self: {
        pname = "hsx-xhtml";
        version = "0.4.4";
        sha256 = "1051fh4yjnsax60v4rfh5r87n660ygq033gmg710nm3gw57ihkl2";
-       buildDepends = [ base hsx mtl ];
+       libraryHaskellDepends = [ base hsx mtl ];
        homepage = "http://code.google.com/hsp";
        description = "XHTML utilities to use together with HSX";
        license = stdenv.lib.licenses.bsd3;
@@ -72481,7 +74341,7 @@ self: {
        sha256 = "1vpq6a1379h7lmxcmwdb0r81gda2zn4lv02xslrixszsb757l1ck";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring haskell-src-exts haskell-src-meta mtl
          template-haskell utf8-string
        ];
@@ -72496,7 +74356,7 @@ self: {
        pname = "hsyscall";
        version = "0.4";
        sha256 = "0ysi317vwgksaq78k31sb8s34rjjhl4w8ncvycfsmmdnv7cdg2ld";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aycanirican/hsyscall";
        description = "FFI to syscalls";
        license = stdenv.lib.licenses.bsd3;
@@ -72509,8 +74369,8 @@ self: {
        pname = "hsyslog";
        version = "2.0";
        sha256 = "02v698grn43bvikqhqiz9ys8x2amngdmhvl3i0ar9203p2x8q3pq";
-       buildDepends = [ base ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/peti/hsyslog";
        description = "FFI interface to syslog(3) from POSIX.1-2001";
        license = stdenv.lib.licenses.bsd3;
@@ -72522,8 +74382,8 @@ self: {
        pname = "hszephyr";
        version = "0.1";
        sha256 = "0lgzricdq2vijmsqrwg93amxslmdwzj17c4ppmws3pcb54xj2fsr";
-       buildDepends = [ base bytestring mtl time ];
-       extraLibraries = [ com_err zephyr ];
+       libraryHaskellDepends = [ base bytestring mtl time ];
+       librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72537,7 +74397,9 @@ self: {
        sha256 = "064ddzligzqimdhprgpgl1j0gf4xv53anaisx3fc88as104q8zjk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath haskell-src mtl ];
+       executableHaskellDepends = [
+         base directory filepath haskell-src mtl
+       ];
        description = "A Haskell98 parsing tags program similar to ctags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72552,12 +74414,11 @@ self: {
        sha256 = "15m57vq0hcfk2dqamh2c624icv3smcqjgswy58glcclxz7f8ly3z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bzlib directory filepath tar time zlib
        ];
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htiled" = callPackage
@@ -72568,7 +74429,7 @@ self: {
        pname = "htiled";
        version = "0.1.2.0";
        sha256 = "1g0fak4iwjii5zvn79hcdydrp4vs5c0nwwbf7v2m2gajw1r34fg9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring containers filepath hxt split
          zlib
        ];
@@ -72585,7 +74446,7 @@ self: {
        sha256 = "14y7ipbc6ic1qraxnrs4k0hrqh5c8ks1fsm8af6wm9x762bcfaxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process time ];
+       executableHaskellDepends = [ base process time ];
        description = "Timing utility for the command line";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72596,7 +74457,7 @@ self: {
        pname = "html";
        version = "1.0.1.2";
        sha256 = "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "HTML combinator library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72610,11 +74471,11 @@ self: {
        pname = "html-conduit";
        version = "1.2.0";
        sha256 = "0jj02s71a9fk9mrk7bqms93y1m2zz96jg4rd7jn486ln1w49c43m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra containers resourcet
          tagstream-conduit text transformers xml-conduit xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec HUnit xml-conduit
        ];
        homepage = "https://github.com/snoyberg/xml";
@@ -72630,13 +74491,12 @@ self: {
        pname = "html-email-validate";
        version = "0.2.0.0";
        sha256 = "1bvdmaamxbldb8nndi5f330msj1d0mrj8lapvxqyr333bg3kwaix";
-       buildDepends = [ attoparsec base text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
          attoparsec base hspec QuickCheck regex-pcre-builtin text
        ];
        description = "Validating an email address against HTML standard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-entities" = callPackage
@@ -72645,16 +74505,19 @@ self: {
      }:
      mkDerivation {
        pname = "html-entities";
-       version = "1.0.1.1";
-       sha256 = "13mavik2bl95dnisag9aqwjl9mdqq9vib8brmvldp74zijhfr1dx";
-       buildDepends = [
+       version = "1.1.0.0";
+       sha256 = "0zm0s5y875wp5mb3hrprrzfv5h7cs4zzxqv0y1dmrs3nk9yrah8n";
+       libraryHaskellDepends = [
          attoparsec base-prelude text unordered-containers
        ];
-       testDepends = [ base base-prelude directory doctest filepath ];
+       testHaskellDepends = [
+         base base-prelude directory doctest filepath
+       ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-entities";
        description = "A codec library for HTML-escaped text and HTML-entities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-kure" = callPackage
@@ -72663,7 +74526,7 @@ self: {
        pname = "html-kure";
        version = "0.2.1";
        sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l";
-       buildDepends = [ base hxt kure ];
+       libraryHaskellDepends = [ base hxt kure ];
        homepage = "www.ittc.ku.edu/csdl/fpg/software/html-kure";
        description = "HTML rewrite engine, using KURE";
        license = stdenv.lib.licenses.bsd3;
@@ -72675,7 +74538,7 @@ self: {
        pname = "html-minimalist";
        version = "0.15";
        sha256 = "06qhjb8c1x9wab77g493bbqqm068alkc4vn7c6dj810gdgxwgw5j";
-       buildDepends = [ base xml ];
+       libraryHaskellDepends = [ base xml ];
        homepage = "http://rd.slavepianos.org/t/html-minimalist";
        description = "Minimalist haskell html library";
        license = "GPL";
@@ -72687,7 +74550,7 @@ self: {
        pname = "html-rules";
        version = "0.1.0.1";
        sha256 = "1k0jqx1mlcar6z8ggrz3fv1nzilkwdxvg3gvsb3pg7nvbkhz5lpw";
-       buildDepends = [ base lens mtl tagsoup transformers ];
+       libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
        jailbreak = true;
        homepage = "http://github.com/kylcarte/html-rules/";
        description = "Perform traversals of HTML structures using sets of rules";
@@ -72703,11 +74566,13 @@ self: {
        pname = "html-tokenizer";
        version = "0.3.0.3";
        sha256 = "0xdjjmpp1wh17cb4lnziglwhv7frr0y5v216s5ycy9lkby9r9fyv";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text text
        ];
-       testDepends = [ base base-prelude directory doctest filepath ];
+       testHaskellDepends = [
+         base base-prelude directory doctest filepath
+       ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-tokenizer";
        description = "An \"attoparsec\"-based HTML tokenizer";
@@ -72720,7 +74585,7 @@ self: {
        pname = "html-truncate";
        version = "0.3.0.0";
        sha256 = "1d66kdg81774b8isw1mfkl54sgmaz0n04n6shd5jjz18sjwyxp14";
-       buildDepends = [ base tagsoup ];
+       libraryHaskellDepends = [ base tagsoup ];
        homepage = "https://github.com/mruegenberg/html-truncate";
        description = "A HTML truncator";
        license = stdenv.lib.licenses.bsd3;
@@ -72737,14 +74602,13 @@ self: {
        sha256 = "1n49dz59nlkvb4ax1h9cfq7nqcwlxcrm372x4373ig6xdzbckdmz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers hamlet html-conduit http-conduit mtl
          optparse-declarative regex-tdfa text wl-pprint-text xml-conduit
        ];
        homepage = "http://github.com/tanakh/html2hamlet";
        description = "HTML to Hamlet converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html5-entity" = callPackage
@@ -72755,7 +74619,7 @@ self: {
        sha256 = "0bmmzshxanzw5y2y0hvgzz9yw18jqgv535i1xq2a5lf7w8wpj1if";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers text ];
+       libraryHaskellDepends = [ base containers text ];
        homepage = "https://github.com/zudov/html5-entity/";
        description = "A library for looking up and validating HTML5 entities";
        license = stdenv.lib.licenses.bsd3;
@@ -72769,7 +74633,7 @@ self: {
        sha256 = "0av34wypj47h4aifwqjjdwihb5b5jly5hcr32jq64ld94b7r4l2m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HDBC HDBC-sqlite3 ];
+       executableHaskellDepends = [ base HDBC HDBC-sqlite3 ];
        homepage = "http://github.com/pirapira/htodo";
        description = "A todo application";
        license = stdenv.lib.licenses.bsd3;
@@ -72786,11 +74650,15 @@ self: {
        sha256 = "0gv57isivg65wd05yxcyi2wv4ck2f153pkk2vblp6q1xh7d81asm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring Cabal containers file-embed old-locale parsec
-         tasty tasty-hspec tasty-hunit text time unordered-containers vector
+       libraryHaskellDepends = [
+         aeson base containers old-locale parsec text time
+         unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring Cabal containers file-embed parsec tasty
+         tasty-hspec tasty-hunit text time unordered-containers vector
+       ];
+       testHaskellDepends = [
          base bytestring Cabal containers file-embed parsec tasty
          tasty-hspec tasty-hunit text time unordered-containers vector
        ];
@@ -72806,7 +74674,7 @@ self: {
        pname = "htrace";
        version = "0.1";
        sha256 = "0ar1w9p6ppag2vp8kw6byirhfdfs4r639pjh5icnyiiliz6jkvlx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Hierarchical tracing for debugging of lazy evaluation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72817,7 +74685,7 @@ self: {
        pname = "hts";
        version = "0.15";
        sha256 = "0l09skjsds4p9kdwrwrxg8hdd1ja7m2zmggf23dfimzm1jsij6y2";
-       buildDepends = [ base hmt xml ];
+       libraryHaskellDepends = [ base hmt xml ];
        homepage = "http://rd.slavepianos.org/t/hts";
        description = "Haskell Music Typesetting";
        license = "GPL";
@@ -72834,11 +74702,11 @@ self: {
        sha256 = "123h3x22652xfnc1szvclnhfnr5wb5ndx8ahyvramvgjr1mmxpp5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs configurator directory filepath hdaemonize hslogger
          htsn-common hxt MissingH network tasty tasty-hunit unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs configurator directory filepath hdaemonize hslogger
          htsn-common hxt MissingH network process tasty tasty-hunit unix
        ];
@@ -72852,7 +74720,9 @@ self: {
        pname = "htsn-common";
        version = "0.0.2";
        sha256 = "0ywp0683mna16znsqn6h6k5iihpzhj909hivgmlvfzkrn6plvc15";
-       buildDepends = [ ansi-terminal base hslogger transformers ];
+       libraryHaskellDepends = [
+         ansi-terminal base hslogger transformers
+       ];
        description = "Display/logging facilities used by both htsn and htsn-import";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -72870,13 +74740,13 @@ self: {
        sha256 = "1mm098a748dmwzzak0ciam7dq80l3iv4hvk8c1crr03dbybr8rq3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs configurator containers directory filepath
          fixed-vector-hetero groundhog groundhog-postgresql groundhog-sqlite
          groundhog-th hslogger htsn-common hxt MissingH old-locale split
          tasty tasty-hunit time transformers tuple
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs configurator containers directory doctest filepath
          fixed-vector-hetero groundhog groundhog-postgresql groundhog-sqlite
          groundhog-th hslogger htsn-common hxt MissingH old-locale process
@@ -72893,7 +74763,7 @@ self: {
        pname = "http-accept";
        version = "0.2";
        sha256 = "1ivwkwr9jgbf6m2dv4gaw5vxrz2vm5wzz65ncl5jpma6wimwh4ii";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/singpolyma/http-accept";
        description = "Functions for working with HTTP Accept headers";
        license = "unknown";
@@ -72905,7 +74775,7 @@ self: {
        pname = "http-attoparsec";
        version = "0.1.1";
        sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
-       buildDepends = [ attoparsec base bytestring http-types ];
+       libraryHaskellDepends = [ attoparsec base bytestring http-types ];
        jailbreak = true;
        homepage = "https://github.com/tlaitinen/http-attoparsec";
        description = "Attoparsec parsers for http-types";
@@ -72924,13 +74794,13 @@ self: {
        pname = "http-client";
        version = "0.4.18.1";
        sha256 = "0v0mmsbh8hgzkxyg7gkn3dlq5l21ljzbxr9c3wmmz6viwhhabfv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
          exceptions filepath ghc-prim http-types mime-types network
          network-uri random streaming-commons text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base base64-bytestring blaze-builder bytestring
          case-insensitive containers deepseq directory hspec http-types
          monad-control network network-uri streaming-commons text time
@@ -72950,7 +74820,7 @@ self: {
        pname = "http-client-auth";
        version = "0.1.0.1";
        sha256 = "07scawz138qffcgw5lyxbxmwdm0czhylqy1rzm0ff59n8amr46j4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-string blaze-builder bytestring case-insensitive
          conduit crypto-conduit http-client http-conduit pureMD5 resourcet
          transformers utf8-string
@@ -72965,7 +74835,7 @@ self: {
        pname = "http-client-conduit";
        version = "0.3.0";
        sha256 = "0k2vq9y7kfbkhcsszjr74ahq5nw5z7dbzjhw1ixbigcr56axsd19";
-       buildDepends = [ base http-client ];
+       libraryHaskellDepends = [ base http-client ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "Frontend support for using http-client with conduit (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -72979,7 +74849,7 @@ self: {
        pname = "http-client-lens";
        version = "0.1.0";
        sha256 = "1n5q3wprhp8kwwq2n1v06l1a9k9p3z96rxv3kr6bbwga9lsb3jip";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-client http-types lens network
        ];
        jailbreak = true;
@@ -72994,7 +74864,7 @@ self: {
        pname = "http-client-multipart";
        version = "0.3.0.0";
        sha256 = "18za6s3658hgm95rrygghrz0b643c7nkzaimb14v2hv82w3k9crg";
-       buildDepends = [ base http-client ];
+       libraryHaskellDepends = [ base http-client ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "Generate multipart uploads for http-client. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -73008,8 +74878,10 @@ self: {
        pname = "http-client-openssl";
        version = "0.2.0.1";
        sha256 = "1mg2gn51ixb68wd8mm66kcj4627q6gj64810wsa1axy3jmk5qym3";
-       buildDepends = [ base HsOpenSSL http-client network ];
-       testDepends = [ base HsOpenSSL hspec http-client http-types ];
+       libraryHaskellDepends = [ base HsOpenSSL http-client network ];
+       testHaskellDepends = [
+         base HsOpenSSL hspec http-client http-types
+       ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the OpenSSL library";
        license = stdenv.lib.licenses.mit;
@@ -73023,7 +74895,7 @@ self: {
        pname = "http-client-request-modifiers";
        version = "0.1";
        sha256 = "1bd6r24gh0nxfj040q3x39nqnpkdqkri1wdlg3jf2h61cb5gli5r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring exceptions http-client http-media http-types
          network network-uri
        ];
@@ -73042,7 +74914,7 @@ self: {
        pname = "http-client-streams";
        version = "0.3.1.0";
        sha256 = "1q9w0l89a599l4955kb3156ysmlg7il9pz0x7kfl3bxly4gadf8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HsOpenSSL http-client http-client-openssl
          io-streams mtl transformers
        ];
@@ -73059,11 +74931,11 @@ self: {
        pname = "http-client-tls";
        version = "0.2.2";
        sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring connection data-default-class http-client network
          tls
        ];
-       testDepends = [ base hspec http-client http-types ];
+       testHaskellDepends = [ base hspec http-client http-types ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
        license = stdenv.lib.licenses.mit;
@@ -73078,7 +74950,7 @@ self: {
        pname = "http-common";
        version = "0.8.2.0";
        sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring case-insensitive
          directory mtl network text transformers unordered-containers
        ];
@@ -73099,11 +74971,11 @@ self: {
        pname = "http-conduit";
        version = "2.1.7.2";
        sha256 = "0inw95a2vdmsffh3ns1kh8hr7xrx2pbgdrq0yv68bwf1v4sd1mfc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring case-insensitive conduit
          conduit-extra connection cookie data-default-class hspec
          http-client http-types HUnit lifted-base network streaming-commons
@@ -73125,12 +74997,12 @@ self: {
        pname = "http-conduit-browser";
        version = "2.0.0.0";
        sha256 = "1swgsb14mwsfrwhw2ggydi2wm24hrqlisslh5q46qll7rl2gx19q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers cookie data-default exceptions
          http-client http-conduit http-types lifted-base monad-control
          network-uri resourcet time transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base64-bytestring blaze-builder bytestring case-insensitive
          conduit containers cookie data-default hspec http-client
          http-conduit http-types HUnit lifted-base monad-control network
@@ -73153,7 +75025,7 @@ self: {
        pname = "http-conduit-downloader";
        version = "1.0.25";
        sha256 = "0g393cmkbpb40in03zlyahxxwiy5i7zj7wg5zb92a0hkmjkgbrka";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit connection data-default HsOpenSSL
          http-client http-conduit http-types lifted-base mtl network
          network-uri old-locale resourcet time zlib
@@ -73172,8 +75044,10 @@ self: {
        pname = "http-date";
        version = "0.0.6.1";
        sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj";
-       buildDepends = [ array attoparsec base bytestring ];
-       testDepends = [ base bytestring doctest hspec old-locale time ];
+       libraryHaskellDepends = [ array attoparsec base bytestring ];
+       testHaskellDepends = [
+         base bytestring doctest hspec old-locale time
+       ];
        description = "HTTP Date parser/formatter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73185,17 +75059,16 @@ self: {
      mkDerivation {
        pname = "http-encodings";
        version = "0.9.3";
-       revision = "2";
        sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn";
+       revision = "2";
        editedCabalFile = "0370852e7250c2c2bb1575155286442cbfcdd03a7e494dcaa73305d4e84a6c76";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
        ];
        jailbreak = true;
        homepage = "http://github.com/achudnov/http-encodings";
        description = "A library for encoding and decoding bodies of HTTP messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-enumerator" = callPackage
@@ -73211,7 +75084,7 @@ self: {
        sha256 = "10w2ppgb4kjl3h77iq7j9qh3gcl6a0fvbpidi2njd4pfhrq4lgs6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-data attoparsec attoparsec-enumerator base base64-bytestring
          blaze-builder blaze-builder-enumerator bytestring case-insensitive
          certificate containers cprng-aes data-default enumerator failure
@@ -73233,8 +75106,10 @@ self: {
        pname = "http-kit";
        version = "0.5.1";
        sha256 = "1swnvsbaabk946pys9q9kr0bgdvalnznd59dw981sg7cywqdcz28";
-       buildDepends = [ base bytestring case-insensitive http-types ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring case-insensitive http-types
+       ];
+       testHaskellDepends = [
          base bytestring hspec http-types QuickCheck quickcheck-instances
        ];
        description = "A low-level HTTP library";
@@ -73249,10 +75124,12 @@ self: {
        pname = "http-link-header";
        version = "0.2.0";
        sha256 = "0vdmb0w7ppss8lffdghn9d2vjawn6nvhx7cx1dcvl4fllxfiaihc";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring-conversion errors network-uri text
        ];
-       testDepends = [ base hspec hspec-attoparsec QuickCheck text ];
+       testHaskellDepends = [
+         base hspec hspec-attoparsec QuickCheck text
+       ];
        homepage = "https://github.com/myfreeweb/http-link-header";
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
        license = stdenv.lib.licenses.publicDomain;
@@ -73266,8 +75143,10 @@ self: {
        pname = "http-media";
        version = "0.6.2";
        sha256 = "0r3xghxhnwpc8gblcj6l5sq3lxzra7280vlph1s4xfqxknv69km7";
-       buildDepends = [ base bytestring case-insensitive containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers
+       ];
+       testHaskellDepends = [
          base bytestring case-insensitive containers QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -73286,7 +75165,7 @@ self: {
        sha256 = "127fy54km9js02kp5ws9pyg2d1qc2ar1342g1w2p3h8086il6mp7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers explicit-exception HTTP lazyio network
          parsec transformers utility-ht
        ];
@@ -73306,7 +75185,7 @@ self: {
        pname = "http-proxy";
        version = "0.0.12";
        sha256 = "0k6qmr3xrky1w90if2jvzc9bgifxifxkwbymw8zndgxs976zpdig";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder blaze-builder-conduit
          bytestring bytestring-lexing case-insensitive conduit ghc-prim
          http-conduit http-types lifted-base network resourcet tls
@@ -73327,8 +75206,8 @@ self: {
        pname = "http-querystring";
        version = "1.0";
        sha256 = "0n21x8w9pggyp5lbgww70g7860k6n35csq669s9gvrmv1n22k7m6";
-       buildDepends = [ base bytestring containers http-types ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers http-types ];
+       testHaskellDepends = [
          base bytestring containers doctest hspec http-types QuickCheck
        ];
        homepage = "https://github.com/worksap-ate/http-querystring";
@@ -73346,16 +75225,16 @@ self: {
      mkDerivation {
        pname = "http-reverse-proxy";
        version = "0.4.2";
-       revision = "1";
        sha256 = "10cd6h1n1fp55jpwcp4nnk64yslxy2cnm7rhzd25xvi5fkhfl61i";
+       revision = "1";
        editedCabalFile = "3b7a6c0b55cd7eb98d3f020ac08cec7ca052b8ec716f76cfabdcbaef27645db7";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base blaze-builder bytestring case-insensitive conduit
          conduit-extra containers data-default-class http-client http-types
          lifted-base monad-control network resourcet streaming-commons text
          transformers wai wai-logger word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring conduit conduit-extra hspec
          http-conduit http-types lifted-base network resourcet
          streaming-commons transformers wai warp
@@ -73373,7 +75252,7 @@ self: {
        pname = "http-server";
        version = "1.0.6";
        sha256 = "1da385swv7x92d8cpdz28bdp38a8h058svbbpnkqpvrs0m0lgm2w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HTTP mime network network-uri text unix url utf8-string
        ];
        homepage = "https://github.com/GaloisInc/http-server";
@@ -73389,7 +75268,7 @@ self: {
        sha256 = "0asb499rkxr3jzyv5abiqcjx7jdsxkqndcaiqrlx7sfb6f3rccdv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73408,13 +75287,13 @@ self: {
        pname = "http-streams";
        version = "0.8.3.3";
        sha256 = "0cp2jdalg0vzikl6v4yhyflllv7yqskph5gp5ahirawhcj9rfi9z";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive directory HsOpenSSL http-common io-streams mtl
          network network-uri openssl-streams text transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
          bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
          hspec-expectations http-common HUnit io-streams
@@ -73437,10 +75316,11 @@ self: {
        sha256 = "06y7nikmyr9jrcrnsqy63p1zv1nv0z1h1bmbryr4dkh5pisfmr83";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-client lens lens-aeson mtl tasty
          tasty-hunit text time wreq
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/openbrainsrc/http-test";
        description = "Test framework for HTTP APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -73456,10 +75336,10 @@ self: {
        pname = "http-types";
        version = "0.8.6";
        sha256 = "1q1ni88rs8d79xnk1x2jaf3848ygxlfhpvv4gw46k08lw29ihfxh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base blaze-builder bytestring case-insensitive text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring doctest hspec QuickCheck
          quickcheck-instances text
        ];
@@ -73474,7 +75354,7 @@ self: {
        pname = "http-wget";
        version = "0.6.2.3";
        sha256 = "1sbg4gpx8ikaxb15wflm7fnjnkr32fj07bva62z54dsm630s37fx";
-       buildDepends = [ base failure process transformers ];
+       libraryHaskellDepends = [ base failure process transformers ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/http-wget/tree/master";
        description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)";
@@ -73493,12 +75373,16 @@ self: {
        sha256 = "075j4xhfmgiij431zn5mzmq6m40fj74l5f5wckqa22aq2ay19p8c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty array base bytestring bytestring-builder
-         containers directory filepath hex mwc-random stm text
-         unordered-containers vector word8
+       libraryHaskellDepends = [
+         array base bytestring bytestring-builder containers mwc-random stm
+         unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         containers directory filepath hex text unordered-containers vector
+         word8
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty array base bytestring bytestring-builder
          containers directory doctest filepath Glob hex hspec mwc-random stm
          text unordered-containers vector word8
@@ -73515,7 +75399,7 @@ self: {
        sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network network-uri ];
+       libraryHaskellDepends = [ base network network-uri ];
        description = "A simple web-server with an interact style API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73529,12 +75413,12 @@ self: {
        pname = "https-everywhere-rules";
        version = "0.1.0";
        sha256 = "170ynbjv8dz221rs26i4d0kwkv3h4ljmx5azslc9jj9lzgb42knp";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base errors functor-infix http-client
          https-everywhere-rules-raw lens network pipes string-conversions
          taggy-lens text text-icu
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base errors functor-infix hspec http-client
          https-everywhere-rules-raw lens network pipes string-conversions
          taggy-lens text text-icu
@@ -73552,12 +75436,13 @@ self: {
        pname = "https-everywhere-rules-raw";
        version = "4.0";
        sha256 = "0zm3znn42nzh9dlpjjn38nsz8rsb0gzl5rv6ngii1vfq534sddy6";
-       buildDepends = [ base directory filepath functor-infix text ];
+       libraryHaskellDepends = [
+         base directory filepath functor-infix text
+       ];
        jailbreak = true;
        homepage = "https://github.com/fmap/https-everywhere-rules-raw";
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "httpspec" = callPackage
@@ -73569,7 +75454,7 @@ self: {
        pname = "httpspec";
        version = "0.3.0.1";
        sha256 = "1vghkrs72cja9x2lqshh6nhsdp8f68s3wh7zljn86011h4widd5v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bidispec bytestring cgi containers encoding filepath HTTP hxt
          hxthelper MissingH mtl network pretty safe
        ];
@@ -73586,7 +75471,7 @@ self: {
        sha256 = "1il1d8b7xyv59f7xim337zyh88s1qchsrdhrgmv322hqf73n6rh2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ alsa-pcm base carray fft gloss ];
+       executableHaskellDepends = [ alsa-pcm base carray fft gloss ];
        jailbreak = true;
        description = "harmonic analyser and tuner for musical instruments";
        license = stdenv.lib.licenses.bsd3;
@@ -73601,12 +75486,11 @@ self: {
        sha256 = "12g41q821yh43nslb96jpqyb58k1lz6g0a6vmqw202m0hv94npdb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base OpenGL random SDL ];
+       executableHaskellDepends = [ base OpenGL random SDL ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hub" = callPackage
@@ -73619,7 +75503,7 @@ self: {
        sha256 = "10hcaddk1mqzyl1fmzsvzqq141lg9a43295158ckmkbnx8i1rxv1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory fgl filepath hexpat
          process regex-compat unix utf8-string
        ];
@@ -73634,7 +75518,7 @@ self: {
        pname = "hubigraph";
        version = "0.3.2";
        sha256 = "19mxblqy3bchhrk725x4kmpa9hidjzj0d0sqhx34smqw7v36x814";
-       buildDepends = [ base containers haxr mtl ];
+       libraryHaskellDepends = [ base containers haxr mtl ];
        homepage = "http://ooxo.org/hubigraph/";
        description = "A haskell wrap for Ubigraph";
        license = stdenv.lib.licenses.bsd3;
@@ -73650,11 +75534,16 @@ self: {
        sha256 = "135q3nzchncbkx4bpx7p1glwnc9aw5j77f3xnr0d6llfba1bw79l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring Cabal containers ghc ghc-paths haskell98 hint
+         mtl old-time
+       ];
+       librarySystemDepends = [ ruby ];
+       executableHaskellDepends = [
          array base bytestring Cabal containers ghc ghc-paths haskell98 hint
          mtl old-time process
        ];
-       extraLibraries = [ ruby ];
+       executableSystemDepends = [ ruby ];
        jailbreak = true;
        description = "Support library for Hubris, the Ruby <=> Haskell bridge";
        license = "unknown";
@@ -73667,7 +75556,7 @@ self: {
        pname = "huffman";
        version = "1.0.1";
        sha256 = "191llv4s64jrh8cma43r5z740avd5picja5fr45l4mi2gwmkx4s3";
-       buildDepends = [ base containers fingertree ];
+       libraryHaskellDepends = [ base containers fingertree ];
        description = "Pure Haskell implementation of the Huffman encoding algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73680,7 +75569,7 @@ self: {
        pname = "hugs2yc";
        version = "0.1.1";
        sha256 = "1bmcdjwh08q84ijx7hdfraz0wqq0wwgf5pj0jlmdq5rbpb9c547a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl parsec uniplate ycextra
          yhccore
        ];
@@ -73702,7 +75591,12 @@ self: {
        sha256 = "0vq0sb11kiiry67bh5ish1cwj8sf6rgf70p1zrm462zsqgv9wkk2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive cmdargs ConfigFile
+         containers Crypto directory fastirc filepath ghc-prim monad-extras
+         mtl network split strict text time unix utf8-string
+       ];
+       executableHaskellDepends = [
          aeson base bytestring case-insensitive cmdargs ConfigFile
          containers Crypto directory fastirc filepath ghc-prim monad-extras
          mtl network split strict text time unix utf8-string
@@ -73726,7 +75620,7 @@ self: {
        sha256 = "1wb9bn83lrn6cpp0gkpc7v40m9wlx8i8zqijm4dmd23zzmrlrxhr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder bytestring case-insensitive ConfigFile
          containers directory filepath HaXml http-types hxt MissingH mtl
          network system-fileio system-filepath system-uuid text transformers
@@ -73746,7 +75640,8 @@ self: {
        sha256 = "0wzy2gjxpqr0j2cfnl88ixccm8dv3z9cql1zpzr4ph6g37dc9w60";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cairo gtk haskell98 HUnit ];
+       libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ];
+       executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/kwallmar/hunit_gui/home";
        description = "A GUI testrunner for HUnit";
@@ -73760,7 +75655,7 @@ self: {
        pname = "hunit-parsec";
        version = "0.3";
        sha256 = "089l8n1yjcf6sypr76r8p0djwpcqaa5xdk1d0m2k9piig9fnzr40";
-       buildDepends = [ base HUnit parsec ];
+       libraryHaskellDepends = [ base HUnit parsec ];
        description = "An HUnit Testable instance for Parsec parser unit tests";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73771,8 +75666,8 @@ self: {
        pname = "hunit-rematch";
        version = "0.1.0.1";
        sha256 = "1xj5f6l8nfanbf0xdwl2j2na45w5h0spi9a8pxqgpxx2rak145gs";
-       buildDepends = [ base HUnit rematch ];
-       testDepends = [ base hspec HUnit rematch ];
+       libraryHaskellDepends = [ base HUnit rematch ];
+       testHaskellDepends = [ base hspec HUnit rematch ];
        jailbreak = true;
        homepage = "github.com/tcrayford/rematch";
        description = "HUnit support for rematch";
@@ -73790,7 +75685,7 @@ self: {
        sha256 = "0k07dbqrlnhg3a4yk25gc665z43hcl57kblr20mzryw0cf9zdsci";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath monads-fd parsec pcre-light
          process split
        ];
@@ -73812,13 +75707,13 @@ self: {
        pname = "hunt-searchengine";
        version = "0.3.0.1";
        sha256 = "1y8pq158jwdl3zq5f0xdgszihp8z181lhwd92d66ckw9nh0sllw6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base binary bytestring containers data-default
          data-r-tree data-stringmap deepseq dlist filepath hslogger
          hxt-regex-xmlschema monad-parallel mtl murmur-hash parsec text time
          transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base binary containers data-default data-r-tree directory
          HUnit monad-parallel mtl old-locale QuickCheck random
          test-framework test-framework-hunit test-framework-quickcheck2 text
@@ -73844,7 +75739,7 @@ self: {
        sha256 = "19bbn97pj01sbqbjkgh82hiwzxfybnnm29wj4irgicab0d72jvg6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cmdargs containers data-default deepseq ekg-core hamlet hslogger
          http-types hunt-searchengine mtl scotty shakespeare-js text wai
@@ -73869,7 +75764,7 @@ self: {
        sha256 = "1pmlg06jipmc99v7clz2q7x3bh4ndar55595fx729khnjrbiy9bz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base binary bytestring conduit conduit-extra
          containers csv-conduit data-default docopt hslogger http-types
          hunt-client hunt-searchengine mtl resourcet string-conversions text
@@ -73890,7 +75785,9 @@ self: {
        sha256 = "13hg6v7vk72yiy0qhwm1f3ksm85vf56a3g5mm62kpbb0lcxvvqwf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bytestring containers kangaroo ];
+       executableHaskellDepends = [
+         array base bytestring containers kangaroo
+       ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
        description = "Extract function names from Windows DLLs";
@@ -73909,9 +75806,13 @@ self: {
        sha256 = "1y8b15cgiky6kasx21q4gw4h40scyby4mkqynq96kaq2yrrayd5q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring containers directory filepath ghc-paths
-         haskeline knob mtl parsec process time transformers utf8-string
+       libraryHaskellDepends = [
+         array base bytestring containers directory haskeline knob mtl
+         parsec process time transformers utf8-string
+       ];
+       executableHaskellDepends = [
+         array base containers directory filepath ghc-paths haskeline mtl
+         parsec process transformers
        ];
        homepage = "http://justinethier.github.com/husk-scheme";
        description = "R5RS Scheme interpreter, compiler, and library";
@@ -73927,7 +75828,7 @@ self: {
        pname = "husk-scheme-libs";
        version = "0.0.1";
        sha256 = "18c8ww2f7bgxbh33agcrpb36xgjn7zs509ji7q968hnwqnx9vgcj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers husk-scheme json mtl transformers
        ];
        homepage = "http://justinethier.github.com/husk-scheme";
@@ -73946,7 +75847,7 @@ self: {
        sha256 = "136sskjkb4nwsqdmgyly207zv4kv27bxf633p2wl869wcr6kkdbg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl old-locale parsec readline time
        ];
        jailbreak = true;
@@ -73967,7 +75868,7 @@ self: {
        sha256 = "12rvlagd0n946x05wnyixd1b16ls9ynagccw2bc77fjqfb0d9shi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring connection flow http-client http-conduit
          http-types network rainbow regex-compat text time transformers
          websockets wuss
@@ -73986,7 +75887,7 @@ self: {
        sha256 = "1wwphyg2fm34gxn7s7a4q7p8fyab3c7am4fmw1x50gkrmkwgd72s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec parsec-numbers ];
+       executableHaskellDepends = [ base parsec parsec-numbers ];
        homepage = "https://github.com/steshaw/huttons-razor";
        description = "Quick implemention of Hutton's Razor";
        license = stdenv.lib.licenses.bsd2;
@@ -73998,7 +75899,7 @@ self: {
        pname = "huzzy";
        version = "0.1.5.5";
        sha256 = "0i8h380nszd7hk7x6l7qx0ri6k12551li2m77gspzakcf47l6ldp";
-       buildDepends = [ base easyplot ];
+       libraryHaskellDepends = [ base easyplot ];
        jailbreak = true;
        description = "Fuzzy logic library with support for T1, IT2, GT2";
        license = stdenv.lib.licenses.mit;
@@ -74011,8 +75912,8 @@ self: {
        pname = "hvect";
        version = "0.2.0.0";
        sha256 = "01iarjnwm5syhmf6552g3p9dc05nqc74r4nfmagajgv7fnlsf3ri";
-       buildDepends = [ base ];
-       testDepends = [ base HTF ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HTF ];
        homepage = "https://github.com/agrafix/hvect";
        description = "Simple strict heterogeneous lists";
        license = stdenv.lib.licenses.mit;
@@ -74028,7 +75929,7 @@ self: {
        sha256 = "0ibxdyg9r5n3dc8szhb8fvdjsbgpbwdah2aahn0kagi1zxw24fl2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring haskeline http-conduit http-types mtl regex-compat
          unix
        ];
@@ -74044,10 +75945,10 @@ self: {
        pname = "hweblib";
        version = "0.6.3";
        sha256 = "03dmx5irlsyb3b9zg2r6nz947sslizkn0nlk65ldb5n4m8my33hy";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers mtl text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers HUnit mtl transformers
        ];
        homepage = "http://github.com/aycanirican/hweblib";
@@ -74065,7 +75966,7 @@ self: {
        sha256 = "0d0f0bwbfcmbm1jx6m90qxxjad2adz5k0k51i4jh5ylrfa9xfs7r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory haskell98 html mtl network old-time
          regex-compat text unix
        ];
@@ -74083,8 +75984,8 @@ self: {
        pname = "hwsl2";
        version = "0.3.2.0";
        sha256 = "0y3k9xlhzvscbwzrhxgiqf9s3724zak1nbnf6lcaynpzk4p8jmm1";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring Cabal cabal-test-quickcheck QuickCheck
          quickcheck-properties
        ];
@@ -74100,7 +76001,7 @@ self: {
        pname = "hwsl2-bytevector";
        version = "0.1.0.0";
        sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9";
-       buildDepends = [ base bytestring fingertree hwsl2 ];
+       libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
        homepage = "https://github.com/srijs/hwsl2-haskell-bytevector";
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
        license = stdenv.lib.licenses.mit;
@@ -74112,7 +76013,9 @@ self: {
        pname = "hwsl2-reducers";
        version = "0.1.0.0";
        sha256 = "1q7phb2v11gfwlvm0f0jrsm7gc7ga9awd9cp0kkxm2k20mggrg7x";
-       buildDepends = [ base bytestring hwsl2 reducers semigroups ];
+       libraryHaskellDepends = [
+         base bytestring hwsl2 reducers semigroups
+       ];
        homepage = "https://github.com/srijs/hwsl2-reducers";
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
        license = stdenv.lib.licenses.mit;
@@ -74124,7 +76027,7 @@ self: {
        pname = "hx";
        version = "0.4";
        sha256 = "04wkgql6gs9glmp9kj5awis5b15vmwgkyqzi814k9514k3c7c1rb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell extras (missing utility functions)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -74139,7 +76042,7 @@ self: {
        sha256 = "1fri1xcs95ynkf471hrkai0k8kvxhx77ra07yripycnlpa9fcwj9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base fclabels network network-protocol-xmpp text transformers
          xml-types
        ];
@@ -74162,13 +76065,14 @@ self: {
        sha256 = "1fk4cgk4ncf5v7k8hankwb49ablfcxj1rcw64ka6pz3jrz4sablq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo cmdargs configurator containers Diff
          directory double-conversion dyre fclabels filepath gtk
          monad-coroutine mtl poppler strict template-haskell time
          transformers TypeCompose xournal-builder xournal-parser
          xournal-render xournal-types
        ];
+       executableHaskellDepends = [ base cmdargs ];
        jailbreak = true;
        homepage = "http://ianwookim.org/hxournal";
        description = "A pen notetaking program written in haskell";
@@ -74185,12 +76089,12 @@ self: {
        pname = "hxt";
        version = "9.3.1.15";
        sha256 = "0q35jqi3g5qfwzp2p2hm22lkmbmk08bx2qvpgq4731zm48y7ngkj";
-       buildDepends = [
+       configureFlags = [ "-fnetwork-uri" ];
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath HUnit
          hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
          parsec
        ];
-       configureFlags = [ "-fnetwork-uri" ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "A collection of tools for processing XML with Haskell";
        license = stdenv.lib.licenses.mit;
@@ -74204,7 +76108,7 @@ self: {
        pname = "hxt-binary";
        version = "0.0.2";
        sha256 = "1hbby0lcb9kis05zsf5rgyisa1qwryvv8zf91q9fi0j0d7s3rasw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bzlib deepseq haskell98 hxt
        ];
        jailbreak = true;
@@ -74222,7 +76126,7 @@ self: {
        pname = "hxt-cache";
        version = "9.1.0.1";
        sha256 = "1ki3h9x186c6p1c6hnczr0a1idil6kfvs2jl9d9hmzp9rlmh2w7l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath hxt
          SHA time unix
        ];
@@ -74237,7 +76141,7 @@ self: {
        pname = "hxt-charproperties";
        version = "9.2.0.1";
        sha256 = "1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "Character properties and classes for XML and Unicode";
        license = stdenv.lib.licenses.mit;
@@ -74251,7 +76155,7 @@ self: {
        sha256 = "0z8qswykx0k965n2mfp87b6h8fixrydvjg98d8h37bclfsqzj15w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hxt parsec split ];
+       libraryHaskellDepends = [ base hxt parsec split ];
        homepage = "https://github.com/redneb/hxt-css";
        description = "CSS selectors for HXT";
        license = stdenv.lib.licenses.bsd3;
@@ -74263,7 +76167,7 @@ self: {
        pname = "hxt-curl";
        version = "9.1.1.1";
        sha256 = "1sn5ngzz5qszdb3anbpqbjdijz29gmrwjrg9vsmrqsdqz65wrhfd";
-       buildDepends = [ base bytestring curl hxt parsec ];
+       libraryHaskellDepends = [ base bytestring curl hxt parsec ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "LibCurl interface for HXT";
        license = "unknown";
@@ -74275,7 +76179,7 @@ self: {
        pname = "hxt-expat";
        version = "9.1.1";
        sha256 = "1mi2f2i31nqjqzwl82iypm1qngrpxp7lz506pjgqfbn840yc9n8h";
-       buildDepends = [ base bytestring hexpat hxt ];
+       libraryHaskellDepends = [ base bytestring hexpat hxt ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Expat parser for HXT";
        license = "unknown";
@@ -74287,7 +76191,7 @@ self: {
        pname = "hxt-extras";
        version = "0.4.1";
        sha256 = "1bv8kcra2vgjbp7k0yczlrfbjh7ib2xixaqpnnd60hq84878nzb1";
-       buildDepends = [ base hxt ];
+       libraryHaskellDepends = [ base hxt ];
        homepage = "http://code.google.com/p/hxt-extras/";
        description = "Extra functions for HXT";
        license = stdenv.lib.licenses.bsd3;
@@ -74301,7 +76205,7 @@ self: {
        pname = "hxt-filter";
        version = "8.4.2";
        sha256 = "0jxiph7c59dc2fy5c2ygii1xlcmh8s5zb8c0hwvjkj0hzfjznra0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath haskell98 HTTP HUnit hxt network
          parsec process
        ];
@@ -74320,7 +76224,7 @@ self: {
        pname = "hxt-http";
        version = "9.1.5.2";
        sha256 = "02yxvzczv89j518b94wh8m4dsmnymzxgv9158m7w6lqxk41rv8bg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HTTP hxt network network-uri parsec
        ];
        homepage = "https://github.com/UweSchmidt/hxt";
@@ -74334,7 +76238,7 @@ self: {
        pname = "hxt-pickle-utils";
        version = "0.1.0.3";
        sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx";
-       buildDepends = [ base hxt mtl ];
+       libraryHaskellDepends = [ base hxt mtl ];
        homepage = "https://github.com/silkapp/hxt-pickle-utils";
        description = "Utility functions for using HXT picklers";
        license = stdenv.lib.licenses.bsd3;
@@ -74348,8 +76252,10 @@ self: {
        pname = "hxt-regex-xmlschema";
        version = "9.2.0.2";
        sha256 = "1hkcd5p7rhv8z2vlcpd1gcdiyni28m8k8yd5fnxw8a9bvrnnfi27";
-       buildDepends = [ base bytestring hxt-charproperties parsec text ];
-       testDepends = [ base bytestring HUnit parsec text ];
+       libraryHaskellDepends = [
+         base bytestring hxt-charproperties parsec text
+       ];
+       testHaskellDepends = [ base bytestring HUnit parsec text ];
        homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.mit;
@@ -74363,7 +76269,7 @@ self: {
        pname = "hxt-relaxng";
        version = "9.1.5.5";
        sha256 = "07s47z5xhd0pdzz8mr9vg78qxay450sm8ljycpprq7y7mgh2vzhf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hxt hxt-charproperties hxt-regex-xmlschema
          network-uri parsec
        ];
@@ -74380,7 +76286,9 @@ self: {
        pname = "hxt-tagsoup";
        version = "9.1.3";
        sha256 = "1rp499j6w3h9xfxqyw2fn05ffq3z0wg1r9h2c205m37mb8visq77";
-       buildDepends = [ base hxt hxt-charproperties hxt-unicode tagsoup ];
+       libraryHaskellDepends = [
+         base hxt hxt-charproperties hxt-unicode tagsoup
+       ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "TagSoup parser for HXT";
        license = "unknown";
@@ -74392,7 +76300,7 @@ self: {
        pname = "hxt-unicode";
        version = "9.0.2.4";
        sha256 = "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v";
-       buildDepends = [ base hxt-charproperties ];
+       libraryHaskellDepends = [ base hxt-charproperties ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
        license = stdenv.lib.licenses.mit;
@@ -74405,7 +76313,9 @@ self: {
        pname = "hxt-xpath";
        version = "9.1.2.2";
        sha256 = "0wlq9s01icalnvjkkilx5zaqp3ff4v5limj1xy8i18qpzjspqdsh";
-       buildDepends = [ base containers directory filepath hxt parsec ];
+       libraryHaskellDepends = [
+         base containers directory filepath hxt parsec
+       ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "The XPath modules for HXT";
        license = "unknown";
@@ -74419,7 +76329,7 @@ self: {
        pname = "hxt-xslt";
        version = "9.1.1.1";
        sha256 = "020k7zjwbad5j2zbc0cgp8f5lggws5jijlcwmi71p510n0f51y9j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath hxt hxt-xpath parsec
        ];
        homepage = "https://github.com/UweSchmidt/hxt";
@@ -74433,7 +76343,7 @@ self: {
        pname = "hxthelper";
        version = "0.2.2";
        sha256 = "1il21mqmvvfdny5ksnyixj1wqhabvxqhccd6vj4dbzlvvf5yb6k1";
-       buildDepends = [ base bytestring encoding hxt mtl ];
+       libraryHaskellDepends = [ base bytestring encoding hxt mtl ];
        jailbreak = true;
        description = "Helper functions for HXT";
        license = "LGPL";
@@ -74446,7 +76356,7 @@ self: {
        pname = "hxweb";
        version = "0.1";
        sha256 = "0faiyflyhmn2y0bs920qgm9xkj9i69lzxhsg4rxffal989gi32z8";
-       buildDepends = [ base cgi fastcgi libxml mtl xslt ];
+       libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74460,7 +76370,7 @@ self: {
        sha256 = "0zv9ycgf9sii59q86s04m6krjyjgmrqaxz4lyvwa58b7a886wcmv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers HUnit random ];
+       executableHaskellDepends = [ base containers HUnit random ];
        homepage = "http://github.com/DamienCassou/HYahtzee";
        description = "A Yahtzee game implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -74477,7 +76387,7 @@ self: {
        sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-html bytestring cmdargs directory filepath
          highlighting-kate mtl pandoc regex-pcre-builtin text
          unordered-containers
@@ -74486,7 +76396,6 @@ self: {
        homepage = "http://sourrust.github.io/hyakko/";
        description = "Literate-style Documentation Generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hybrid" = callPackage
@@ -74497,7 +76406,9 @@ self: {
        sha256 = "05v69csnz7g9ikymnrmzjqhdwlrfsb44pbv8mzddgk6my9ddlb9w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers haskell98 mtl parsec ];
+       executableHaskellDepends = [
+         base containers haskell98 mtl parsec
+       ];
        homepage = "http://repos.mine.nu/davve/darcs/hybrid";
        description = "A implementation of a type-checker for Lambda-H";
        license = stdenv.lib.licenses.bsd3;
@@ -74509,14 +76420,13 @@ self: {
      mkDerivation {
        pname = "hybrid-vectors";
        version = "0.2";
-       revision = "1";
        sha256 = "0xdrna6jgn4l0idhv0bn6ic8m7g8pps23ky2f75zwgpqrkflnb41";
+       revision = "1";
        editedCabalFile = "43a2c8cd2fa6abe7dc526dd99ef9d296394922a3d92ced8138072250fe75eb35";
-       buildDepends = [ base deepseq primitive vector ];
+       libraryHaskellDepends = [ base deepseq primitive vector ];
        homepage = "http://github.com/ekmett/hybrid-vectors";
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydra-hs" = callPackage
@@ -74525,9 +76435,9 @@ self: {
        pname = "hydra-hs";
        version = "1.0.0.2";
        sha256 = "18sxqangnl3gbb77dsg036ymsjj6w7zws2v43qnp3cfi0ksjxx8s";
-       buildDepends = [ base hmatrix ];
-       testDepends = [ base ];
-       extraLibraries = [ sixense_x64 ];
+       libraryHaskellDepends = [ base hmatrix ];
+       librarySystemDepends = [ sixense_x64 ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/mruegenberg/hydra-hs";
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
@@ -74548,11 +76458,15 @@ self: {
        sha256 = "16cgp3a475pzy0zasvfv3cvkvgc84g6p960sykk7y4aki0n3769i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         async base bytestring containers directory io-streams mtl ncurses
+         process random semigroups text time transformers unix
+       ];
+       executableHaskellDepends = [
          async base bytestring containers directory filepath io-streams mtl
          ncurses process random semigroups text time transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring containers directory HUnit io-streams mtl
          ncurses process QuickCheck random semigroups test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
@@ -74562,7 +76476,6 @@ self: {
        homepage = "https://github.com/rrnewton/hydra-print";
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen" = callPackage
@@ -74573,8 +76486,10 @@ self: {
        pname = "hydrogen";
        version = "0.3.0.0";
        sha256 = "0aq4svvwcys06mv172zz4yp624f6mnjg94lycj4r66xhm8m3fv4i";
-       buildDepends = [ base bytestring containers mtl pretty text ];
-       testDepends = [ base Cabal containers mtl QuickCheck ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl pretty text
+       ];
+       testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
        homepage = "https://www.github.com/ktvoelker/hydrogen";
        description = "An alternate Prelude";
        license = stdenv.lib.licenses.gpl3;
@@ -74591,7 +76506,7 @@ self: {
        sha256 = "03hz4z964zg1b5nzywymrd1m3ss081rq6nnbqwcgbwabx6wd209b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base hydrogen-cli-args hydrogen-data hydrogen-multimap
          hydrogen-parsing hydrogen-prelude hydrogen-syntax
        ];
@@ -74609,7 +76524,7 @@ self: {
        pname = "hydrogen-cli-args";
        version = "0.17";
        sha256 = "1wapq5lfyvm09sl9n7zhiaxpb8iapirvizq3ak9rl17vy4iz5xl4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hydrogen-multimap hydrogen-prelude
        ];
        jailbreak = true;
@@ -74625,7 +76540,7 @@ self: {
        pname = "hydrogen-data";
        version = "0.14";
        sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88";
-       buildDepends = [ base hydrogen-parsing hydrogen-prelude ];
+       libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
        jailbreak = true;
        homepage = "https://scravy.de/hydrogen-data/";
        description = "Hydrogen Data";
@@ -74639,7 +76554,7 @@ self: {
        pname = "hydrogen-multimap";
        version = "0.3";
        sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93";
-       buildDepends = [ base containers ghc-prim ];
+       libraryHaskellDepends = [ base containers ghc-prim ];
        homepage = "https://scravy.de/hydrogen-multimap/";
        description = "Hydrogen Multimap";
        license = stdenv.lib.licenses.mit;
@@ -74651,7 +76566,9 @@ self: {
        pname = "hydrogen-parsing";
        version = "0.17";
        sha256 = "0m9rliry031lr7bn4xkbjmar288zcrnpsbnjdyxs13v675bh7h29";
-       buildDepends = [ base containers hydrogen-prelude parsec ];
+       libraryHaskellDepends = [
+         base containers hydrogen-prelude parsec
+       ];
        jailbreak = true;
        homepage = "https://scravy.de/hydrogen-parsing/";
        description = "Hydrogen Parsing Utilities";
@@ -74669,7 +76586,7 @@ self: {
        pname = "hydrogen-prelude";
        version = "0.20";
        sha256 = "18g3r95ssg385zqzny3137ms0ppv7d33xgvc4gvxkijv8cgj1697";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cereal containers directory filepath
          hashable hydrogen-multimap hydrogen-version network process random
          regex-base regex-tdfa strict text time transformers uuid
@@ -74686,7 +76603,7 @@ self: {
        pname = "hydrogen-prelude-parsec";
        version = "0.17";
        sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh";
-       buildDepends = [ base hydrogen-prelude parsec ];
+       libraryHaskellDepends = [ base hydrogen-prelude parsec ];
        jailbreak = true;
        homepage = "http://scravy.de/hydrogen-prelude-parsec/";
        description = "Hydrogen Prelude /w Parsec";
@@ -74702,7 +76619,7 @@ self: {
        pname = "hydrogen-syntax";
        version = "0.17";
        sha256 = "17j6iq2fh1s3vwkzd5js786abk1zkmj4dfg425d290k4nvdl08dv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hydrogen-parsing hydrogen-prelude nicify parsec
          uuid
        ];
@@ -74719,7 +76636,9 @@ self: {
        pname = "hydrogen-util";
        version = "0.8";
        sha256 = "14z2nf2af0ydqr2sm4r4cn252qn0hbacdc4z1lhyjnin66djb1a8";
-       buildDepends = [ base containers hydrogen-prelude parsec time ];
+       libraryHaskellDepends = [
+         base containers hydrogen-prelude parsec time
+       ];
        jailbreak = true;
        homepage = "https://scravy.de/hydrogen-util/";
        description = "Hydrogen Tools";
@@ -74733,7 +76652,7 @@ self: {
        pname = "hydrogen-version";
        version = "1.4";
        sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://scravy.de/hydrogen-version/";
        description = "Hydrogen Version Type";
        license = stdenv.lib.licenses.mit;
@@ -74748,7 +76667,7 @@ self: {
        pname = "hyena";
        version = "0.1.0.1";
        sha256 = "0899lw0vyvcw03ph4w717rxach2ncb69xfn9387j7fl0s01ch0ji";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          mtl network network-bytestring unix
        ];
@@ -74767,7 +76686,7 @@ self: {
        pname = "hylolib";
        version = "1.4.0";
        sha256 = "160k8lp6r2rbgj7qz3msa5sd5yxkdb5rjlhwd5lqbcxw2sry0vj2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl pretty QuickCheck random uniplate
        ];
        jailbreak = true;
@@ -74784,7 +76703,7 @@ self: {
        sha256 = "0xynx72xpb84g19gnsgq00gwj3ycfgk5qgd9j949b6k3fqr3n71w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hylolib mtl ];
+       executableHaskellDepends = [ base hylolib mtl ];
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hylotab.php";
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
@@ -74799,7 +76718,9 @@ self: {
        sha256 = "1pn14f3hjcxa5bww0pg2irqmbvfs7f3vfwl8z87jmxfyydgffgnh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers hylolib mtl uniplate ];
+       executableHaskellDepends = [
+         base containers hylolib mtl uniplate
+       ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74815,7 +76736,7 @@ self: {
        sha256 = "0hvgxsrq1aws5c97w1lrk87d74kn8796vmclkdxhajfammj6ccz9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing extensible-exceptions mtl network
          pipes pretty
        ];
@@ -74833,7 +76754,7 @@ self: {
        pname = "hyperfunctions";
        version = "0";
        sha256 = "0q452g2qzlw961zwkdihwi8d8hknxavfgd8vkjdhiazx5anbqzkm";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base distributive profunctors transformers
        ];
        homepage = "http://github.com/ekmett/hyperfunctions";
@@ -74852,19 +76773,18 @@ self: {
        pname = "hyperloglog";
        version = "0.3.4";
        sha256 = "122qdkg1xwyhbxll5zimp8w6j79i30102g3iqf41lrbrx0xllpag";
-       buildDepends = [
+       libraryHaskellDepends = [
          approximate base binary bits bytes cereal cereal-vector comonad
          deepseq distributive hashable hashable-extras lens reflection
          safecopy semigroupoids semigroups siphash tagged vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperpublic" = callPackage
@@ -74875,7 +76795,7 @@ self: {
        pname = "hyperpublic";
        version = "0.1.1";
        sha256 = "07jz89x0daps5rkmccjprrbkwn5mzdskp2yv8asfnmcyir36lmzd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring http-enumerator http-types
        ];
        jailbreak = true;
@@ -74891,7 +76811,7 @@ self: {
        pname = "hyphenate";
        version = "0.1";
        sha256 = "0pnp5d1a0hwn6jm8v6i7yygd831q2bvsz6qb9n8db8n17lfxikx4";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://www.alpheccar.org";
        description = "Text hyphenation algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -74905,10 +76825,10 @@ self: {
        pname = "hyphenation";
        version = "0.6";
        sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers unordered-containers zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory doctest filepath unordered-containers
        ];
        jailbreak = true;
@@ -74929,13 +76849,13 @@ self: {
        pname = "hypher";
        version = "0.1.5";
        sha256 = "0q5lpza6l4aqd85i1wxkkrdd3j9kk2k8xd0l6szpgkv87b41qfhk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base monad-control mtl resourcet
          scientific text transformers transformers-base unordered-containers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal data-default hashable HTTP http-conduit
          http-types HUnit lifted-base monad-control mtl QuickCheck resourcet
          scientific test-framework test-framework-hunit
@@ -74957,12 +76877,12 @@ self: {
        pname = "hzk";
        version = "2.1.0";
        sha256 = "1jcvha3wzf6wka1zpmsvg1j48jl85v1s4p0mryfhjqz7l9h3wkac";
-       buildDepends = [ base bytestring resource-pool time ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring resource-pool time ];
+       librarySystemDepends = [ zookeeper_mt ];
+       testHaskellDepends = [
          base bytestring resource-pool tasty tasty-hunit time
        ];
-       buildTools = [ zookeeper_mt ];
-       extraLibraries = [ zookeeper_mt ];
+       testSystemDepends = [ zookeeper_mt ];
        homepage = "http://github.com/dgvncsz0f/hzk";
        description = "Haskell client library for Apache Zookeeper";
        license = stdenv.lib.licenses.bsd3;
@@ -74978,12 +76898,12 @@ self: {
        pname = "hzulip";
        version = "1.1.1.1";
        sha256 = "1gxywjng4mv0g13yap2a0i62l8wlbncj8ajj87ca6p8aikrd6cm1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit exceptions http-client
          http-client-tls http-types lens lens-aeson mtl stm stm-conduit text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base bytestring conduit exceptions hspec http-client
          http-client-tls http-types lens lens-aeson mtl raw-strings-qq
          scotty stm stm-conduit text transformers
@@ -75002,7 +76922,7 @@ self: {
        pname = "i18n";
        version = "0.3";
        sha256 = "0l1z9acg1nnxs66w70vyhlj3wx2xg7w0lja59yp5awmh98815q1p";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath mtl old-locale old-time
          parsec utf8-string
        ];
@@ -75020,7 +76940,7 @@ self: {
        pname = "iCalendar";
        version = "0.4.0.3";
        sha256 = "0dbs9s68fpx67ngjnd1p8c9n421bzn6a034dr6i3bhg2cn0s01mw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive containers
          data-default mime mtl network network-uri old-locale parsec text
          time
@@ -75028,7 +76948,6 @@ self: {
        homepage = "http://github.com/chrra/iCalendar";
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iException" = callPackage
@@ -75037,7 +76956,7 @@ self: {
        pname = "iException";
        version = "0.0.1";
        sha256 = "0g9hh7v5m194wyj9c5vzsjjc10fia60c9p8si778yky4chvfvj7p";
-       buildDepends = [ base interleavableIO mtl ];
+       libraryHaskellDepends = [ base interleavableIO mtl ];
        description = "Version of Control.Exception using InterleavableIO.";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75051,7 +76970,7 @@ self: {
        pname = "iap-verifier";
        version = "0.1.0.1";
        sha256 = "0mf55kx2y5q8qldgqcq805r3565nxngjm7nwq4q2xy54s7m2fsha";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring conduit http-conduit
          monads-tf text transformers
        ];
@@ -75069,7 +76988,10 @@ self: {
        sha256 = "0zswsb7mvbm8zycb14sks2kvg4jy2wn3vc7z6lb00s0alm1v0srk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base bytestring network unix ];
+       libraryHaskellDepends = [ attoparsec base bytestring network ];
+       executableHaskellDepends = [
+         attoparsec base bytestring network unix
+       ];
        jailbreak = true;
        homepage = "https://github.com/rbermani/ib-api";
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
@@ -75084,10 +77006,10 @@ self: {
        pname = "iban";
        version = "0.1.1.0";
        sha256 = "0rg4h2as5n324zf9y6jllz28s4wj687vdiqvrbnzlavl2kbx96vl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers iso3166-country-codes text unordered-containers
        ];
-       testDepends = [ base HUnit tasty tasty-hunit text ];
+       testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        jailbreak = true;
        homepage = "https://github.com/ibotty/iban";
        description = "Validate and generate IBANs";
@@ -75101,10 +77023,9 @@ self: {
        pname = "iconv";
        version = "0.4.1.3";
        sha256 = "0m5m0ph5im443xcz60wm1zp98bnmf8l1b5gfllxwhjriwdl52hin";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "String encoding conversion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ide-backend" = callPackage
@@ -75123,15 +77044,22 @@ self: {
        sha256 = "06ip0yq8vb8i0qcz2l7z4s1myxm6ix3l44gmjpvspj9vwlsrfxpp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         async attoparsec base binary bytestring Cabal-ide-backend
+         containers data-accessor data-accessor-mtl directory filemanip
+         filepath ghc-prim ide-backend-common mtl pretty-show process
+         pureMD5 template-haskell temporary text time transformers unix
+         utf8-string
+       ];
+       executableHaskellDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          Cabal-ide-backend containers crypto-api data-accessor
          data-accessor-mtl directory executable-path filemanip filepath
          fingertree ghc-prim ide-backend-common mtl pretty-show process
          pureMD5 random tagged template-haskell temporary text time
-         transformers unix unordered-containers utf8-string
+         transformers unix unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base binary bytestring Cabal-ide-backend containers
          deepseq directory executable-path filemanip filepath HUnit
          ide-backend-common process random regex-compat stm tagged tasty
@@ -75152,7 +77080,7 @@ self: {
        pname = "ide-backend-common";
        version = "0.9.1.3";
        sha256 = "11dnm1ibgibrjkxigzh9l442npb2br5rchahm6gza88imy3xcd96";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          containers crypto-api data-accessor directory filepath fingertree
          mtl pretty-show pureMD5 tagged template-haskell temporary text
@@ -75168,7 +77096,7 @@ self: {
        pname = "ide-backend-rts";
        version = "0.1.3.1";
        sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "RTS for the IDE backend";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -75185,7 +77113,7 @@ self: {
        sha256 = "0kljg5dpcxhk4dr8mi5ywb0ykygqm9p89rinyk1i2fqdcvza89rm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array async base bytestring Cabal containers data-accessor
          data-accessor-mtl directory filemanip filepath ghc haddock-api
          ide-backend-common mtl process temporary text time transformers
@@ -75193,6 +77121,7 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ideas" = callPackage
@@ -75205,7 +77134,7 @@ self: {
        pname = "ideas";
        version = "1.3.1";
        sha256 = "1rwvnxih9lb8hw3wvnv377z78szdq80qsrspnxbdqf37kfdw3fx0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers Diff directory exceptions filepath
          mtl multipart network old-locale old-time parsec QuickCheck random
          time uniplate wl-pprint xhtml
@@ -75227,7 +77156,9 @@ self: {
        sha256 = "1s3pryjzc7dkmfdfrysag1w1j752y29cga4040a8fag10n9w7rr2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers ideas parsec QuickCheck random ];
+       executableHaskellDepends = [
+         base containers ideas parsec QuickCheck random
+       ];
        jailbreak = true;
        homepage = "http://ideas.cs.uu.nl/www/";
        description = "Interactive domain reasoner for logic and mathematics";
@@ -75241,8 +77172,8 @@ self: {
        pname = "idempotent";
        version = "0.1.2";
        sha256 = "18jwk65mm50lqnbx9px4c8aa2x7n5dkrazzpzvdwq7cy4q614bj0";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hspec QuickCheck ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/prophile/idempotent";
        description = "Idempotent monoids";
@@ -75258,11 +77189,11 @@ self: {
        pname = "identifiers";
        version = "0.4.0.0";
        sha256 = "0lk58c465a77mshz1b8rdgpidkgr73xbh9q0hij5dqw8d32h958f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cereal containers deepseq hashable ListLike text
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -75281,11 +77212,12 @@ self: {
        sha256 = "11595aj56sjwk28grh6ldsbk5c6kgrirsc2xglfixw82vj7viw8h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor MissingH polyparse text
          utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base bytestring containers data-accessor directory filepath HUnit
          MissingH polyparse process text utf8-string
        ];
@@ -75300,7 +77232,7 @@ self: {
        pname = "idna";
        version = "0.3.0";
        sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp";
-       buildDepends = [ base punycode stringprep text ];
+       libraryHaskellDepends = [ base punycode stringprep text ];
        description = "Implements IDNA (RFC 3490)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75311,7 +77243,7 @@ self: {
        pname = "idna2008";
        version = "0.0.1.0";
        sha256 = "1pd62pr1hyk565mxc15f5lxyms58bywcqll5ya6cnzw20lv4lzlz";
-       buildDepends = [ base punycode split ];
+       libraryHaskellDepends = [ base punycode split ];
        jailbreak = true;
        description = "Converts Unicode hostnames into ASCII";
        license = stdenv.lib.licenses.bsd3;
@@ -75321,20 +77253,21 @@ self: {
   "idris" = callPackage
     ({ mkDerivation, annotated-wl-pprint, ansi-terminal, ansi-wl-pprint
      , base, base64-bytestring, binary, blaze-html, blaze-markup
-     , boehmgc, bytestring, cheapskate, containers, deepseq, directory
-     , filepath, fingertree, gmp, happy, haskeline, lens, libffi, mtl
-     , network, optparse-applicative, parsers, pretty, process, safe
-     , split, text, time, transformers, transformers-compat, trifecta
-     , uniplate, unix, unordered-containers, utf8-string, vector
+     , bytestring, cheapskate, containers, deepseq, directory, filepath
+     , fingertree, haskeline, lens, libffi, mtl, network
+     , optparse-applicative, parsers, pretty, process, safe, split, text
+     , time, transformers, transformers-compat, trifecta, uniplate, unix
+     , unordered-containers, utf8-string, vector
      , vector-binary-instances, xml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "idris";
        version = "0.9.18.1";
        sha256 = "0xd4kqnjdx427l26b07rrw9bnrxb8zrsqy93wayf4rmg6l8rymj8";
+       configureFlags = [ "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          annotated-wl-pprint ansi-terminal ansi-wl-pprint base
          base64-bytestring binary blaze-html blaze-markup bytestring
          cheapskate containers deepseq directory filepath fingertree
@@ -75343,14 +77276,14 @@ self: {
          transformers-compat trifecta uniplate unix unordered-containers
          utf8-string vector vector-binary-instances xml zip-archive zlib
        ];
-       buildTools = [ happy ];
-       extraLibraries = [ boehmgc gmp ];
-       configureFlags = [ "-fffi" "-fgmp" ];
+       executableHaskellDepends = [
+         base directory filepath haskeline transformers
+       ];
        jailbreak = true;
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) boehmgc;  inherit (pkgs) gmp;};
+     }) {};
 
   "ieee" = callPackage
     ({ mkDerivation, base }:
@@ -75358,7 +77291,7 @@ self: {
        pname = "ieee";
        version = "0.7";
        sha256 = "0ckhmy10l4kchr5bg1hlygrj86ij0wrj3r8in9g3c3jhh00dx3km";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/patperry/hs-ieee";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -75370,7 +77303,7 @@ self: {
        pname = "ieee-utils";
        version = "0.4.0";
        sha256 = "0548m1xjvzf65kkklmqjr2f5h85zdfpvxmdbx5rcg33zi8aiqfgk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75382,7 +77315,7 @@ self: {
        pname = "ieee-utils-tempfix";
        version = "0.4.0.1";
        sha256 = "0x0mkvnf3q4yfh7bi7hv6364gy0l57syzy9xgzyax8z94zh465c3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75393,7 +77326,7 @@ self: {
        pname = "ieee754";
        version = "0.7.6";
        sha256 = "03s56h82n7hcwcn2dhd646prcf9wxj5jq49xqsnl7cnvi9768h2q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/patperry/hs-ieee754";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -75405,7 +77338,7 @@ self: {
        pname = "ieee754-parser";
        version = "0.1";
        sha256 = "06pyzjd9imcnrffc0h4dwq46llkb9cmfk1nygmjgfz0y0f9481iv";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        license = "GPL";
      }) {};
 
@@ -75415,7 +77348,7 @@ self: {
        pname = "iff";
        version = "0.0.5";
        sha256 = "1qy19d39zkf79z2j3mvimcnr48vpka5zj05g46fl4f9hz9xjiv16";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.haskell.org/~thielema/iff/";
        description = "Constructing and dissecting IFF files";
        license = "GPL";
@@ -75429,8 +77362,10 @@ self: {
        pname = "ifscs";
        version = "0.2.0.0";
        sha256 = "1675j66kmlfcwd8g0wanx4jfs3vnnvz8hpazskzng6ghvp4bam1q";
-       buildDepends = [ base containers failure ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base containers failure ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "An inductive-form set constraint solver";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75446,7 +77381,7 @@ self: {
        pname = "ig";
        version = "0.3.1";
        sha256 = "0ggr6h5inwwxvqs9qywiagi1c5bx1vky5h0zvhz0df88nbfd3d21";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base16-bytestring bytestring conduit conduit-extra
          crypto-api cryptohash cryptohash-cryptoapi data-default
          http-conduit http-types lifted-base monad-control resourcet text
@@ -75455,7 +77390,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/ig";
        description = "Bindings to Instagram's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ige-mac-integration" = callPackage
@@ -75466,9 +77400,11 @@ self: {
        pname = "ige-mac-integration";
        version = "0.1.0.1";
        sha256 = "1949c5v3157xlwcmddawc79iagxlgy4l08skpkldi45amyy3jqn6";
-       buildDepends = [ array base containers glib gtk haskell98 mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ ige-mac-integration ];
+       libraryHaskellDepends = [
+         array base containers glib gtk haskell98 mtl
+       ];
+       libraryPkgconfigDepends = [ ige-mac-integration ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
@@ -75484,9 +77420,11 @@ self: {
        pname = "igraph";
        version = "0.1.1";
        sha256 = "098b1y1iwmlpi3kspq4cd82cs0bbxvygghssjr986664lgv06hsd";
-       buildDepends = [ base containers hashable unordered-containers ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ igraph ];
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
+       librarySystemDepends = [ igraph ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://giorgidze.github.com/igraph/";
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
@@ -75498,10 +77436,10 @@ self: {
      mkDerivation {
        pname = "igrf";
        version = "0.2.0.0";
-       revision = "1";
        sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1";
+       revision = "1";
        editedCabalFile = "7d616cb461fb1406310675937e1e761f2d09757824dce8a92d235b7ef6ce1e4f";
-       buildDepends = [ ad base polynomial ];
+       libraryHaskellDepends = [ ad base polynomial ];
        jailbreak = true;
        homepage = "https://github.com/dmcclean/igrf";
        description = "International Geomagnetic Reference Field";
@@ -75523,7 +77461,7 @@ self: {
        sha256 = "1jcksbc82csr11lpy5jakf7g6wj2w7mx27cp7knlbi65fsablsk5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bin-package-db bytestring cereal
          cmdargs containers directory filepath ghc ghc-parser ghc-paths
          haskeline haskell-src-exts here hlint http-client http-client-tls
@@ -75531,7 +77469,11 @@ self: {
          system-argv0 text transformers unix unordered-containers
          utf8-string uuid vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bin-package-db bytestring containers directory ghc here
+         ipython-kernel strict text transformers unix
+       ];
+       testHaskellDepends = [
          aeson base base64-bytestring bin-package-db bytestring cereal
          cmdargs containers directory filepath ghc ghc-parser ghc-paths
          haskeline haskell-src-exts here hlint hspec http-client
@@ -75554,7 +77496,7 @@ self: {
        pname = "ihaskell-aeson";
        version = "0.3.0.0";
        sha256 = "0h2bbkqwl8mdyn24n0lphcjfrvmfq8ckincv3rncspp9h0v705m7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring here ihaskell text
        ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
@@ -75569,7 +77511,7 @@ self: {
        pname = "ihaskell-basic";
        version = "0.3.0.0";
        sha256 = "1vb4x6h6bs3liq1bbnhs3ns0zrk4czy63zmkp1q075g7fq1fh7hw";
-       buildDepends = [ base ihaskell ];
+       libraryHaskellDepends = [ base ihaskell ];
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
@@ -75582,7 +77524,7 @@ self: {
        pname = "ihaskell-blaze";
        version = "0.3.0.0";
        sha256 = "1il3iz1nksh5v753srvchrjdazf7dqsd3q59w7crzbyrlx81v97b";
-       buildDepends = [ base blaze-html blaze-markup ihaskell ];
+       libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
@@ -75597,7 +77539,7 @@ self: {
        pname = "ihaskell-charts";
        version = "0.3.0.0";
        sha256 = "0nlimyx953v1s4xgzdb9987i9bw1bdralkg2x6cp41kzqd49i4f3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Chart Chart-cairo data-default-class directory
          ihaskell
        ];
@@ -75615,7 +77557,7 @@ self: {
        pname = "ihaskell-diagrams";
        version = "0.3.0.0";
        sha256 = "0w1jzsrn9lpgrwbr1wsy7kqvkdbq5v21fm67gxif0xrv6hgavzca";
-       buildDepends = [
+       libraryHaskellDepends = [
          active base bytestring diagrams diagrams-cairo diagrams-lib
          directory ihaskell text
        ];
@@ -75630,7 +77572,7 @@ self: {
        pname = "ihaskell-display";
        version = "0.1.0.0";
        sha256 = "1cbfhv9kg33dj28mn6mhhi363pz9jr2kw4ph64ga1fiawlj563l0";
-       buildDepends = [ base classy-prelude ihaskell ];
+       libraryHaskellDepends = [ base classy-prelude ihaskell ];
        jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
@@ -75644,7 +77586,7 @@ self: {
        pname = "ihaskell-hatex";
        version = "0.2.0.0";
        sha256 = "02ynqhirz8bblcfaxksgxxqgnkmxqazj8imwxc2gbrw2v3p0i39s";
-       buildDepends = [ base HaTeX ihaskell text ];
+       libraryHaskellDepends = [ base HaTeX ihaskell text ];
        jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for hatex";
@@ -75659,7 +77601,9 @@ self: {
        pname = "ihaskell-juicypixels";
        version = "0.3.0.0";
        sha256 = "0apsll540z4hzzs39bqk14iadnr4rjp873q712la7lp2xnyf4k0y";
-       buildDepends = [ base bytestring directory ihaskell JuicyPixels ];
+       libraryHaskellDepends = [
+         base bytestring directory ihaskell JuicyPixels
+       ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
@@ -75674,7 +77618,7 @@ self: {
        pname = "ihaskell-magic";
        version = "0.3.0.0";
        sha256 = "05jvyca163daqrmpb7fhk1wng04vk4bayffp0lp68sy3zskrjndl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring ihaskell ipython-kernel magic
          text utf8-string
        ];
@@ -75692,7 +77636,7 @@ self: {
        pname = "ihaskell-parsec";
        version = "0.3.0.0";
        sha256 = "0n1awvn81228cci1q1rvy7p91zfl29byp5imkiwqbxswzz5sq8n4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base here ihaskell parsec random text unordered-containers
        ];
        jailbreak = true;
@@ -75708,7 +77652,7 @@ self: {
        pname = "ihaskell-plot";
        version = "0.3.0.0";
        sha256 = "17qp2ln9v4sv9i3biyxgyq0csqikxwm5gs612fn5zsl1ixznj1h1";
-       buildDepends = [ base bytestring ihaskell plot ];
+       libraryHaskellDepends = [ base bytestring ihaskell plot ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
@@ -75724,7 +77668,7 @@ self: {
        pname = "ihaskell-rlangqq";
        version = "0.3.0.0";
        sha256 = "1w2ywl3m122d56cvgnhll6dpjw03y2jy3nc8v325291zhknrziaj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring directory filepath
          ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat
        ];
@@ -75743,10 +77687,10 @@ self: {
        sha256 = "1rcv92cdy3g9v3qgr3zvjjj0c4d7k99n7ya0mym0bjj79wj4r5zm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers contstuff enumerator netlines
-         network
        ];
+       executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75762,11 +77706,12 @@ self: {
        sha256 = "16ijh2sadbayh3ldiagjq67xilhyv55qhqmmz8a73lbnlq3cphk5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base containers filemanip filepath hscolour html utf8-string
-         xhtml
+       libraryHaskellDepends = [
+         base containers filemanip filepath hscolour html utf8-string xhtml
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [ array base containers html xhtml ];
+       executableToolDepends = [ alex ];
        homepage = "http://github.com/jgm/illuminate";
        description = "A fast syntax highlighting library built with alex";
        license = stdenv.lib.licenses.bsd3;
@@ -75778,10 +77723,10 @@ self: {
      mkDerivation {
        pname = "image-type";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0xr55c5g4jn1y83qy7bqa5ww9r73vw9clgln9ld893vypmb91wks";
+       revision = "1";
        editedCabalFile = "47033c893690f2cea85ba867343f277a8e2594f9010a5466a39dc7f3c4d682f2";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/Icelandjack/Image-type";
        description = "Determine the type of an image by reading the first bytes";
        license = stdenv.lib.licenses.bsd3;
@@ -75793,41 +77738,39 @@ self: {
        pname = "imagefilters";
        version = "0.1";
        sha256 = "1n7awx8wsm6z0sp54jri3sp403n14wzr08vjj4a422q1lf306l3y";
-       buildDepends = [ base gd ];
+       libraryHaskellDepends = [ base gd ];
        homepage = "https://github.com/tchannel/imagefilters";
        description = "Image Filters (contrast, brightness, gaussian blur, etc)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "imagemagick" = callPackage
-    ({ mkDerivation, base, bytestring, directory, HUnit, ImageMagick
-     , lifted-base, MagickWand, MonadCatchIO-transformers, QuickCheck
-     , resourcet, system-filepath, test-framework, test-framework-hunit
+    ({ mkDerivation, base, bytestring, directory, HUnit, imagemagick
+     , lifted-base, MonadCatchIO-transformers, QuickCheck, resourcet
+     , system-filepath, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, transformers, vector
      }:
      mkDerivation {
        pname = "imagemagick";
        version = "0.0.3.5";
-       revision = "1";
        sha256 = "0vwmx86wpxr1f5jrwlqpvrb94dbrm0jjdqq6bppfnfyppd3s1mmq";
+       revision = "1";
        editedCabalFile = "9666a02ba8aef32515f97734c86453b3b9759c46c6a9306be9f20dbdb6b98203";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring MonadCatchIO-transformers resourcet system-filepath
          text transformers vector
        ];
-       testDepends = [
-         base bytestring directory HUnit ImageMagick lifted-base MagickWand
-         QuickCheck resourcet system-filepath test-framework
-         test-framework-hunit test-framework-quickcheck2 text transformers
-         vector
+       libraryPkgconfigDepends = [ imagemagick ];
+       testHaskellDepends = [
+         base bytestring directory HUnit lifted-base QuickCheck resourcet
+         system-filepath test-framework test-framework-hunit
+         test-framework-quickcheck2 text transformers vector
        ];
-       pkgconfigDepends = [ ImageMagick MagickWand ];
        description = "bindings to imagemagick library";
        license = "unknown";
-       broken = true;
-     }) { ImageMagick = null;  MagickWand = null;};
+     }) { inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
     ({ mkDerivation, base, containers, HTTP, json, mtl, network
@@ -75840,7 +77783,7 @@ self: {
        sha256 = "1k512mw4a2hm6nzz2sn00rmkf7fb7mj4a2lk1klr1wmlchwimvpv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers HTTP json mtl network regex-posix tagsoup
          template-haskell transformers vcs-revision
        ];
@@ -75858,10 +77801,10 @@ self: {
        pname = "imagesize-conduit";
        version = "1.1";
        sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra exceptions
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra hspec resourcet
        ];
        homepage = "http://github.com/silkapp/imagesize-conduit";
@@ -75879,7 +77822,7 @@ self: {
        sha256 = "0h6kbh3z78xm1rjphyv7zkjc5knd7v9agss0b9rzarm1z4qd2q5v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory HaskellNet HsOpenSSL network text
        ];
        jailbreak = true;
@@ -75898,7 +77841,7 @@ self: {
        sha256 = "0x31wjd6maqixr3rbangaph0s5skp18fmb8xgm1a6jsky8k367vz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bibtex bytestring ConfigFile containers curl directory
          download-curl filepath glib gnomevfs gtk mtl parsec process split
          utf8-string
@@ -75919,7 +77862,12 @@ self: {
        sha256 = "156a3fq274112j3a6lqiprwhgrcrjp3izix2z1s9bbx3c04pwrjx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base curl directory haskell98 hxt hxt-xpath url ];
+       libraryHaskellDepends = [
+         base curl directory haskell98 hxt hxt-xpath url
+       ];
+       executableHaskellDepends = [
+         base curl directory haskell98 hxt hxt-xpath url
+       ];
        description = "Uploader for Imgur";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75936,18 +77884,19 @@ self: {
      mkDerivation {
        pname = "imm";
        version = "0.6.0.3";
-       revision = "1";
        sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l";
+       revision = "1";
        editedCabalFile = "c14d5caa0066c05d15589dfbb663c5397bcb6d12ab4477de1d7572e3a16b132d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring case-insensitive cond data-default directory
          dyre feed filepath hslogger http-conduit http-types lens mime-mail
          monad-control mtl network network-uri old-locale opml random
          resourcet text text-icu time timerep tls transformers
          transformers-base utf8-string xdg-basedir xml
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
        license = "unknown";
@@ -75962,10 +77911,10 @@ self: {
        pname = "immortal";
        version = "0.2";
        sha256 = "1si9zh309xh29qrxkhb0shwisjrsja2d9lpj17dwlzn0gv0i1672";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base lifted-base stm tasty tasty-hunit transformers
        ];
        homepage = "https://github.com/feuerbach/immortal";
@@ -75984,7 +77933,11 @@ self: {
        sha256 = "15bpz985d39az15jn8hd6wcil7ivsi3vcnxi5lcfs34i848rs9fg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ascetic base compilation containers directory indents MissingH
+         parsec richreports split staticanalysis text uxadt
+       ];
+       executableHaskellDepends = [
          ascetic base compilation containers directory indents MissingH
          parsec richreports split staticanalysis text uxadt
        ];
@@ -76006,7 +77959,7 @@ self: {
        sha256 = "0zsd25gd0c4sp1ipjnsbn1gbdl6s0y2vy8n4nwn3dxgrv75cd1l9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-markup blaze-svg bytestring containers
          deepseq directory filepath JuicyPixels mtl optparse-applicative
          parallel parsec storable-endian text unordered-containers
@@ -76024,7 +77977,7 @@ self: {
        pname = "implicit-params";
        version = "0.2.1";
        sha256 = "1da01fnwxf1350ywawvl58qf479q2rz81wi9s8lvw2n3d75qpn8i";
-       buildDepends = [ base data-default-class ];
+       libraryHaskellDepends = [ base data-default-class ];
        homepage = "http://github.com/duairc/implicit-params";
        description = "Named and unnamed implicit parameters with defaults";
        license = stdenv.lib.licenses.bsd3;
@@ -76036,8 +77989,8 @@ self: {
        pname = "imports";
        version = "0.1.2.1";
        sha256 = "1hm4dg07mw8cihkqziz827kwa3qqvgjg1y45r2lg66crsaanprgz";
-       buildDepends = [ base directory filepath mtl ];
-       testDepends = [ base directory filepath mtl ];
+       libraryHaskellDepends = [ base directory filepath mtl ];
+       testHaskellDepends = [ base directory filepath mtl ];
        jailbreak = true;
        homepage = "https://github.com/CindyLinz/Haskell-imports";
        description = "Generate code for importing directories automatically";
@@ -76050,7 +78003,7 @@ self: {
        pname = "improve";
        version = "0.4.0";
        sha256 = "0z8w7lgk263ickb4l3ajhvy1bjq38bbiiw6c048a3yn4h8kpg67a";
-       buildDepends = [ base mtl yices ];
+       libraryHaskellDepends = [ base mtl yices ];
        jailbreak = true;
        homepage = "http://github.com/tomahawkins/improve/wiki/ImProve";
        description = "An imperative, verifiable programming language for high assurance applications";
@@ -76064,7 +78017,7 @@ self: {
        pname = "inc-ref";
        version = "0.3.0.0";
        sha256 = "0hr25bdwq2a1mj74wb8dvb95jyfqx13rz0h4makyb5kqlhxz40xl";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/jfischoff/inc-ref";
        description = "A STM reference useful for incremental computing";
        license = stdenv.lib.licenses.bsd3;
@@ -76080,10 +78033,10 @@ self: {
        sha256 = "05f25yza05ib0xnkpfimhrb3nqyp5km85r1j9n6yh9k0cwdagndi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath IndentParser mtl parsec presburger pretty
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filepath IndentParser mtl parsec
          presburger pretty
        ];
@@ -76100,8 +78053,8 @@ self: {
        pname = "include-file";
        version = "0.1.0.2";
        sha256 = "0yrqvdp37wjw9j7vknzyiw4954yskxh75z8r3sic6qdmz17zv8ba";
-       buildDepends = [ base bytestring template-haskell ];
-       testDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring template-haskell ];
+       testHaskellDepends = [ base bytestring ];
        description = "Inclusion of files in executables at compile-time";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76115,10 +78068,10 @@ self: {
        pname = "incremental-computing";
        version = "0.0.0.0";
        sha256 = "0zdq122m0nq18igvdxis7lqgdflf6sc94m1aqypjwfkxy4qfvvq3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dlist fingertree order-maintenance transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck
        ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing";
@@ -76135,8 +78088,8 @@ self: {
        pname = "incremental-parser";
        version = "0.2.3.4";
        sha256 = "0n2318i4dzgcs9xcs80wcfbm9rc902w02nwqa30b3nrwl21cjag3";
-       buildDepends = [ base monoid-subclasses ];
-       testDepends = [
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
        ];
        homepage = "http://patch-tag.com/r/blamario/incremental-parser/wiki/";
@@ -76150,7 +78103,7 @@ self: {
        pname = "incremental-sat-solver";
        version = "0.1.7";
        sha256 = "1kic3q19lli8yd28szrngpfsqi50wc47k6597ay24zmiikhx4c2v";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/sebfisch/incremental-sat-solver";
        description = "Simple, Incremental SAT Solving as a Library";
        license = stdenv.lib.licenses.bsd3;
@@ -76165,8 +78118,10 @@ self: {
        pname = "increments";
        version = "0.1.0.4";
        sha256 = "0dsand1y9f215fsikwr2601zxrzxpv85aka6f0gaaf0657mr4x9i";
-       buildDepends = [ base beamable bytestring containers ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base beamable bytestring containers ghc-prim
+       ];
+       testHaskellDepends = [
          base beamable bytestring containers ghc-prim QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -76184,8 +78139,8 @@ self: {
        pname = "indentation";
        version = "0.2.1.1";
        sha256 = "1wb5kv0wx25hhg08afsqpzkkc8c981pbhp8wrzdclb4105y4l4vj";
-       buildDepends = [ base mtl parsec parsers trifecta ];
-       testDepends = [ base parsec tasty tasty-hunit trifecta ];
+       libraryHaskellDepends = [ base mtl parsec parsers trifecta ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit trifecta ];
        homepage = "https://bitbucket.org/mdmkolbe/indentation";
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
@@ -76199,7 +78154,7 @@ self: {
        sha256 = "141bzmhdk5x2bzjx9g7hcf5p07h4q2vzzxlda8vf3dcgxgpdc7aw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec ];
+       libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.cse.iitk.ac.in/users/ppk/code/HASKELL/indentparser";
        description = "A parser for indentation based structures";
        license = stdenv.lib.licenses.publicDomain;
@@ -76211,7 +78166,7 @@ self: {
        pname = "indents";
        version = "0.3.3";
        sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
-       buildDepends = [ base concatenative mtl parsec ];
+       libraryHaskellDepends = [ base concatenative mtl parsec ];
        homepage = "http://patch-tag.com/r/salazar/indents";
        description = "indentation sensitive parser-combinators for parsec";
        license = stdenv.lib.licenses.bsd3;
@@ -76222,10 +78177,10 @@ self: {
      mkDerivation {
        pname = "index-core";
        version = "1.0.2";
-       revision = "1";
        sha256 = "0sj69r9mavw1s17lhh7af9n5vrb60gk5lm6v593sp0rs77canldw";
+       revision = "1";
        editedCabalFile = "97808339bd2ac8a5c79ed99e716e2e8e941234421fde3930b370e0bbc734b063";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
@@ -76238,7 +78193,7 @@ self: {
        pname = "indexed";
        version = "0.1";
        sha256 = "1dx5pyi5psjd2l26hc3wfsapnywdl0kqpw98b3jwc0xq4406ax12";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinerp/indexed";
        description = "Haskell98 indexed functors, monads, comonads";
        license = stdenv.lib.licenses.bsd3;
@@ -76251,7 +78206,9 @@ self: {
        pname = "indexed-do-notation";
        version = "0.1";
        sha256 = "10yvbhjjzg19lyw9ynn2j1cyms2k4hxly5hmw0ad416f8zxmisf9";
-       buildDepends = [ base haskell-src-meta indexed template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta indexed template-haskell
+       ];
        homepage = "https://github.com/fumieval/indexed-do-notation";
        description = "Do notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
@@ -76263,7 +78220,7 @@ self: {
        pname = "indexed-extras";
        version = "0.1.1";
        sha256 = "0mhzk2smcli5mk6ghcxpbnq58adryf42s50qmqrj72sxsfd7a09r";
-       buildDepends = [ base bifunctors indexed mtl pointed ];
+       libraryHaskellDepends = [ base bifunctors indexed mtl pointed ];
        jailbreak = true;
        homepage = "https://github.com/reinerp/indexed-extras";
        description = "Indexed functors, monads and comonads that require extensions to Haskell98";
@@ -76276,7 +78233,7 @@ self: {
        pname = "indexed-free";
        version = "0.3.1";
        sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx";
-       buildDepends = [ base indexed ];
+       libraryHaskellDepends = [ base indexed ];
        homepage = "https://github.com/fumieval/indexed-free";
        description = "indexed monads for free";
        license = stdenv.lib.licenses.bsd3;
@@ -76288,7 +78245,7 @@ self: {
        pname = "indian-language-font-converter";
        version = "0.2";
        sha256 = "1dw0fy3v2hfvlaw371af2c288v4p0wyg43h88clswids3nh1lpn8";
-       buildDepends = [ base gtk HDBC HDBC-sqlite3 ];
+       libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ];
        description = "Indian Language Font Converter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76299,8 +78256,8 @@ self: {
        pname = "indices";
        version = "1.7.1";
        sha256 = "1sy609gq9idk5x28wasd9i61jwhlpf9ls21jps1nw1dfymid41c5";
-       buildDepends = [ base tagged template-haskell ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base tagged template-haskell ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76316,7 +78273,7 @@ self: {
        sha256 = "11v8njjinjqzqfa5hggj0r1gki3hz6y7cxj5qfnzxa77hdav10fa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base github optparse-applicative parsec process text
        ];
        jailbreak = true;
@@ -76337,10 +78294,11 @@ self: {
        sha256 = "0m4azl5pxypnf3q9riwf1gkwlfwrw5dswgrr2y9j1myb812ag5qn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers digits either fgl language-ecmascript mtl
          optparse-applicative parsec transformers
        ];
+       executableHaskellDepends = [ base optparse-applicative parsec ];
        homepage = "https://github.com/sinelaw/infernu";
        description = "Type inference and checker for JavaScript (experimental)";
        license = stdenv.lib.licenses.gpl2;
@@ -76352,7 +78310,7 @@ self: {
        pname = "infinite-search";
        version = "0.12";
        sha256 = "18sf9798nna155xix71lw68k19r7ayk9kmppjzd76yxa61r38g41";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/infinite-search";
        description = "Exhaustively searchable infinite sets";
        license = stdenv.lib.licenses.bsd3;
@@ -76367,7 +78325,9 @@ self: {
        sha256 = "1d2l6a4ngawm7zqgfwxd19rh3zwihivbgns39q44yjh1d5v0azab";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary Cabal filepath ghc irc plugins ];
+       executableHaskellDepends = [
+         base binary Cabal filepath ghc irc plugins
+       ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76379,7 +78339,7 @@ self: {
        pname = "infix";
        version = "0.1.1";
        sha256 = "156lcw4bvav9w41vggfjk84z41ppam31880wpislxwcsvc9jrd6q";
-       buildDepends = [ base containers haskell-src ];
+       libraryHaskellDepends = [ base containers haskell-src ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
@@ -76394,15 +78354,14 @@ self: {
        pname = "inflections";
        version = "0.2.0.0";
        sha256 = "16s2sj2417qmhdlzn7j51yf7fh50f5msgb50fsavw80845602x43";
-       buildDepends = [ base containers parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
          base containers HUnit parsec QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
        homepage = "https://github.com/stackbuilders/inflections-hs";
        description = "Inflections library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inflist" = callPackage
@@ -76411,8 +78370,8 @@ self: {
        pname = "inflist";
        version = "0.0.1";
        sha256 = "0srw75ds7hic0sjs2fnj0hsqsygzvppgy17y8qmsjz9z14ryqncw";
-       buildDepends = [ base QuickCheck ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "https://bitbucket.org/eegg/inflist";
        description = "An infinite list type and operations thereon";
        license = stdenv.lib.licenses.bsd3;
@@ -76432,12 +78391,15 @@ self: {
        sha256 = "0v092i592j5n31fl0vc5750pqjbgaj10n3dm314bkll6ld0gdbwx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default-class
-         dlist exceptions http-client mtl mwc-random network-uri retry
-         scientific tagged template-haskell text time vector
+         dlist exceptions http-client mtl network-uri retry scientific
+         tagged template-haskell text vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring http-client mtl mwc-random text time
+       ];
+       testHaskellDepends = [
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text vector
        ];
@@ -76458,7 +78420,12 @@ self: {
        sha256 = "1xglpqwr4bc7rqaspq7w6pc9g5ilzvxfb6lfkji3inagg5xksl7n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers csv highlighting-kate http-conduit monad-logger
+         pandoc persistent persistent-postgresql shakespeare text time
+         time-locale-compat yesod yesod-auth yesod-core yesod-form
+       ];
+       executableHaskellDepends = [
          base containers csv highlighting-kate http-conduit monad-logger
          pandoc persistent persistent-postgresql shakespeare text time
          time-locale-compat yesod yesod-auth yesod-core yesod-form
@@ -76476,7 +78443,9 @@ self: {
        pname = "ini";
        version = "0.3.1";
        sha256 = "01iwf4ifdx3mrw1rybj4crip4hmjxhab250rv995dgbwldh1iyqb";
-       buildDepends = [ attoparsec base text unordered-containers ];
+       libraryHaskellDepends = [
+         attoparsec base text unordered-containers
+       ];
        description = "Quick and easy configuration files in the INI format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76489,14 +78458,17 @@ self: {
        pname = "inilist";
        version = "0.2.0.0";
        sha256 = "1rr71yajc6j0idsqgna8mbnawiv6iw1x8kswkv7x2l0ih89r6y3a";
-       buildDepends = [ base bifunctors containers safe trifecta ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bifunctors containers safe trifecta
+       ];
+       testHaskellDepends = [
          base bifunctors containers deepseq HUnit safe tasty tasty-hunit
          testpack trifecta
        ];
        homepage = "https://chiselapp.com/user/mwm/repository/inilist";
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inject" = callPackage
@@ -76509,8 +78481,9 @@ self: {
        sha256 = "0rm81xkxfwbm98ywcwjnh1l9qkah3xma59l8z5l37b458hayxjqq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base process text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base process text ];
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [
          attoparsec base hspec hspec-expectations process text
        ];
        description = "A minimalistic template engine";
@@ -76523,7 +78496,7 @@ self: {
        pname = "inject-function";
        version = "0.2.1.0";
        sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/skypers/inject-function";
        description = "Monadic functions with injected parameters";
@@ -76543,17 +78516,17 @@ self: {
        sha256 = "03b15dz0bm26bv9jkpjdgmqii3fw1ifj6zwmysibir50jxlbx9pk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring containers cryptohash
          directory filepath hashable mtl parsec parsers QuickCheck
          template-haskell transformers unordered-containers vector
        ];
-       testDepends = [
+       executableSystemDepends = [ gsl gslcblas ];
+       testHaskellDepends = [
          ansi-wl-pprint base containers hashable hspec parsers QuickCheck
          raw-strings-qq regex-posix template-haskell transformers
          unordered-containers vector
        ];
-       extraLibraries = [ gsl gslcblas ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) gsl;  gslcblas = null;};
@@ -76564,8 +78537,8 @@ self: {
        pname = "inline-c-cpp";
        version = "0.1.0.0";
        sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf";
-       buildDepends = [ base inline-c template-haskell ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base inline-c template-haskell ];
+       testHaskellDepends = [ base ];
        description = "Lets you embed C++ code into Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -76578,7 +78551,9 @@ self: {
        pname = "inline-c-win32";
        version = "0.1";
        sha256 = "14255dn7smmm1rpnjifn7gn2amcncnf3j45ah22bblyb4h27iikm";
-       buildDepends = [ base containers inline-c template-haskell Win32 ];
+       libraryHaskellDepends = [
+         base containers inline-c template-haskell Win32
+       ];
        homepage = "https://github.com/anton-dessiatov/inline-c-win32";
        description = "Win32 API Context for the inline-c library";
        license = stdenv.lib.licenses.mit;
@@ -76592,7 +78567,7 @@ self: {
        sha256 = "18qcjdwgn7a1lrdnqnh6sh1bzii0nvb5jv56qq5kri8m6qwc9wl8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ aether base text ];
+       executableHaskellDepends = [ aether base text ];
        jailbreak = true;
        description = "Console client for encyclopedias";
        license = stdenv.lib.licenses.gpl3;
@@ -76605,7 +78580,7 @@ self: {
        pname = "inserts";
        version = "0.1.2";
        sha256 = "1m72ysfd2g2jszvcihh7zbfxvpj2a8qjq3ra4vs4bjzpja4kh477";
-       buildDepends = [ attoparsec base bytestring dlist ];
+       libraryHaskellDepends = [ attoparsec base bytestring dlist ];
        jailbreak = true;
        homepage = "http://github.com/tel/inserts";
        description = "Stupid simple bytestring templates";
@@ -76622,7 +78597,7 @@ self: {
        sha256 = "09mk2wd4bs31zhz0x8z3ajlk734r0rp5k07g0mfdy4bsvi2hdqiy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base bytestring cmdargs pipes pipes-network
        ];
        description = "A simple proxy for debugging plaintext protocols communication";
@@ -76637,8 +78612,8 @@ self: {
        pname = "instant-aeson";
        version = "0.1.0.1";
        sha256 = "18zxvd4sw13j4gn2f7r2xdy6p0xayjv3ks8j97j7vi6cdw9aqw2z";
-       buildDepends = [ aeson base instant-generics ];
-       testDepends = [
+       libraryHaskellDepends = [ aeson base instant-generics ];
+       testHaskellDepends = [
          aeson base instant-generics tasty tasty-quickcheck
        ];
        description = "Generic Aeson instances through instant-generics";
@@ -76653,8 +78628,8 @@ self: {
        pname = "instant-bytes";
        version = "0.1.0.1";
        sha256 = "1g99yakjychx12amls2b6cfma0fzh0n9w4m2k03wqibk1aagl940";
-       buildDepends = [ base bytes instant-generics ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytes instant-generics ];
+       testHaskellDepends = [
          base bytes instant-generics tasty tasty-quickcheck
        ];
        description = "Generic Serial instances through instant-generics";
@@ -76667,7 +78642,7 @@ self: {
        pname = "instant-deepseq";
        version = "0.1.0.1";
        sha256 = "1yv5zqv2fqj8b7qzx2004sa287mrvrswmghl13vsbj2whmdh0kjz";
-       buildDepends = [ base deepseq instant-generics ];
+       libraryHaskellDepends = [ base deepseq instant-generics ];
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76677,14 +78652,13 @@ self: {
      mkDerivation {
        pname = "instant-generics";
        version = "0.5";
-       revision = "1";
        sha256 = "174avn0jjxv4h04m6k85gvv6x3kvrlwhcbhqg9ih0ps5mp7crmvr";
+       revision = "1";
        editedCabalFile = "c69a74fef28272e5e46a0e37711bb980ac07d2f3feeed3513da1cc572a1ab6bc";
-       buildDepends = [ base containers syb template-haskell ];
+       libraryHaskellDepends = [ base containers syb template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic programming library with a sum of products view";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "instant-hashable" = callPackage
@@ -76693,7 +78667,7 @@ self: {
        pname = "instant-hashable";
        version = "0.1.0.1";
        sha256 = "1yaf24r68zh5vsp73747hbv2fdk9y9vgswj6lv22s52s8h6f1agj";
-       buildDepends = [ base hashable instant-generics ];
+       libraryHaskellDepends = [ base hashable instant-generics ];
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76703,10 +78677,10 @@ self: {
      mkDerivation {
        pname = "instant-zipper";
        version = "0.0.0";
-       revision = "1";
        sha256 = "0gd5hzlm5rlmzba2dl37al711vp1nn2b30d36rvb2j8y90y8c44c";
+       revision = "1";
        editedCabalFile = "a0e15510d3e3eefaa18d20fbfce7a1840519e160e2a8a8b36c498a3664b9c037";
-       buildDepends = [ base instant-generics mtl ];
+       libraryHaskellDepends = [ base instant-generics mtl ];
        jailbreak = true;
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
@@ -76719,7 +78693,7 @@ self: {
        pname = "instinct";
        version = "0.1.0";
        sha256 = "0wh95zjdv9j1n3ccg2j08av43qnb9vmiyvqvyi70p47dr481npl8";
-       buildDepends = [ base containers mersenne-random vector ];
+       libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76730,7 +78704,7 @@ self: {
        pname = "instrument-chord";
        version = "0.1.0.9";
        sha256 = "0gq79i1mqpbyvxm8cfpr2b8h0knbc6f2m3b3mnm0p3yvi2d642nb";
-       buildDepends = [ array base containers music-diatonic ];
+       libraryHaskellDepends = [ array base containers music-diatonic ];
        homepage = "https://github.com/xpika/chord";
        description = "Render Instrument Chords";
        license = stdenv.lib.licenses.gpl3;
@@ -76744,8 +78718,8 @@ self: {
        pname = "int-cast";
        version = "0.1.2.0";
        sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -76759,10 +78733,10 @@ self: {
      mkDerivation {
        pname = "integer-gmp";
        version = "1.0.0.0";
-       revision = "1";
        sha256 = "0sh01sbib7z0bx934a7gq6583hdz8yncaxpfi9k8y4v18gm8j55f";
+       revision = "1";
        editedCabalFile = "5d63fab9a7c94b4e713d151bdc0c361228efbac2b7583dfa8e6c5370ecae5663";
-       buildDepends = [ ghc-prim ];
+       libraryHaskellDepends = [ ghc-prim ];
        description = "Integer library based on GMP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76785,7 +78759,7 @@ self: {
        pname = "integration";
        version = "0.2.1";
        sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc";
-       buildDepends = [ base parallel ];
+       libraryHaskellDepends = [ base parallel ];
        homepage = "https://github.com/ekmett/integration";
        description = "Fast robust numeric integration via tanh-sinh quadrature";
        license = stdenv.lib.licenses.bsd3;
@@ -76800,11 +78774,11 @@ self: {
        pname = "intel-aes";
        version = "0.2.1.1";
        sha256 = "11cy9dlynlz9mgbs4w4xfjb9dx05dklfjl3gg2130si8q2kk3cm9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal crypto-api DRBG largeword process random
          rdtsc split tagged time unix
        ];
-       extraLibraries = [ intel_aes ];
+       librarySystemDepends = [ intel_aes ];
        homepage = "https://github.com/rrnewton/intel-aes/wiki";
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
@@ -76817,7 +78791,7 @@ self: {
        pname = "interchangeable";
        version = "0.2.0.0";
        sha256 = "1r0gxwbl2k4i9r7jlbmabr1088q8nk1an4nhf79gsx2ybfdzlndh";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/arowM/interchangeable";
        description = "A type class for interchangeable data";
        license = stdenv.lib.licenses.mit;
@@ -76831,7 +78805,7 @@ self: {
        sha256 = "10clafccpg8xciqhj2hzbi4kixzprgp733396qf531nwakvnqpp2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory haskell-src hint mtl ];
+       executableHaskellDepends = [ base directory haskell-src hint mtl ];
        description = "Generates a version of a module using InterleavableIO";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76843,7 +78817,7 @@ self: {
        pname = "interleavableIO";
        version = "0.0.1";
        sha256 = "19jdrfr6n6yzvj1i8r7hhr3k6zkkbrs6pizqcbzhb0nvzzshmqa8";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Use other Monads in functions that asks for an IO Monad";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76855,7 +78829,7 @@ self: {
        pname = "interleave";
        version = "1.0";
        sha256 = "062ixqbrrmamwv3fj6vpfcxy35p37i1wpmsxk1gl9n06n0lg9a8c";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Combinators for supporting interleaving of different behaviours";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76866,7 +78840,7 @@ self: {
        pname = "interlude";
        version = "0.1.2";
        sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/";
        description = "Replaces some Prelude functions for enhanced error reporting";
        license = "GPL";
@@ -76880,7 +78854,7 @@ self: {
        pname = "intern";
        version = "0.9.1.4";
        sha256 = "0snjar5mil9zsyy1ml13a8p1g2cvq62c5r8547i6z451w06j1zk0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring hashable text unordered-containers
        ];
        homepage = "http://github.com/ekmett/intern/";
@@ -76898,7 +78872,7 @@ self: {
        sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base explicit-exception HPDF parsec process transformers utility-ht
        ];
        jailbreak = true;
@@ -76918,8 +78892,11 @@ self: {
        sha256 = "11awkl6rgy33yl4qcnf7ns464c87xjk9hqcf10z8shjjbaadbz43";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts regex-posix syb ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base haskell-src-exts regex-posix syb
+       ];
+       testHaskellDepends = [
          base haskell-src-exts HUnit regex-posix syb test-framework
          test-framework-hunit
        ];
@@ -76936,8 +78913,8 @@ self: {
        pname = "interpolate";
        version = "0.1.0";
        sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id";
-       buildDepends = [ base haskell-src-meta template-haskell ];
-       testDepends = [
+       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
+       testHaskellDepends = [
          base bytestring haskell-src-meta hspec QuickCheck
          quickcheck-instances template-haskell text
        ];
@@ -76953,7 +78930,7 @@ self: {
        pname = "interpolatedstring-perl6";
        version = "1.0.0";
        sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring haskell-src-meta template-haskell text
        ];
        description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
@@ -76967,7 +78944,9 @@ self: {
        pname = "interpolatedstring-qq";
        version = "0.2";
        sha256 = "1bqn9gqc43r158hyk35x8avsiqyd43vlpw2jkhpdfmr2wx29jprq";
-       buildDepends = [ base haskell-src-meta-mwotton template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta-mwotton template-haskell
+       ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76980,7 +78959,9 @@ self: {
        pname = "interpolatedstring-qq-mwotton";
        version = "0.1.1";
        sha256 = "1cwhy4jwbl50nglfw0wfmdr3rrg33dqskw0wq06prx14x22yshbk";
-       buildDepends = [ base haskell-src-meta-mwotton template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta-mwotton template-haskell
+       ];
        jailbreak = true;
        description = "DO NOT USE THIS. interpolatedstring-qq works now.";
        license = stdenv.lib.licenses.bsd3;
@@ -76995,8 +78976,10 @@ self: {
        sha256 = "1yip0fjhmd9gf9w7qi4yfpq38m51jn0i52zxil2hfc49r5aydlya";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base utility-ht ];
-       testDepends = [ array base containers QuickCheck utility-ht ];
+       libraryHaskellDepends = [ base utility-ht ];
+       testHaskellDepends = [
+         array base containers QuickCheck utility-ht
+       ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/interpolation/";
        description = "piecewise linear and cubic Hermite interpolation";
@@ -77011,8 +78994,8 @@ self: {
        pname = "intervals";
        version = "0.7.1";
        sha256 = "03ra3jkch26x4crsq6nh2wnj51jrx7zmwafmq22xqrpsg7hpav92";
-       buildDepends = [ array base distributive ghc-prim ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ array base distributive ghc-prim ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/intervals";
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -77030,7 +79013,7 @@ self: {
        sha256 = "0jlqxd7nwh3yvy5pni3w4a19wvn2xdrhhhfm9xkf4cs2rqnz525q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers cryptohash directory
          filepath hscurses mtl network-fancy random safe SDL SDL-gfx
          SDL-mixer SDL-ttf stm time transformers vector
@@ -77049,8 +79032,8 @@ self: {
        pname = "intset";
        version = "0.1.1.0";
        sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0";
-       buildDepends = [ base bits-extras bytestring deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/pxqr/intset";
@@ -77069,12 +79052,12 @@ self: {
        pname = "invariant";
        version = "0.2";
        sha256 = "0zxzpbha3z4z23xmsbgajjxk477ad1v28ml3rry0102lpcpvl6j1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bifunctors containers contravariant ghc-prim profunctors
          semigroups stm tagged template-haskell transformers
          transformers-compat unordered-containers
        ];
-       testDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell 98 invariant functors";
        license = stdenv.lib.licenses.bsd3;
@@ -77086,7 +79069,7 @@ self: {
        pname = "invertible-syntax";
        version = "0.2.1";
        sha256 = "0kyi7gq0a792v4lwmpq8i56vzwk6g7cjc3lbpxch47jsqv8lfhbp";
-       buildDepends = [ base partial-isomorphisms ];
+       libraryHaskellDepends = [ base partial-isomorphisms ];
        homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Invertible syntax descriptions for both parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
@@ -77098,7 +79081,7 @@ self: {
        pname = "io-capture";
        version = "0.3";
        sha256 = "03kjjsz1i1viwngmq9mvkzd43490g93mbkcvgjvcway2z5prv06f";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "capture IO action's stdout and stderr";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77111,11 +79094,11 @@ self: {
        pname = "io-choice";
        version = "0.0.5";
        sha256 = "19nr8kxcg98510cqgjn4c9sd8i9yz8fv4ryqg6lzzgpwqzkvx5ph";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control template-haskell transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec lifted-base monad-control transformers
        ];
        description = "Choice for IO and lifted IO";
@@ -77130,7 +79113,8 @@ self: {
        sha256 = "0f21h36z2ls0d6g31pcf4kcyfninaxws8w159zy33bwa19saf2mz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        description = "Skeleton library around the IO monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77141,7 +79125,7 @@ self: {
        pname = "io-memoize";
        version = "1.1.1.0";
        sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7";
-       buildDepends = [ async base ];
+       libraryHaskellDepends = [ async base ];
        homepage = "https://github.com/DanBurton/io-memoize";
        description = "Memoize IO actions";
        license = stdenv.lib.licenses.bsd3;
@@ -77155,7 +79139,8 @@ self: {
        sha256 = "09iq8c86ql0hmzdf7i82lpdqa6nn6r0zy9lgryd6chkxd0kcpgvn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77167,8 +79152,8 @@ self: {
        pname = "io-region";
        version = "0.1.1";
        sha256 = "1w8m21zkhbhqr9lsdzwxfpy0jhb2ciybn3bvhyp3zlxkq9k3yc7f";
-       buildDepends = [ base stm ];
-       testDepends = [ base hspec transformers ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [ base hspec transformers ];
        homepage = "https://github.com/Yuras/io-region/wiki";
        description = "Exception safe resource management with dynamic regions";
        license = stdenv.lib.licenses.bsd3;
@@ -77180,7 +79165,7 @@ self: {
        pname = "io-storage";
        version = "0.3";
        sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/willdonnelly/io-storage";
        description = "A key-value store in the IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -77197,17 +79182,17 @@ self: {
        pname = "io-streams";
        version = "1.3.2.0";
        sha256 = "0gqj2adc3zlwz81wy38y8x4rihvhk4zm9xb0rd04a77nn15xlc0y";
-       buildDepends = [
+       configureFlags = [ "-fnointeractivetests" ];
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
          process text time transformers vector zlib-bindings
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring bytestring-builder deepseq directory
          filepath HUnit mtl network primitive process QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time transformers vector zlib zlib-bindings
        ];
-       configureFlags = [ "-fnointeractivetests" ];
        description = "Simple, composable, and easy-to-use stream I/O";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77220,7 +79205,7 @@ self: {
        pname = "io-streams-http";
        version = "0.2.1.2";
        sha256 = "0ra3z236d4mbw2vqlx4zxpa5z53a7k1j2pmkwf3075ghgdavrmk3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-client http-client-tls io-streams mtl
          transformers
        ];
@@ -77233,11 +79218,11 @@ self: {
      mkDerivation {
        pname = "io-throttle";
        version = "0.1.0";
-       revision = "1";
        sha256 = "043plb9n606hkbdjddgk9kg12fzzs7ry063ckiky4zymy2vprcj9";
+       revision = "1";
        editedCabalFile = "c3903532515f76e374229ea572d11f7ab02a560062425f33649399c5ac61a16e";
-       buildDepends = [ base SafeSemaphore threads ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base SafeSemaphore threads ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/rodrigosetti/io-throttle";
        description = "Limit number of IO actions started per second";
        license = stdenv.lib.licenses.mit;
@@ -77249,7 +79234,7 @@ self: {
        pname = "ioctl";
        version = "0.0.1";
        sha256 = "0rwh7mlwdd24ndzz4b4vd5b5daz9cga47m9nz6g75m03iyy237qs";
-       buildDepends = [ base network unix ];
+       libraryHaskellDepends = [ base network unix ];
        description = "Type-safe I/O control package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77260,7 +79245,7 @@ self: {
        pname = "iothread";
        version = "0.1.0.0";
        sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/iothread";
        description = "run IOs in a single thread";
@@ -77273,7 +79258,7 @@ self: {
        pname = "iotransaction";
        version = "0.1";
        sha256 = "0ylwrim2wfx3v03syd8v0iwf9kbw9154wlxsp8wc1d3n6sz7p1cc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/dshearer/iotransaction/";
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
@@ -77288,8 +79273,8 @@ self: {
        pname = "ip-quoter";
        version = "1.0.1.1";
        sha256 = "1819742yjdl96k2z8s55a5x9xw9mg4lps1dq1f55zvc31afkdi4l";
-       buildDepends = [ base cpu network template-haskell ];
-       testDepends = [ base cpu network tasty tasty-hunit ];
+       libraryHaskellDepends = [ base cpu network template-haskell ];
+       testHaskellDepends = [ base cpu network tasty tasty-hunit ];
        homepage = "https://github.com/shlevy/ip-quoter";
        description = "Quasiquoter for IP addresses";
        license = stdenv.lib.licenses.mit;
@@ -77303,7 +79288,7 @@ self: {
        sha256 = "08nwzas5r3b47chldc3dmwmwxam5dlmsyqqqmql7rjm87h645di4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cmdargs IPv6Addr text ];
+       executableHaskellDepends = [ base cmdargs IPv6Addr text ];
        homepage = "https://github.com/MichelBoucey/ip6addr";
        description = "Commandline tool to generate IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
@@ -77319,7 +79304,7 @@ self: {
        sha256 = "19yf0b82ifplja05if38llfs38mzmxxald89jc2yzqzzkvws9ldq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring darcs directory filepath hashed-storage process
          unix
        ];
@@ -77337,7 +79322,7 @@ self: {
        pname = "ipc";
        version = "0.0.5";
        sha256 = "0d1w62181s21ks63548i3jdfk4k1rg0hssnhkm97ymkrlcz6w68d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring dlist mtl network network-bytestring stm
        ];
        jailbreak = true;
@@ -77353,8 +79338,8 @@ self: {
        pname = "ipcvar";
        version = "0.0.1";
        sha256 = "085p03xk29wk03yfshpjvzkf2z79byhp9yy81vra1aci9nkgjr3n";
-       buildDepends = [ base binary bytestring directory unix ];
-       testDepends = [ base hspec unix ];
+       libraryHaskellDepends = [ base binary bytestring directory unix ];
+       testHaskellDepends = [ base hspec unix ];
        description = "Simple inter-process communication through IPCVars";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77370,12 +79355,12 @@ self: {
        sha256 = "03cpn73ybkifkbl8dxbpyh17gv71jx9x53pkhi9wbfpqqz2ail9c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ad ansi-wl-pprint base containers lens mtl template-haskell
          uu-parsinglib vector vector-space
        ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ ipopt nlopt ];
+       libraryPkgconfigDepends = [ ipopt nlopt ];
+       libraryToolDepends = [ c2hs ];
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77387,7 +79372,7 @@ self: {
        pname = "ipprint";
        version = "0.5";
        sha256 = "0h75k21blbnzvp5l20qsima557dx6zfrww79y7qsqf04pbd81j7s";
-       buildDepends = [ base Extra haskell-src ];
+       libraryHaskellDepends = [ base Extra haskell-src ];
        description = "Tiny helper for pretty-printing values in ghci console";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77399,11 +79384,13 @@ self: {
      mkDerivation {
        pname = "iproute";
        version = "1.5.0";
-       revision = "1";
        sha256 = "0mr5dwzvsik5v59fy5lpnj6qabgc8cwbybil5hb6gqqvd0y26fz3";
+       revision = "1";
        editedCabalFile = "f601b3319004e7b4a4636c89996ea78fd084e9b10d15d679d7ae58e822fe19b8";
-       buildDepends = [ appar base byteorder containers network ];
-       testDepends = [
+       libraryHaskellDepends = [
+         appar base byteorder containers network
+       ];
+       testHaskellDepends = [
          appar base byteorder containers doctest hspec network QuickCheck
          safe
        ];
@@ -77422,9 +79409,10 @@ self: {
        sha256 = "13xv7g349ssgbz9c0g8q77hf52gp0v7nw9q665l697237jbvl57j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers mtl parsec QuickCheck safe syb utf8-string
+       libraryHaskellDepends = [
+         base containers mtl parsec safe utf8-string
        ];
+       executableHaskellDepends = [ base QuickCheck syb ];
        jailbreak = true;
        description = "iptables rules parser/printer library";
        license = stdenv.lib.licenses.bsd3;
@@ -77444,7 +79432,7 @@ self: {
        sha256 = "1ksnypq95xaybsb3vvhmabrh8l3c2c3mcqz83a61md9c1vw3n94m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          augeas base blaze-html blaze-markup bytestring ConfigFile
          containers file-embed filepath happstack-server
          happstack-server-tls hdaemonize hsyslog iptables-helpers mtl
@@ -77469,9 +79457,12 @@ self: {
        sha256 = "1dmmrkph3myc67wp4ibx2l10dkxpkgzh7i4shbjbqag39ljb0q60";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring cereal containers directory filepath mtl
-         parsec SHA tar text transformers uuid zeromq4-haskell
+       libraryHaskellDepends = [
+         aeson base bytestring cereal containers directory filepath mtl SHA
+         tar text transformers uuid zeromq4-haskell
+       ];
+       executableHaskellDepends = [
+         base filepath mtl parsec text transformers
        ];
        jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
@@ -77487,8 +79478,8 @@ self: {
        pname = "irc";
        version = "0.6.1.0";
        sha256 = "1q9p2qwfy9rsfyaja4x3gjr8ql2ka2ja5qv56b062bdkvzafl5iq";
-       buildDepends = [ attoparsec base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -77502,7 +79493,7 @@ self: {
        pname = "irc-bytestring";
        version = "0.1";
        sha256 = "09n4y93x74wblbz89s1hwzmanwwi72cj0baz72485svarg55kid7";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        homepage = "https://github.com/kallisti-dev/irc-bytestring";
        description = "serialization and parsing of IRC messages";
        license = stdenv.lib.licenses.bsd3;
@@ -77517,14 +79508,13 @@ self: {
        pname = "irc-client";
        version = "0.2.4.0";
        sha256 = "137ix1x2qy92v5naaq3lz3iyvbxvf32gnsq09flddadx88d51vv6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit data-default-class irc-conduit irc-ctcp
          old-locale stm stm-conduit text time transformers
        ];
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-colors" = callPackage
@@ -77533,7 +79523,7 @@ self: {
        pname = "irc-colors";
        version = "0.1";
        sha256 = "1xl38bq1b6w7z8q0frra4h76lyk63bsy5i1qd34pdgwvikd2rkh0";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        description = "Colourize your IRC strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77547,7 +79537,7 @@ self: {
        pname = "irc-conduit";
        version = "0.1.2.0";
        sha256 = "1mw418frhbnk7gncilvb2c3cj4fvzm5fvafq0p28vggxisda9bkp";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring conduit conduit-extra connection irc irc-ctcp
          network-conduit-tls text time tls transformers x509-validation
        ];
@@ -77567,16 +79557,20 @@ self: {
      mkDerivation {
        pname = "irc-core";
        version = "1.1.0.1";
-       revision = "3";
        sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257";
+       revision = "3";
        editedCabalFile = "a2be33ee630d69381c0103cf25743005688f53220d02552cc99ed7131eefdadf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         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 x509-validation
+       libraryHaskellDepends = [
+         array attoparsec base base64-bytestring bytestring containers free
+         lens 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
        ];
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
@@ -77589,7 +79583,7 @@ self: {
        pname = "irc-ctcp";
        version = "0.1.3.0";
        sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/barrucadu/irc-ctcp";
        description = "A CTCP encoding and decoding library for IRC clients";
        license = stdenv.lib.licenses.mit;
@@ -77601,8 +79595,8 @@ self: {
        pname = "irc-fun-color";
        version = "0.1.0.0";
        sha256 = "1zb3d3m17049g7cfnpnl8c1ldyhhwvxh99dbfx1xzyadg841i08a";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://rel4tion.org/projects/irc-fun-color/";
        description = "Add color and style decorations to IRC messages";
        license = stdenv.lib.licenses.publicDomain;
@@ -77616,14 +79610,13 @@ self: {
        pname = "ircbot";
        version = "0.6.4";
        sha256 = "024wmkp08rni9frflpjl0p30ql6k1kj956j5dysz40xygajk8fmd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath irc mtl network
          parsec random SafeSemaphore stm time unix
        ];
        homepage = "http://hub.darcs.net/stepcut/ircbot";
        description = "A library for writing irc bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ircbouncer" = callPackage
@@ -77643,7 +79636,7 @@ self: {
        pname = "ireal";
        version = "0.2.1";
        sha256 = "0i9850l0k1w7vmdx4cs35789rf6j4i1xalpyrinf8x85f6c8mfxa";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Real numbers and intervals with relatively efficient exact arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77655,7 +79648,7 @@ self: {
        pname = "iron-mq";
        version = "0.1.1.0";
        sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr";
-       buildDepends = [ aeson base http-client lens text wreq ];
+       libraryHaskellDepends = [ aeson base http-client lens text wreq ];
        jailbreak = true;
        homepage = "https://github.com/arnoblalam/iron_mq_haskell";
        description = "Iron.IO message queueing client library";
@@ -77672,7 +79665,10 @@ self: {
        sha256 = "1dx0ljvfll8vb9rjdvx41vm4mrybafjch83xk7xs5fpvijjfp47l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         antisplice base chatty chatty-utils mtl transformers
+       ];
+       executableHaskellDepends = [
          antisplice base chatty chatty-utils mtl transformers
        ];
        homepage = "http://doomanddarkness.eu/pub/antisplice";
@@ -77686,8 +79682,8 @@ self: {
        pname = "is";
        version = "0.2";
        sha256 = "1ihrrpypdjhsr42nd9chyq730kllx239igjpa12m14458lnrcb2h";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        description = "Pattern predicates using TH";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77702,8 +79698,9 @@ self: {
        sha256 = "05f99nv4ydals0x1y39mswm3437s6bisdk63bgfzb89sgh0p9w1p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
-       testDepends = [
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/tonymorris/isdicom";
@@ -77717,7 +79714,7 @@ self: {
        pname = "isevaluated";
        version = "0.3.0.2";
        sha256 = "10f09br33xy5ldl924kfnnlc5ilwq44hd17s2qdf9jm75q4sa7d5";
-       buildDepends = [ base vacuum ];
+       libraryHaskellDepends = [ base vacuum ];
        jailbreak = true;
        description = "Check whether a value has been evaluated";
        license = stdenv.lib.licenses.mit;
@@ -77732,7 +79729,7 @@ self: {
        sha256 = "0k0nyiicz87lvay95vligf563k1dgx93zds0f0kzqxn20miq480s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk3 ];
+       executableHaskellDepends = [ base gtk3 ];
        description = "A program to show the size of image and whether suitable for wallpaper";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77743,7 +79740,7 @@ self: {
        pname = "islink";
        version = "0.1.0.0";
        sha256 = "1mxfs8k0znc7v2iynjnhr4k5c9as4ip37ybvxnvjfqy4dld9rgyg";
-       buildDepends = [ base unordered-containers ];
+       libraryHaskellDepends = [ base unordered-containers ];
        homepage = "https://github.com/redneb/islink";
        description = "Check if an HTML element is a link";
        license = stdenv.lib.licenses.bsd3;
@@ -77757,7 +79754,7 @@ self: {
        pname = "ismtp";
        version = "4.0.2";
        sha256 = "0skyrp497p0gfh39j1ng7ahpbzfykfvykq720akafgnapgsfxkhm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers contstuff dnscache enumerator
          lifted-base monad-control netlines network vector
        ];
@@ -77772,7 +79769,7 @@ self: {
        pname = "iso3166-country-codes";
        version = "0.20140203.7";
        sha256 = "1cfmrkrx5wdcr8rrwakhmv0a5bxipxc3l7p4z5nxzl5nrjrli79s";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A datatype for ISO 3166 country codes";
        license = "LGPL";
      }) {};
@@ -77783,7 +79780,7 @@ self: {
        pname = "iso639";
        version = "0.1.0.3";
        sha256 = "1s15vb00nqxnmm59axapipib1snh6q5qhfdw7pgb9vdsz8i86jqj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/HugoDaniel/iso639";
        description = "ISO-639-1 language codes";
        license = stdenv.lib.licenses.bsd3;
@@ -77797,7 +79794,7 @@ self: {
        pname = "iso8583-bitmaps";
        version = "0.1.0.0";
        sha256 = "0w6m8ygpy1g95zvmbzq9402rxh4dj48i5bhcdzc4s0kig239gzqd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers parsec syb template-haskell
          th-lift
        ];
@@ -77811,8 +79808,8 @@ self: {
        pname = "iso8601-time";
        version = "0.1.3";
        sha256 = "05qwpcj4whibj0bmdnq0wns9ks5v4fqnsyq7sl2v36pd11h9i9zv";
-       buildDepends = [ base time ];
-       testDepends = [ base hspec HUnit time ];
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base hspec HUnit time ];
        homepage = "https://github.com/nh2/iso8601-time";
        description = "Convert to/from the ISO 8601 time format";
        license = stdenv.lib.licenses.mit;
@@ -77826,7 +79823,7 @@ self: {
        pname = "isohunt";
        version = "0.1.3";
        sha256 = "189dmxczmr0kqh440ziyp6kxx6iza2yyq7cs05hic9w8lhpwa6pw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default ghc-prim http-conduit text
          unordered-containers uri vector
        ];
@@ -77844,10 +79841,10 @@ self: {
        pname = "itanium-abi";
        version = "0.1.0.0";
        sha256 = "19ywiim8jjkpj2f7agvq98j4p7l1bw8lp2lmgimwq3bz17nrawwk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base boomerang text transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit process test-framework test-framework-hunit
        ];
        description = "An implementation of name mangling/demangling for the Itanium ABI";
@@ -77863,8 +79860,8 @@ self: {
        pname = "iter-stats";
        version = "0.1.0.4";
        sha256 = "1pfvxxps319ynfpaqgkiyk7gbpi4l2rfqzqyw27jhzlxx860yq71";
-       buildDepends = [ base heap iteratee ListLike mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base heap iteratee ListLike mtl ];
+       testHaskellDepends = [
          base heap HUnit iteratee ListLike mtl statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -77883,11 +79880,11 @@ self: {
        pname = "iterIO";
        version = "0.2.2";
        sha256 = "0cq0awzl249m9kzgs0hzs49r2v29q4dhq3sbd818izvyqzfzz4zm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bytestring containers filepath HsOpenSSL
          ListLike mtl network old-locale process stringsearch time unix
        ];
-       extraLibraries = [ zlib ];
+       librarySystemDepends = [ zlib ];
        jailbreak = true;
        homepage = "http://www.scs.stanford.edu/~dm/iterIO";
        description = "Iteratee-based IO with pipe operators";
@@ -77901,7 +79898,9 @@ self: {
        pname = "iterable";
        version = "3.0";
        sha256 = "194718jpjwkv3ynlpgjlpvf0iqnj7dkd3zmci363gsa425i3vlbc";
-       buildDepends = [ base mtl tagged template-haskell vector ];
+       libraryHaskellDepends = [
+         base mtl tagged template-haskell vector
+       ];
        homepage = "https://github.com/BioHaskell/iterable";
        description = "API for hierarchical multilevel collections";
        license = stdenv.lib.licenses.bsd3;
@@ -77917,11 +79916,11 @@ self: {
        pname = "iteratee";
        version = "0.8.9.6";
        sha256 = "1yc5fqqb8warvgld3cymka7d2wmjydvfin5jy7zaazb7alf14q1p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers exceptions ListLike monad-control
          parallel transformers transformers-base unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring exceptions HUnit ListLike monad-control mtl
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers transformers-base unix
@@ -77939,8 +79938,8 @@ self: {
        pname = "iteratee-compress";
        version = "0.3.3.1";
        sha256 = "1j5w3pfi8mx88wfg6fwrj5jccfp8spw0jwb4zh3yyzg1jacrpal4";
-       buildDepends = [ base bytestring iteratee mtl ];
-       extraLibraries = [ bzip2 zlib ];
+       libraryHaskellDepends = [ base bytestring iteratee mtl ];
+       librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77956,9 +79955,10 @@ self: {
        sha256 = "0a3f0m9lgc4ks18891a689bbb1c1kdrxswj42s5syvcq73y7v2h0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://inmachina.net/~jwlato/haskell/iteratee";
        description = "Iteratee-based I/O";
@@ -77973,7 +79973,7 @@ self: {
        pname = "iteratee-parsec";
        version = "0.0.6";
        sha256 = "1saffq3pl20fph6jdss6yzdgfaqxwb2183gb3qxj6cwsrblzz628";
-       buildDepends = [
+       libraryHaskellDepends = [
          base iteratee ListLike parsec reference transformers
        ];
        jailbreak = true;
@@ -77988,7 +79988,9 @@ self: {
        pname = "iteratee-stm";
        version = "0.1.2";
        sha256 = "1916phr07ckvm571rspswqr93z22la0mkxghvzljr0vgd1zi4p0x";
-       buildDepends = [ base iteratee stm stm-chans transformers ];
+       libraryHaskellDepends = [
+         base iteratee stm stm-chans transformers
+       ];
        jailbreak = true;
        homepage = "http://www.tiresiaspress.us/~jwlato/haskell/iteratee-stm";
        description = "Concurrent iteratees using STM";
@@ -78004,7 +80006,7 @@ self: {
        pname = "iterio-server";
        version = "0.3";
        sha256 = "1yz05y6i036irdbnsmhhr9lpcfk56ii6ls1fqdgh80h9giyi6c0n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring filepath iterIO ListLike monadIO mtl network split
          transformers unix
        ];
@@ -78021,10 +80023,9 @@ self: {
        pname = "ivar-simple";
        version = "0.3.1";
        sha256 = "1zn3nr0qmrnpr7jnpwgb4sancflbp9xmk2qyahl0d9vw7agqhwlm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Write once concurrency primitives";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivor" = callPackage
@@ -78035,7 +80036,7 @@ self: {
        pname = "ivor";
        version = "0.1.14.1";
        sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers directory haskell98 mtl parsec
        ];
        homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/";
@@ -78052,7 +80053,7 @@ self: {
        pname = "ivory";
        version = "0.1.0.0";
        sha256 = "1rn1akrsci0k5nbk4zipxznkdm0y3rvv9la5mnrr9mkj5zikj5sc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers monadLib parsec pretty template-haskell th-lift
        ];
        jailbreak = true;
@@ -78071,7 +80072,7 @@ self: {
        pname = "ivory-backend-c";
        version = "0.1.0.1";
        sha256 = "12rcaanxl86wna05x1gdkpfj90azn1z74cs3kfk9cp5g3g230ii4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdlib containers directory filepath ivory
          ivory-opts language-c-quote mainland-pretty monadLib process srcloc
          template-haskell
@@ -78092,9 +80093,10 @@ self: {
        sha256 = "03qqax98qr2qyidc71i81f70lbma1s2q5jikl3m4ni4wyj3gg1m3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base ivory ivory-backend-c monadLib parsec template-haskell
        ];
+       executableHaskellDepends = [ base ivory ivory-backend-c ];
        jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory bit-data support";
@@ -78112,7 +80114,7 @@ self: {
        sha256 = "0jjcr72s616y8g4288fz506p1swrv06c2fmds28yd1rqc57g1mrm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ivory ivory-backend-c ivory-opts ivory-quickcheck ivory-stdlib
          mainland-pretty monadLib pretty QuickCheck template-haskell
          wl-pprint
@@ -78131,7 +80133,7 @@ self: {
        pname = "ivory-hw";
        version = "0.1.0.0";
        sha256 = "1sa0ayym7ng5q7i356n59p18qqpy9cr2xcsmgh96a7ni4srbrbsy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base filepath ivory ivory-backend-c ivory-bitdata
        ];
        jailbreak = true;
@@ -78148,7 +80150,7 @@ self: {
        pname = "ivory-opts";
        version = "0.1.0.1";
        sha256 = "08ywjwkd37dld6h355r6a36h72s94gai7hs2r4hj5nk5pm7k4s5z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dlist fgl filepath ivory monadLib
        ];
        jailbreak = true;
@@ -78164,7 +80166,7 @@ self: {
        pname = "ivory-quickcheck";
        version = "0.1.0.0";
        sha256 = "0jbfpsmz8kq0h9gg5lm44pcdzhv8kv2rr554m4bic2bny94hnsjd";
-       buildDepends = [ base ivory monadLib QuickCheck random ];
+       libraryHaskellDepends = [ base ivory monadLib QuickCheck random ];
        jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "QuickCheck driver for Ivory";
@@ -78178,7 +80180,7 @@ self: {
        pname = "ivory-stdlib";
        version = "0.1.0.0";
        sha256 = "1a3d9916rgrznr5ci79ki918xg6xxd81krn8irv9wbp8h8ird2xq";
-       buildDepends = [ base filepath ivory ];
+       libraryHaskellDepends = [ base filepath ivory ];
        jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory standard library";
@@ -78194,7 +80196,7 @@ self: {
        pname = "ivy-web";
        version = "0.2";
        sha256 = "0m2wd8lh22nqyjiijw9ldl6l17fbkj7b4n0j5ymgrs3yx2mnnv1q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base invertible-syntax partial-isomorphisms snap snap-core
        ];
        homepage = "https://github.com/lilac/ivy-web/";
@@ -78209,7 +80211,7 @@ self: {
        pname = "ix-shapable";
        version = "0.1.0";
        sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Reshape multi-dimensional arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78222,7 +80224,7 @@ self: {
        sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base preprocessor-tools syb ];
+       executableHaskellDepends = [ base preprocessor-tools syb ];
        jailbreak = true;
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
@@ -78236,7 +80238,7 @@ self: {
        pname = "ixmonad";
        version = "0.57";
        sha256 = "1k8qfx9p6jw6gb4jsgq6y2bc6y6ah4h44gdgs0fxkrg371wyym7k";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78249,7 +80251,7 @@ self: {
        pname = "ixset";
        version = "1.0.6";
        sha256 = "097f9fkm9a2n67bzagr9h2v7acdn8h1ayv9c83n7nv1dh157bpyv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers safecopy syb syb-with-class template-haskell
        ];
        homepage = "http://happstack.com";
@@ -78266,10 +80268,10 @@ self: {
        pname = "ixset-typed";
        version = "0.3";
        sha256 = "0m6k5n755pfkx1grd5rbp1a9vlps6fdm25l91aa0wp5af1sakjmk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq safecopy syb template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Efficient relational queries on Haskell sets";
@@ -78288,7 +80290,7 @@ self: {
        sha256 = "1jb97jzm9w8z8jyswbcr3kdraam95by6bc1gpjddwn817dijf0q4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers directory filepath haskeline
          haskell98 hoauth mtl old-locale parsec time utf8-string xml
        ];
@@ -78308,7 +80310,7 @@ self: {
        sha256 = "0fls5krx9l0c7g755b4yyksiki45hbb6v7m0y6nsmpd217rggkb2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bimap containers directory filepath hx java-bridge
          java-bridge-extras java-reflect mtl named-records split strict
          strings syb transformers
@@ -78330,11 +80332,11 @@ self: {
        sha256 = "12ap7xcgzmp5zwmqkwsgxplh5li21m7xngijr4mhnn9y33xc1lrk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring enumset event-list explicit-exception midi
          non-negative transformers unix
        ];
-       pkgconfigDepends = [ libjack2 ];
+       libraryPkgconfigDepends = [ libjack2 ];
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
@@ -78346,9 +80348,9 @@ self: {
        pname = "jack-bindings";
        version = "0.1.1";
        sha256 = "1gmz2qiz7wzydj0rhswbfhwi0zbdcbps29l1lryzqxm8chfc9mbm";
-       buildDepends = [ base mtl ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ libjack2 ];
+       libraryHaskellDepends = [ base mtl ];
+       libraryPkgconfigDepends = [ libjack2 ];
+       libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78360,7 +80362,7 @@ self: {
        pname = "jackminimix";
        version = "0.1";
        sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd";
-       buildDepends = [ base hosc ];
+       libraryHaskellDepends = [ base hosc ];
        jailbreak = true;
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
@@ -78374,8 +80376,8 @@ self: {
        pname = "jacobi-roots";
        version = "0.2.0.4";
        sha256 = "1skpw2jm5g0lylc79n5fk37d3lrvhwb3cmn50wcy4i5nnjvfdijc";
-       buildDepends = [ base binary bytestring vector ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base binary bytestring vector ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/ghorn/jacobi-roots";
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
@@ -78389,7 +80391,7 @@ self: {
        pname = "jail";
        version = "0.0.1.1";
        sha256 = "0wxz3w5r1zc571ibyqskwk27ba1dafwwpr10psbsg44fj7ii3vvz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory monads-fd transformers
        ];
        jailbreak = true;
@@ -78402,12 +80404,12 @@ self: {
      mkDerivation {
        pname = "jailbreak-cabal";
        version = "1.3";
-       revision = "2";
        sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2";
+       revision = "2";
        editedCabalFile = "eb10d8166cc3a40e8d731ab1fba7d37ef57d155d6122c7234297ddbf776ec28a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal ];
        homepage = "http://github.com/peti/jailbreak-cabal";
        description = "Strip version restrictions from build dependencies in Cabal files";
        license = stdenv.lib.licenses.bsd3;
@@ -78419,8 +80421,8 @@ self: {
        pname = "jalaali";
        version = "0.2.0";
        sha256 = "025ryrz87bii3401nq0bhyigzrs6lkippds6r4h0qzpq4pg8l7m0";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/jalaali/jalaali-hs";
        description = "Convert Jalaali and Gregorian calendar systems to each other";
@@ -78436,15 +80438,15 @@ self: {
        pname = "jalla";
        version = "0.2.0.1";
        sha256 = "122lf1j9hs81yzj6hdv7a7q56846h1ggasbjgvjnk8r34d0xsl40";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans convertible mtl QuickCheck random
        ];
-       testDepends = [
+       librarySystemDepends = [ blas cblas lapacke ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
          base HUnit QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ blas cblas lapacke ];
        homepage = "https://github.com/cgo/jalla";
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
@@ -78462,11 +80464,12 @@ self: {
        sha256 = "1qfa90hi0kcylfw3p4m2qx5n4ni14426ssffj63hixqrqcnz60gx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base boxes bytestring conduit conduit-audio containers directory
-         filepath HPDF JuicyPixels process resourcet temporary text
-         transformers vector xml
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-audio containers directory filepath
+         HPDF JuicyPixels process resourcet temporary text transformers
+         vector xml
        ];
+       executableHaskellDepends = [ base boxes directory filepath ];
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
@@ -78483,7 +80486,10 @@ self: {
        sha256 = "0cfxq8k0k8r3wf4siypb78rqx5c9m2cm899bpa0zz591hc0p6k0w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary bytestring regex-tdfa zip-archive
+       ];
+       executableHaskellDepends = [
          array base binary bytestring regex-tdfa zip-archive
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
@@ -78502,10 +80508,13 @@ self: {
        sha256 = "16nm5jn5y3rs3g1m524gn8xqxw13973cmpllmylh6qdpqcz47457";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bimap containers cpphs directory filepath hinduce-missingh
-         hint mtl multimap named-records names split strings syb
-         transformers unix
+       libraryHaskellDepends = [
+         base containers cpphs directory filepath hinduce-missingh mtl
+         multimap strings syb transformers unix
+       ];
+       executableHaskellDepends = [
+         base bimap containers directory filepath hint multimap
+         named-records names split strings syb
        ];
        description = "Bindings to the JNI and a high level interface generator";
        license = stdenv.lib.licenses.mit;
@@ -78518,7 +80527,7 @@ self: {
        pname = "java-bridge-extras";
        version = "0.99";
        sha256 = "0wjxm0h5xlsab7iphcabb66c7gjxy7hyb502inlj5zxq1ic5ghzv";
-       buildDepends = [ base java-bridge transformers ];
+       libraryHaskellDepends = [ base java-bridge transformers ];
        jailbreak = true;
        description = "Utilities for working with the java-bridge package";
        license = stdenv.lib.licenses.mit;
@@ -78531,7 +80540,7 @@ self: {
        pname = "java-character";
        version = "0.0.4";
        sha256 = "1ms8m95mara3pp7qdg8jn2ajbq3zj8pnbs1b9jhpxbdkl5220768";
-       buildDepends = [ base diet ];
+       libraryHaskellDepends = [ base diet ];
        homepage = "https://github.com/tonymorris/java-character";
        description = "Functions to simulate Java's Character class";
        license = stdenv.lib.licenses.bsd3;
@@ -78543,7 +80552,7 @@ self: {
        pname = "java-reflect";
        version = "0.99";
        sha256 = "1vdfq3c8chqhss6jiy139yrm45mij4kjdwxf2wrsfm4064j0n3wc";
-       buildDepends = [ base containers hx java-bridge ];
+       libraryHaskellDepends = [ base containers hx java-bridge ];
        jailbreak = true;
        description = "Tools for reflecting on Java classes";
        license = stdenv.lib.licenses.mit;
@@ -78560,8 +80569,12 @@ self: {
        sha256 = "0k8si8rdhplfhfp5yq7rlkifj80401qyanfhv101h8amxg20m97w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring language-java-classfile ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       executableHaskellDepends = [
+         base binary bytestring language-java-classfile
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/javasf";
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
@@ -78576,8 +80589,10 @@ self: {
        sha256 = "1kzhp9gim9jl78jw8gm9vzxciiz6m04pjamgx1pqbhkji3lkw55d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/javav";
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
@@ -78592,7 +80607,7 @@ self: {
        pname = "jcdecaux-vls";
        version = "0.1.0";
        sha256 = "11army6p19xmdils32nxf5zbjh4fcsp075x7h3v2hbc08n6fkj8s";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit text transformers
        ];
        jailbreak = true;
@@ -78611,9 +80626,10 @@ self: {
        sha256 = "1jznizbnyg37lir155sq84dbsqcaavz061hj2a703w9x28s6pcnb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers mtl network transformers
        ];
+       executableHaskellDepends = [ base mtl network ];
        jailbreak = true;
        homepage = "https://github.com/VictorDenisov/jdi";
        description = "Implementation of Java Debug Interface";
@@ -78633,12 +80649,15 @@ self: {
        sha256 = "0wka2wq89x6vzhvr93wrlc8dp7shd8jic11camrgpqqsqk3j0pnd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         arrows base bytestring cmdargs data-default-class
+       libraryHaskellDepends = [
+         arrows base bytestring data-default-class
          data-default-instances-base HTTP http-encodings hxt hxt-tagsoup
          language-ecmascript network network-uri random
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base cmdargs HTTP network network-uri
+       ];
+       testHaskellDepends = [
          arrows base Diff directory filepath hxt tasty tasty-golden
          transformers
        ];
@@ -78661,11 +80680,12 @@ self: {
        sha256 = "0b7l4h3apkj41w69wg3ympflh2l53vbmyvs6xf20xn57d6p8lhn4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers haskell-src-exts haskell-src-meta
-         mtl parseargs parsec regex-posix safe syb template-haskell text
+         mtl parsec regex-posix safe syb template-haskell text
          unordered-containers vector wl-pprint-text
        ];
+       executableHaskellDepends = [ parseargs ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78679,7 +80699,7 @@ self: {
        pname = "jmacro-rpc";
        version = "0.3.2";
        sha256 = "1nf5f62s749xsji2rg25dgj7mc668l3n7i7l9n1pjkn8gfwm6bx3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-html bytestring containers
          contravariant jmacro mtl scientific split text unordered-containers
          vector
@@ -78697,7 +80717,7 @@ self: {
        pname = "jmacro-rpc-happstack";
        version = "0.3.2";
        sha256 = "0r5h8hlsjppnhqdxa0dsrjkpv3pldbkv5v4dryd4km2v38yfxkcr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html bytestring containers happstack-server jmacro
          jmacro-rpc mtl
        ];
@@ -78714,7 +80734,7 @@ self: {
        pname = "jmacro-rpc-snap";
        version = "0.3";
        sha256 = "1syzx2lw4r8knsqhsvilp04wb8a718379cmn0nhjqlwhpaja9bj8";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers jmacro jmacro-rpc mtl snap-core
        ];
        homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
@@ -78733,13 +80753,13 @@ self: {
        pname = "jobqueue";
        version = "0.1.5";
        sha256 = "0zfdh559qyzflrnh0gg23zfpw4vkp8qsx6syrblq2d0iknfybhir";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default
          fast-logger HDBC HDBC-sqlite3 hslogger hzk lifted-base
          monad-control monad-logger mtl network regex-posix split stm
          template-haskell text text-format time transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring data-default directory hspec network
          QuickCheck stm
        ];
@@ -78756,7 +80776,7 @@ self: {
        pname = "join";
        version = "0.4";
        sha256 = "0bx9cvdhhw7z30qgxwpl0j23z18sx7xyin2y7bwxvg5ga737j8qx";
-       buildDepends = [ base haskell98 multisetrewrite stm ];
+       libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html";
        description = "Parallel Join Patterns with Guards and Propagation";
        license = stdenv.lib.licenses.bsd3;
@@ -78769,7 +80789,7 @@ self: {
        pname = "joinlist";
        version = "0.3.0";
        sha256 = "0hjlyyylbh471696v9b1jckm7d4gfp1ka978sr1j0005d03gwv35";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
@@ -78784,7 +80804,7 @@ self: {
        pname = "jonathanscard";
        version = "0.1.1";
        sha256 = "0zwd5mdwamyl6xlflhj0yvp9k5yfrxggvv49d3hriz9z15f5v5g8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HTTP json mtl network old-locale time
        ];
        jailbreak = true;
@@ -78802,7 +80822,7 @@ self: {
        sha256 = "1c1nr8pq4vyn4mvyqms2mq1sm42qgr2mrznn5rsv34rd1f75b2d3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base gtk ];
+       executableHaskellDepends = [ array base gtk ];
        jailbreak = true;
        description = "JP's own ray tracer";
        license = "unknown";
@@ -78821,14 +80841,14 @@ self: {
        pname = "jose";
        version = "0.3.41.2";
        sha256 = "0pamg1wkp85zpwnbsvmsszy7nxsifl3zhbxvfmh44n0b6d2wg4w5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors byteable
          bytestring crypto-pubkey crypto-pubkey-types crypto-random
          cryptohash data-default-class ghc-prim integer-gmp lens network-uri
          safe semigroups template-haskell text time unordered-containers
          vector x509
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors byteable
          bytestring crypto-pubkey crypto-pubkey-types crypto-random
          cryptohash data-default-class hspec lens network-uri safe
@@ -78839,7 +80859,6 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-jose";
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose-jwt" = callPackage
@@ -78853,16 +80872,16 @@ self: {
      mkDerivation {
        pname = "jose-jwt";
        version = "0.6.2";
-       revision = "1";
        sha256 = "0fw3b34ghpjpm56iln1i46kr8dcj1yv8gmalgdl7ym7n9bvgrfzq";
+       revision = "1";
        editedCabalFile = "5aa6637a051160937328c7ff477615ff8424212374f46e41386c705e4db425c0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring byteable bytestring cereal cipher-aes
          containers crypto-cipher-types crypto-numbers crypto-pubkey
          crypto-pubkey-types crypto-random cryptohash either mtl text time
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-qq base base64-bytestring bytestring cipher-aes
          cprng-aes crypto-cipher-types crypto-pubkey crypto-pubkey-types
          crypto-random cryptohash doctest either hspec HUnit mtl QuickCheck
@@ -78871,7 +80890,6 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jpeg" = callPackage
@@ -78880,7 +80898,7 @@ self: {
        pname = "jpeg";
        version = "0.0.1.1";
        sha256 = "1hnfapr21zpfyiywa4zzmwa518jzg73dnmaakrbvvpcmr4fvh9qx";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78891,8 +80909,8 @@ self: {
        pname = "js-flot";
        version = "0.8.3";
        sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv";
-       buildDepends = [ base ];
-       testDepends = [ base HTTP ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HTTP ];
        homepage = "https://github.com/ndmitchell/js-flot#readme";
        description = "Obtain minified flot code";
        license = stdenv.lib.licenses.mit;
@@ -78904,7 +80922,7 @@ self: {
        pname = "js-good-parts";
        version = "0.0.7";
        sha256 = "0i3r3xl8hi2a3d6hrj77vbfi54bkq4pidrjcz13vz4az9dvz6k75";
-       buildDepends = [ base wl-pprint ];
+       libraryHaskellDepends = [ base wl-pprint ];
        homepage = "https://github.com/sseefried/js-good-parts.git";
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
@@ -78917,8 +80935,8 @@ self: {
        pname = "js-jquery";
        version = "1.11.3";
        sha256 = "0my2ncql2vkdhxcqiw4jly957zkjdvbbw9jhf2dk6ndfnp81jyrx";
-       buildDepends = [ base ];
-       testDepends = [ base HTTP ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HTTP ];
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
@@ -78932,11 +80950,11 @@ self: {
        pname = "jsaddle";
        version = "0.2.0.6";
        sha256 = "1ggnhv9lgsd330p1k6zvg20dbqb1ysh282nalxramqvn2yhmqsx4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens template-haskell text transformers webkitgtk3
          webkitgtk3-javascriptcore
        ];
-       testDepends = [
+       testHaskellDepends = [
          base glib gtk3 hslogger lens template-haskell text transformers
          webkitgtk3 webkitgtk3-javascriptcore
        ];
@@ -78952,7 +80970,7 @@ self: {
        sha256 = "07kgjp35vbwljhyz9i49fbvbj4d05gn8swzynb0hd02bbsl5i0dp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghcjs-dom jsaddle lens ];
+       executableHaskellDepends = [ base ghcjs-dom jsaddle lens ];
        jailbreak = true;
        homepage = "https://github.com/ghcjs/jsaddle-hello";
        description = "JSaddle Hello World, an example package";
@@ -78968,11 +80986,11 @@ self: {
        pname = "jsc";
        version = "0.1.1.1";
        sha256 = "18mvpncvsfv4gv7lx00g8aixjmhzp0yklxaajx45v2hsx0azn8zc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base jmacro lens template-haskell text transformers webkitgtk3
          webkitgtk3-javascriptcore
        ];
-       testDepends = [
+       testHaskellDepends = [
          base glib gtk3 hslogger jmacro lens template-haskell text
          transformers webkitgtk3 webkitgtk3-javascriptcore
        ];
@@ -78988,7 +81006,7 @@ self: {
        pname = "jsmw";
        version = "0.1";
        sha256 = "1r36w2h5007qln56gnyyd7w6bcqiymn1jw287z0waf4fhpy02ygq";
-       buildDepends = [ base DOM mtl WebBits ];
+       libraryHaskellDepends = [ base DOM mtl WebBits ];
        jailbreak = true;
        description = "Javascript Monadic Writer base package";
        license = stdenv.lib.licenses.bsd3;
@@ -79003,7 +81021,7 @@ self: {
        pname = "json";
        version = "0.9.1";
        sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers mtl parsec pretty syb text
        ];
        description = "Support for serialising Haskell to and from JSON";
@@ -79018,7 +81036,7 @@ self: {
        pname = "json-assertions";
        version = "1.0.7";
        sha256 = "1x73szyqb6w1hnhb4ab8dfc7hwn12avj4304jnr8lyxjg08hfaqa";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
        homepage = "http://github.com/ocharles/json-assertions.git";
@@ -79038,12 +81056,17 @@ self: {
        sha256 = "11x6am3hqzhai0dm02pk20l5pk5bpj434z8ic4b8lksnv8l5zq46";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers filepath GenericPretty hashable
          hflags hint lens mtl pretty process scientific text uniplate
          unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         hflags hint lens mtl pretty process scientific text uniplate
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson base bytestring containers directory filepath GenericPretty
          hashable hflags lens mtl pretty process QuickCheck scientific
          smallcheck text uniplate unordered-containers vector
@@ -79063,7 +81086,11 @@ self: {
        sha256 = "0wcvaswgffzvhfq7v5lqxp6xhxajaabbxkqpqxp5vwcv5slkiags";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring bytestring-nums bytestring-trie
+         bytestringparser-temporary containers utf8-string
+       ];
+       executableHaskellDepends = [
          base bytestring bytestring-nums bytestring-trie
          bytestringparser-temporary containers utf8-string
        ];
@@ -79082,7 +81109,7 @@ self: {
        pname = "json-builder";
        version = "0.3";
        sha256 = "0k8b93bqi68c7nwq09cws8kfm84kd4k5lpy4z9ifks1jaiyj3vxm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-textual bytestring containers text
          unordered-containers utf8-string vector
        ];
@@ -79100,7 +81127,7 @@ self: {
        pname = "json-enumerator";
        version = "0.0.1.2";
        sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-builder-enumerator bytestring containers
          enumerator json-types text transformers
        ];
@@ -79118,10 +81145,10 @@ self: {
      mkDerivation {
        pname = "json-extra";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "1wqn68brkjmix7xidcb7170ydpxwq1p48qqmm4w9ak0zkvm70fks";
+       revision = "1";
        editedCabalFile = "76113c3d47cb5d8087ffe18e1b09eaa22cc8dcd07010537739c7f1e4dc6b0741";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default template-haskell
          unordered-containers yaml
        ];
@@ -79139,11 +81166,11 @@ self: {
        pname = "json-fu";
        version = "0.1.1";
        sha256 = "098ps56igr12wm9hai3agh2hdmvd00rzpdd5lw0ffjivjxxfh829";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers hashable mtl syb text
          time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring containers hashable hspec mtl syb
          text time unordered-containers vector
        ];
@@ -79159,10 +81186,10 @@ self: {
        pname = "json-python";
        version = "0.4.0.1";
        sha256 = "0ga3clvmq20xlyx47bril651xg8rhq77s7nj6r1v836m3xwcb0y9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers pureMD5 template-haskell
        ];
-       pkgconfigDepends = [ python ];
+       libraryPkgconfigDepends = [ python ];
        jailbreak = true;
        homepage = "http://stewart.guru";
        description = "Call python inline from haskell";
@@ -79176,7 +81203,9 @@ self: {
        pname = "json-qq";
        version = "0.4.1";
        sha256 = "0rpfv0i4jhjkq39xcs3b89ms0w4il4l7f385msqj93qzj76is7m6";
-       buildDepends = [ base haskell-src-meta parsec template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta parsec template-haskell
+       ];
        homepage = "http://github.com/finnsson/json-qq";
        description = "Json Quasiquatation library for Haskell";
        license = "unknown";
@@ -79193,12 +81222,12 @@ self: {
        pname = "json-rpc";
        version = "0.2.1.6";
        sha256 = "1y9c95qbvkg0r75y4dd0fvcy5r0bj08pklf7hl052ncwm87l9hln";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base bytestring conduit conduit-extra
          deepseq hashable mtl stm stm-conduit text transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base bytestring conduit conduit-extra deepseq hashable
          mtl QuickCheck stm stm-conduit test-framework
          test-framework-quickcheck2 text unordered-containers
@@ -79222,11 +81251,11 @@ self: {
        sha256 = "1ma5vahbcfarbvc0m8n88i0hn9szbvanmfd81jmvwkamkqxxgmis";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring json-rpc-server mtl text unordered-containers
          vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring HUnit json-rpc-server mtl QuickCheck
          scientific test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
@@ -79247,10 +81276,10 @@ self: {
        sha256 = "1rbm8anj3lg3x7gky5nazxcsdwd5c48b1axphgcqzzy5hn8hsg2r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring deepseq mtl text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring HUnit mtl test-framework test-framework-hunit
          text unordered-containers vector
        ];
@@ -79268,14 +81297,14 @@ self: {
      mkDerivation {
        pname = "json-schema";
        version = "0.7.3.7";
-       revision = "1";
        sha256 = "0lrr5zhydb2g36xlpr3mhn0m6bz138gbm0zih3f3qamnsm21mjk5";
+       revision = "1";
        editedCabalFile = "94b50ebb4b1aa921270db172dbef2ed18c85846d147d1526ec9c85ea0be1705a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-utils attoparsec base bytestring generic-aeson tasty
          tasty-hunit tasty-th text vector
        ];
@@ -79291,7 +81320,7 @@ self: {
        pname = "json-sop";
        version = "0.1.0.4";
        sha256 = "02x65fh0s3gl8adij8xg8mgqp7p3jj4yjhhvch51zgbhcflsb7cv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
        ];
@@ -79308,10 +81337,10 @@ self: {
        pname = "json-stream";
        version = "0.3.0.4";
        sha256 = "01hmy7xxlh79mspcx3xgmqlndj8p2mqdjlakr3sl4p837xdkhv2d";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring hspec scientific text unordered-containers
          vector
        ];
@@ -79330,7 +81359,7 @@ self: {
        pname = "json-togo";
        version = "0.1.1.0";
        sha256 = "0aw0dkv1scllj56vj9q07a44vfs88f3k5x1m80y0mivlpz0280l3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-trans base bytestring scientific text
          transformers unordered-containers vector
        ];
@@ -79349,7 +81378,7 @@ self: {
        sha256 = "13iyhsq4010ypgmlsdkdk93w8dhg6v0cllsf0avfaxkdva9lrqkf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring containers process tar text
          unordered-containers vector
        ];
@@ -79364,7 +81393,7 @@ self: {
        pname = "json-types";
        version = "0.1";
        sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn";
-       buildDepends = [ base containers text ];
+       libraryHaskellDepends = [ base containers text ];
        description = "Basic types for representing JSON";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -79377,7 +81406,7 @@ self: {
        pname = "json2";
        version = "0.8.3";
        sha256 = "1w7x67cykbnr2h8jjjqd5whf7pq7vwk7r9g1q1i9g25b9b49i7r8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers json2-types mtl old-locale
          parsec pretty time utf8-string
        ];
@@ -79394,7 +81423,7 @@ self: {
        pname = "json2-hdbc";
        version = "0.5.1";
        sha256 = "1flbh68ymm39ccw5h9fiwy35qarn8zkxljmnjgg6fd39j8zbc3dj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HDBC json2 json2-types time utf8-string
        ];
        description = "Support JSON for SQL Database";
@@ -79408,7 +81437,7 @@ self: {
        pname = "json2-types";
        version = "0.1";
        sha256 = "0gr5mfi68hvk8wajw6wbimmwxd0rgjwqrg3mjyfppkr1nwkyfzpr";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Defined JSON data types and function for renders JSON to string";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79421,7 +81450,7 @@ self: {
        sha256 = "1ip9qgrzr59v3zxcj6l1dys0zbfj9s8fgdj4lv1grh7wbzdfz9dn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring yaml ];
+       executableHaskellDepends = [ aeson base bytestring yaml ];
        homepage = "http://github.com/snoyberg/json2yaml/tree/master";
        description = "Utility to convert a file from JSON to YAML format. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -79435,7 +81464,7 @@ self: {
        pname = "jsonresume";
        version = "0.1.0.1";
        sha256 = "14kv1cbjh1m9ri0vjj015hx6bx6l7jv71gpfa6n0fg21hh5fl7a4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring old-locale text time unordered-containers
        ];
        jailbreak = true;
@@ -79455,7 +81484,11 @@ self: {
        sha256 = "08mjwic7qbp241ydxiy5lm782igwd4ba27sii3csv4wdgdxgd3vy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit conduit-extra mtl text
+         transformers unordered-containers
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra mtl text
          transformers unordered-containers
        ];
@@ -79472,11 +81505,11 @@ self: {
        pname = "jsonschema-gen";
        version = "0.3.0.1";
        sha256 = "18hc6a7ihjpnnnjsx4r403w2zx2nzxa4qvj4picdw83r4sgjvv2d";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers scientific tagged text time
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers process tagged text
        ];
        homepage = "https://github.com/yuga/jsonschema-gen";
@@ -79495,7 +81528,7 @@ self: {
        sha256 = "1mr4xdwspza87kvaq4337k6hwzvrjxsr5bybdp1sv3x3fdg481ir";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring containers HUnit
          optparse-applicative scientific string-qq text unordered-containers
          vector
@@ -79517,7 +81550,7 @@ self: {
        sha256 = "0qilhv14q51g3dzsxk0zp5fp2igy7m79lq1qsk1myrd6iyannxc5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring containers csv
          optparse-applicative scientific string-qq text unordered-containers
          vector
@@ -79536,7 +81569,7 @@ self: {
        pname = "jspath";
        version = "0.1";
        sha256 = "072q6mipfaqf33w806chf2226zpay124lgph0wlgfdbhfd5118n7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie JSONb utf8-string
        ];
        description = "Extract substructures from JSON by following a path";
@@ -79552,9 +81585,9 @@ self: {
        pname = "judy";
        version = "0.2.3";
        sha256 = "1acw072v0lj2jkc6lffcigl1miy1r4wv52qxk6qql0wdg5ydjcjh";
-       buildDepends = [ base bytestring ghc-prim ];
-       testDepends = [ base hspec QuickCheck ];
-       extraLibraries = [ Judy ];
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       librarySystemDepends = [ Judy ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "http://github.com/mwotton/judy";
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
@@ -79572,11 +81605,16 @@ self: {
        sha256 = "07galk5i5lq4dx1njd5851c7jz4qwhw8da76ggxd91f9xpvkmf9y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath hashable
          minisat mtl pretty process unordered-containers
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory filepath hashable
+         minisat mtl pretty process unordered-containers
+       ];
+       executableToolDepends = [ alex ];
        description = "A first-order reasoning toolbox";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79589,7 +81627,8 @@ self: {
        sha256 = "0ymp7hkkla7jxn3c7prsrcdl0mzkpqdm6ivq599qwx39rcnq6dpl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parallel ];
+       libraryHaskellDepends = [ base parallel ];
+       executableHaskellDepends = [ base parallel ];
        description = "an elementary symmetric chiffre for pragmatically protecting one's effects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79602,7 +81641,7 @@ self: {
        pname = "jvm-parser";
        version = "0.2.1";
        sha256 = "0rhixf1syrnhql3aqlvl9hcylaiyhca1yvismdzalkhbz0qdgvir";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754 fgl
          fingertree pretty zlib
        ];
@@ -79621,12 +81660,12 @@ self: {
        pname = "jwt";
        version = "0.6.0";
        sha256 = "02nb1nz7rrgqgr9dg01gi2kh29hpy4mlwpvk5ziqcg3zkb0gl60w";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring containers cryptohash
          data-default http-types network network-uri scientific semigroups
          text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring bytestring containers cryptohash
          data-default http-types HUnit lens lens-aeson network network-uri
          QuickCheck scientific semigroups tasty tasty-hunit tasty-quickcheck
@@ -79646,11 +81685,11 @@ self: {
        pname = "kademlia";
        version = "1.1.0.0";
        sha256 = "0wjyslrhbms6cnm495g40yl6365h3vgjcka12lka8xdy89v3c0yy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl network stm transformers
          transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers HUnit mtl network QuickCheck stm tasty
          tasty-hunit tasty-quickcheck transformers transformers-compat
        ];
@@ -79668,10 +81707,10 @@ self: {
        pname = "kafka-client";
        version = "0.7.0.1";
        sha256 = "1577s3s9lf3rdw7xf7snfhiw53h6pg85l5h9l29av5fsg051ifai";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal digest dlist network snappy time zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal containers hspec hspec-discover network
          process QuickCheck temporary time
        ];
@@ -79689,7 +81728,7 @@ self: {
        pname = "kan-extensions";
        version = "4.2.2";
        sha256 = "0dqqlrzrhz8di5hp4kby3205inpj2r30bl75zyy24nq4hgans7g5";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions array base comonad containers contravariant
          distributive free mtl semigroupoids tagged transformers
        ];
@@ -79704,7 +81743,7 @@ self: {
        pname = "kangaroo";
        version = "0.4.0";
        sha256 = "1l7b71dhrxd2g3nbqg3h0n5dvgxr23av1cy1f0mvw347y91rx36x";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
        description = "Binary parsing with random access";
@@ -79720,7 +81759,7 @@ self: {
        pname = "kansas-comet";
        version = "0.3.1";
        sha256 = "0xbapi4clmkighxh0jb12zpzgrz9sqyfpwdkvrj6cdq6i6a22qx1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers data-default scotty stm text time
          transformers unordered-containers
        ];
@@ -79740,16 +81779,17 @@ self: {
      mkDerivation {
        pname = "kansas-lava";
        version = "0.2.4.3";
-       revision = "1";
        sha256 = "0i2k5jzirgn68g685azyjp2x96fd2mif56ghxvi566aa1qs5gw1v";
+       revision = "1";
        editedCabalFile = "7b1860125ab2958d3831cb2536a6b939879f09951199649182bb848e70b583eb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs containers data-default data-reify
          directory dotgen filepath netlist netlist-to-vhdl process random
          sized-types strict template-haskell
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "Kansas Lava is a hardware simulator and VHDL generator";
@@ -79767,10 +81807,11 @@ self: {
        sha256 = "076hd8c59hivdirpf4y5vgdlvhq74lfd5zm6np34y8hblq6jyl0m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava network sized-types
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
@@ -79786,7 +81827,7 @@ self: {
        pname = "kansas-lava-papilio";
        version = "0.3.1";
        sha256 = "0n8ffiygl72cbqza0whmkhsqyg6d7flfdz1jvr22g68x3005r00y";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava kansas-lava-cores netlist network sized-types
        ];
@@ -79803,7 +81844,7 @@ self: {
        pname = "kansas-lava-shake";
        version = "0.1.2";
        sha256 = "00xkrm724d7q5dmdgz41gm5s058b75rr4pgv3f6qkkx7g9qbd6d7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath hastache kansas-lava shake
          temporary text
        ];
@@ -79820,7 +81861,7 @@ self: {
        pname = "karakuri";
        version = "0.1.1";
        sha256 = "0ys4kx4pq9xrb4gjg6syyim8mpfy3yzyyiw2mdc4vh9hmsny373c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers minioperational mtl transformers
        ];
        jailbreak = true;
@@ -79837,10 +81878,10 @@ self: {
        pname = "karver";
        version = "0.1.2";
        sha256 = "0rbxhwxajcv8y6m0pz316r431jh5k8w3bcxqw117cnv6xkwgxpi1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base hspec text unordered-containers vector
        ];
        description = "A simple template engine, inspired by jinja2";
@@ -79858,11 +81899,12 @@ self: {
        sha256 = "1hvi23r9wgz77w6wl9nhpvkcbajm5m8kmy87pjmfgifj60d9cmhg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring ConfigFile containers directory errors
          filepath lens mtl parsec text url wreq zip-archive
        ];
-       testDepends = [ base bytestring directory mtl ];
+       executableHaskellDepends = [ base bytestring mtl ];
+       testHaskellDepends = [ base bytestring directory mtl ];
        jailbreak = true;
        homepage = "https://github.com/davnils/katt";
        description = "Client for the Kattis judge system";
@@ -79878,7 +81920,7 @@ self: {
        sha256 = "1skz1yllkwbpx4wd8w8q4zmqd3f62baaj5pja6dpqr2xviiv0j6g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://tcana.info/rpoku";
        description = "Rpoku spoken word programming language";
        license = "GPL";
@@ -79890,7 +81932,9 @@ self: {
        pname = "kd-tree";
        version = "0.1.0";
        sha256 = "0j9wlap9gx2szb5saa4pxm7mp2w132ki1p6mlcv0s0wy9rv6dnm7";
-       buildDepends = [ base lens linear vector vector-algorithms ];
+       libraryHaskellDepends = [
+         base lens linear vector vector-algorithms
+       ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/kd-tree";
        description = "A simple k-d tree implementation";
@@ -79907,7 +81951,7 @@ self: {
        sha256 = "1n19jika26wgv7nhbbwnjjhmcbgqqag06k467r6q0s16ilp1p5nr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cmdargs directory MissingH parsec
          process
        ];
@@ -79923,8 +81967,8 @@ self: {
        pname = "kdt";
        version = "0.2.3";
        sha256 = "0chxxl53jnnhfs02gxr2a3kzppmsnwrrfr1fjyx71lkvigwy71yk";
-       buildDepends = [ base deepseq deepseq-generics heap ];
-       testDepends = [ base deepseq deepseq-generics QuickCheck ];
+       libraryHaskellDepends = [ base deepseq deepseq-generics heap ];
+       testHaskellDepends = [ base deepseq deepseq-generics QuickCheck ];
        homepage = "https://github.com/giogadi/kdt";
        description = "Fast and flexible k-d trees for various types of point queries";
        license = stdenv.lib.licenses.mit;
@@ -79936,7 +81980,7 @@ self: {
        pname = "keera-callbacks";
        version = "0.1";
        sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Mutable memory locations with callbacks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79949,7 +81993,7 @@ self: {
        pname = "keera-hails-i18n";
        version = "0.0.3.3";
        sha256 = "0aih2mxgyfnrfnvqqsdv5g7r4jgjg5cfqykgalcsb9wqv0gq6d4i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath glib hgettext MissingK setlocale
          utf8-string
        ];
@@ -79964,7 +82008,7 @@ self: {
        pname = "keera-hails-mvc-controller";
        version = "0.0.3.3";
        sha256 = "00qr5czm0hq3jxwp42fc50v6r458rm9qq9fpri4rhnc41il79nzb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based controller for MVC applications";
        license = stdenv.lib.licenses.bsd3;
@@ -79978,7 +82022,7 @@ self: {
        pname = "keera-hails-mvc-environment-gtk";
        version = "0.0.3.3";
        sha256 = "0bk3191x8bsvmmnqyf7jzmrlg71q26z2kn4xfahdnpgxw3qskwmr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
          keera-hails-mvc-view-gtk
        ];
@@ -79995,7 +82039,7 @@ self: {
        pname = "keera-hails-mvc-model-lightmodel";
        version = "0.0.3.4";
        sha256 = "085qppi68qf8jbkp674ldikhr5z4nrffzqa9kgdm1dngrgsib190";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers keera-hails-reactivevalues MissingK stm
          template-haskell
        ];
@@ -80013,7 +82057,7 @@ self: {
        pname = "keera-hails-mvc-model-protectedmodel";
        version = "0.0.3.5";
        sha256 = "14jm1116j3plzglxygjdymfy8z3p5k8zinnh8wazkxgc5y9kkcsx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers keera-hails-reactivevalues MissingK stm
          template-haskell
        ];
@@ -80028,7 +82072,7 @@ self: {
        pname = "keera-hails-mvc-solutions-config";
        version = "0.0.3.3";
        sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1";
-       buildDepends = [ base directory filepath MissingK ];
+       libraryHaskellDepends = [ base directory filepath MissingK ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Easy handling of configuration files";
        license = stdenv.lib.licenses.bsd3;
@@ -80045,7 +82089,7 @@ self: {
        pname = "keera-hails-mvc-solutions-gtk";
        version = "0.0.3.4";
        sha256 = "01sksznn8rxv4ww3p99qm8dhjlpy03ygavp512zmyrpvydhp86mm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk hslogger HTTP keera-hails-mvc-environment-gtk
          keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
          keera-hails-mvc-view-gtk keera-hails-reactivevalues MissingK mtl
@@ -80062,7 +82106,7 @@ self: {
        pname = "keera-hails-mvc-view";
        version = "0.0.3.3";
        sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Generic View for MVC applications";
        license = stdenv.lib.licenses.bsd3;
@@ -80074,7 +82118,9 @@ self: {
        pname = "keera-hails-mvc-view-gtk";
        version = "0.0.3.3";
        sha256 = "1yz4drm0r1831acg9y8glg7hgiqwgc5nqkz4hfgqgfngqs94jx4z";
-       buildDepends = [ base gtk gtk-helpers keera-hails-mvc-view ];
+       libraryHaskellDepends = [
+         base gtk gtk-helpers keera-hails-mvc-view
+       ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based View for MVC applications";
        license = stdenv.lib.licenses.bsd3;
@@ -80088,12 +82134,13 @@ self: {
        pname = "keera-hails-reactive-fs";
        version = "0.0.3.4";
        sha256 = "1yinlhp08xxdlbnm90gnwbr1h9sp8r741ihd8kihy1yfqzkp85cy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory fsnotify keera-hails-reactivevalues system-filepath
        ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Files as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-gtk" = callPackage
@@ -80104,13 +82151,12 @@ self: {
        pname = "keera-hails-reactive-gtk";
        version = "0.0.3.6";
        sha256 = "1i7l330y10vf35b61y9r5wij0gm871n4bc6lij56nx20msi66ch4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk gtk-helpers keera-hails-reactivevalues mtl transformers
        ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-network" = callPackage
@@ -80119,7 +82165,9 @@ self: {
        pname = "keera-hails-reactive-network";
        version = "0.0.3.3";
        sha256 = "1379djvy5nn6k67ds7mk9jjh03zd6sj0v8sf5agmk3pf5cyp0xa3";
-       buildDepends = [ base keera-hails-reactivevalues network ];
+       libraryHaskellDepends = [
+         base keera-hails-reactivevalues network
+       ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
@@ -80132,7 +82180,9 @@ self: {
        pname = "keera-hails-reactive-polling";
        version = "0.0.3.3";
        sha256 = "1khkbhj94y6y5s2d56h718c8kh3y698wdryi2369mrw755dy6qh8";
-       buildDepends = [ base keera-callbacks keera-hails-reactivevalues ];
+       libraryHaskellDepends = [
+         base keera-callbacks keera-hails-reactivevalues
+       ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Polling based Readable RVs";
        license = stdenv.lib.licenses.bsd3;
@@ -80144,7 +82194,9 @@ self: {
        pname = "keera-hails-reactive-wx";
        version = "0.0.3.3";
        sha256 = "02ikqqfgwr3nrr18qdd1jshqm0dlnwbybqpzpj2ba7zbwpabd5bw";
-       buildDepends = [ base keera-hails-reactivevalues wx wxcore ];
+       libraryHaskellDepends = [
+         base keera-hails-reactivevalues wx wxcore
+       ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
@@ -80158,7 +82210,7 @@ self: {
        pname = "keera-hails-reactive-yampa";
        version = "0.0.3.3";
        sha256 = "1n1xyr9pc1sw9gypwhh1rfdjshg7x1kvwr6v3hp0837zvdcz8gw1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base keera-callbacks keera-hails-reactivevalues time Yampa
        ];
        homepage = "http://www.keera.es/blog/community/";
@@ -80172,7 +82224,7 @@ self: {
        pname = "keera-hails-reactivevalues";
        version = "0.0.3.4";
        sha256 = "0qqp4ss0prl3z4bwrsd5jmbvdmhh7x3m846b58dd7ibb0bycp1pb";
-       buildDepends = [ base contravariant ];
+       libraryHaskellDepends = [ base contravariant ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Values";
        license = stdenv.lib.licenses.bsd3;
@@ -80195,7 +82247,7 @@ self: {
        sha256 = "0nlq68da3yfmp058j637xy25jjdwia8b1z49zf70rhdmyh8kvh60";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          allocated-processor base bytestring cmdargs containers
          cv-combinators directory filepath gio glib gtk gtk-helpers hgettext
          HOpenCV HTTP IfElse keera-hails-i18n keera-hails-mvc-controller
@@ -80224,7 +82276,7 @@ self: {
        sha256 = "0bwwsxav04dnipg5xvb8j4ncxbd5mw6r5gisn5avqjm34wr8y2b9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson ansi-terminal async base bytestring conduit conduit-extra
          directory filepath hslogger network optparse-applicative process
          text unix unordered-containers yaml
@@ -80251,7 +82303,7 @@ self: {
        sha256 = "0bsq6z7krisshcrkb528kixiw6liabb7chgk87088vn3gpwx048i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array async attoparsec base blaze-builder bytestring
          case-insensitive conduit conduit-extra containers data-default
          directory filepath fsnotify http-client http-conduit
@@ -80260,7 +82312,8 @@ self: {
          unix unix-compat unordered-containers vector wai wai-app-static
          wai-extra warp warp-tls yaml zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [ base data-default filepath ];
+       testHaskellDepends = [
          base bytestring conduit hspec HUnit transformers unix
        ];
        homepage = "http://www.yesodweb.com/";
@@ -80279,7 +82332,7 @@ self: {
        sha256 = "00hghd44h8d87kbf0j8ns78syz79a9sdwl454sb5n6ynq62fgwr1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring containers cprng-aes damnpacket
          data-default exceptions HTTP lens mtl network regex-pcre-builtin
          stm text time tls tls-extra
@@ -80295,7 +82348,7 @@ self: {
        pname = "keycode";
        version = "0.1";
        sha256 = "1cwj96mzxqagim3bcshzsrm2mxgmm8rrawy6hkvki9l55cggwbpv";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/RyanGlScott/keycode";
        description = "Maps web browser keycodes to their corresponding keyboard keys";
        license = stdenv.lib.licenses.bsd3;
@@ -80309,7 +82362,8 @@ self: {
        sha256 = "1j7nynr7sksrqdn4zfp9ikwx6vvlimlhwhifbs68igfdn03gxnrd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base udbus ];
+       libraryHaskellDepends = [ base udbus ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
@@ -80324,7 +82378,7 @@ self: {
        pname = "keys";
        version = "3.10.2";
        sha256 = "1xmyhsqpz4rvm2i8f8xgd1wpj8qlps0lvbif1li73lzg13jiwps2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad containers free hashable semigroupoids
          semigroups transformers unordered-containers
        ];
@@ -80347,12 +82401,17 @@ self: {
        sha256 = "0hswqspbb0lmr33bz1d5f12fhs66i2ynynxii6qwcsrzjn77ps8j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty ansi-wl-pprint api-tools asn1-encoding
          asn1-types base base64-bytestring byteable bytestring cipher-aes
          containers crypto-pubkey crypto-random directory filepath lens mtl
-         old-locale optparse-applicative pbkdf process raw-strings-qq
-         regex-compat-tdfa safe setenv text time unordered-containers vector
+         old-locale optparse-applicative pbkdf regex-compat-tdfa safe setenv
+         text time unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint api-tools base bytestring directory filepath
+         mtl optparse-applicative process raw-strings-qq setenv text
+         unordered-containers
        ];
        homepage = "http://github.com/cdornan/keystore";
        description = "Managing stores of secret things";
@@ -80368,7 +82427,7 @@ self: {
        pname = "keyvaluehash";
        version = "0.3.1.2";
        sha256 = "1gph4cfx1xqjzhzx6nl2sfgqa6mk6a272a65gk5j43yjfh4s17gl";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring derive directory filepath hashable
          mmap storable-record
        ];
@@ -80386,8 +82445,13 @@ self: {
        sha256 = "18cj2l804d77mxzmdl2mai1a157yljskadqdlinmc9w9krhcx4jx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cassava containers parsec ];
-       testDepends = [ base containers hspec parsec parseerror-eq ];
+       libraryHaskellDepends = [ base containers parsec ];
+       executableHaskellDepends = [
+         base bytestring cassava containers parsec
+       ];
+       testHaskellDepends = [
+         base containers hspec parsec parseerror-eq
+       ];
        homepage = "https://github.com/stackbuilders/keyword-args";
        description = "Extract data from a keyword-args config file format";
        license = stdenv.lib.licenses.mit;
@@ -80413,10 +82477,10 @@ self: {
        pname = "kicad-data";
        version = "0.1.0.0";
        sha256 = "02bgz21jw76kzn57z2a7njbwz366j5hpjimyn7dw05h3c64gf8h1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ieee754 lens-family parsec parsec-numbers pretty-compact
        ];
-       testDepends = [
+       testHaskellDepends = [
          base ieee754 lens-family parsec parsec-numbers pretty-compact
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -80435,8 +82499,8 @@ self: {
        pname = "kickass-torrents-dump-parser";
        version = "0.0.1";
        sha256 = "1bqv07v5sx0jaalnzyk703g08js6sb2snvpsk6ld5zr6iqm7k4wk";
-       buildDepends = [ base bytestring cassava text vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cassava text vector ];
+       testHaskellDepends = [
          base bytestring cassava hspec hspec-expectations string-qq text
          vector
        ];
@@ -80455,8 +82519,8 @@ self: {
        pname = "kickchan";
        version = "0.1.0.4";
        sha256 = "1gmp8d2gm275mc379rhyhyfk7r2z8d1mhaz0nikbg4wpczhqf0n7";
-       buildDepends = [ base containers primitive vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers primitive vector ];
+       testHaskellDepends = [
          base containers HUnit primitive QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -80475,7 +82539,7 @@ self: {
        sha256 = "1d8abd4l8mcgcfqmm06zmd7yxvfls1kqkphx64bi6mmqzy8lcx3k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs hostname old-time parsec twine
        ];
        description = "Process KIF iOS test logs";
@@ -80489,7 +82553,7 @@ self: {
        pname = "kinds";
        version = "0.0.1.5";
        sha256 = "169f2b0nn7mkjws6c5sb3mih2p6snhfq42bkfds3zxz01y53v2g5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/kinds";
        description = "Emulation of subkinds and subkind polymorphism";
        license = stdenv.lib.licenses.bsd3;
@@ -80506,7 +82570,7 @@ self: {
        sha256 = "0557v1js7bzd9a00lq078csr66pdrr4kr9qiign2zwz03rrcaviw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal attoparsec base cabal-file-th cmdargs containers
          directory errors filepath Glob mtl process text unix
          unordered-containers yaml
@@ -80523,7 +82587,7 @@ self: {
        pname = "kmeans";
        version = "0.1.3";
        sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "K-means clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80536,8 +82600,8 @@ self: {
        pname = "kmeans-par";
        version = "1.5.1";
        sha256 = "087z1r9fljvysgl940qpnrf7any80fy33shmn8hbmn2kwgczn69c";
-       buildDepends = [ base metric parallel semigroups vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base metric parallel semigroups vector ];
+       testHaskellDepends = [
          base hspec metric normaldistribution parallel QuickCheck semigroups
          vector
        ];
@@ -80554,7 +82618,8 @@ self: {
        sha256 = "1ckw3dmwwqzgbl0wcd6h435afjddqmim3y19p2wqcghxd2rk8bdv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl probable vector ];
+       libraryHaskellDepends = [ base mtl vector ];
+       executableHaskellDepends = [ base probable vector ];
        homepage = "http://github.com/alpmestan/kmeans-vector";
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
@@ -80566,7 +82631,7 @@ self: {
        pname = "knob";
        version = "0.1.1";
        sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c";
-       buildDepends = [ base bytestring transformers ];
+       libraryHaskellDepends = [ base bytestring transformers ];
        homepage = "https://john-millikin.com/software/knob/";
        description = "Memory-backed handles";
        license = stdenv.lib.licenses.mit;
@@ -80582,9 +82647,10 @@ self: {
        sha256 = "1yv26gnf8aipjh6d6apszbx4jwvfa7cafnjz0frw73xagnd1z084";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-default deepseq mtl parallel vector yap
        ];
+       executableHaskellDepends = [ base containers parallel ];
        jailbreak = true;
        description = "Khovanov homology computations";
        license = stdenv.lib.licenses.mit;
@@ -80596,8 +82662,8 @@ self: {
        pname = "koellner-phonetic";
        version = "0.0";
        sha256 = "0r7gbgvs49y1nyq5z5f2sb4sjfr847l1vrbih2f5975i3hd9c9kg";
-       buildDepends = [ base HUnit ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base HUnit ];
+       testHaskellDepends = [ base HUnit ];
        description = "\"map German words to code representing pronunciation\"";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80613,11 +82679,11 @@ self: {
        pname = "kontrakcja-templates";
        version = "0.1";
        sha256 = "020vcd04dxaxcd3bb9vwgw1qvxnz5gx590mjkbnnxrcjhl9yd9j8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory HStringTemplate html MissingH
          mtl old-time parsec transformers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory hslogger HStringTemplate HUnit MissingH
          mtl old-time string-templates syb test-framework
          test-framework-hunit test-framework-quickcheck2 time
@@ -80636,7 +82702,7 @@ self: {
        pname = "koofr-client";
        version = "1.0.0.3";
        sha256 = "1bz7akd7sssn1gzqfvr0y343771zk7dn1n3as0m93wg4ifpz1dia";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring filepath http-client http-client-tls
          http-types mtl
        ];
@@ -80653,7 +82719,9 @@ self: {
        sha256 = "1mwndf83yl57bawc6vk8983qca3yhcdiczj6q7n1rgv8qphnw0wz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring haskell98 simpleargs ];
+       executableHaskellDepends = [
+         base bio bytestring haskell98 simpleargs
+       ];
        homepage = "http://blog.malde.org/";
        description = "The Korfu ORF Utility";
        license = "GPL";
@@ -80667,8 +82735,8 @@ self: {
        pname = "kqueue";
        version = "0.1.2.6";
        sha256 = "1q25ahsxsxrj8l99skymzssklj11d5prsa09b23dmbgc4qw28lg8";
-       buildDepends = [ base directory filepath mtl time unix ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base directory filepath mtl time unix ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "http://github.com/hesselink/kqueue";
        description = "A binding to the kqueue event library";
@@ -80684,7 +82752,7 @@ self: {
        pname = "kraken";
        version = "0.0.1";
        sha256 = "1df6g65wrhzfz3kj9n4bcja09adr4qhl3kzv5vaxl37lbr9nwzr2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls mtl
        ];
        description = "Kraken.io API client";
@@ -80701,11 +82769,11 @@ self: {
        pname = "krpc";
        version = "0.6.1.0";
        sha256 = "0ldhg4ahhfp4jy3ijssfmcwfg68dggw3biqmc4my2qrcgd2mvx29";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bencoding bytestring containers data-default-class lifted-base
          monad-control monad-logger mtl network text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bencoding bytestring hspec monad-logger mtl network QuickCheck
          quickcheck-instances
        ];
@@ -80720,7 +82788,7 @@ self: {
        pname = "ks-test";
        version = "0.1";
        sha256 = "1xj9bnwiws3rnax3rlf67p8dh487w07xl99h81a9j1wjkqysldym";
-       buildDepends = [ base gamma random-fu roots vector ];
+       libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -80731,8 +82799,8 @@ self: {
        pname = "ktx";
        version = "0.2";
        sha256 = "1s7jw27p96spksja6ks2xdnhyds8diwc5y7h22bj6cq5kglskvxf";
-       buildDepends = [ base bytestring OpenGL ];
-       pkgconfigDepends = [ egl glew ];
+       libraryHaskellDepends = [ base bytestring OpenGL ];
+       libraryPkgconfigDepends = [ egl glew ];
        homepage = "https://github.com/corngood/ktx";
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
@@ -80744,7 +82812,7 @@ self: {
        pname = "kure";
        version = "2.16.10";
        sha256 = "0xfnrp39w2ip9744898mfd63sbya8an72fx3nwj1s3vzdb1h3lhm";
-       buildDepends = [ base dlist transformers ];
+       libraryHaskellDepends = [ base dlist transformers ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html";
        description = "Combinators for Strategic Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -80756,7 +82824,7 @@ self: {
        pname = "kure-your-boilerplate";
        version = "0.1.3";
        sha256 = "0bfcmx1fz521vkc2lrbpyvaqcy4c29h5xp6wmyxvgrjjnq32ld1b";
-       buildDepends = [ base kure template-haskell ];
+       libraryHaskellDepends = [ base kure template-haskell ];
        jailbreak = true;
        homepage = "http://ittc.ku.edu/~andygill/kure.php";
        description = "Generator for Boilerplate KURE Combinators";
@@ -80770,8 +82838,8 @@ self: {
        pname = "kyotocabinet";
        version = "0.1.3";
        sha256 = "1wzwmfmh2cx3c9blnhk7ibsimwsnnxz9jpcdfdkgy5rb28wvvkyz";
-       buildDepends = [ base bytestring cereal ];
-       extraLibraries = [ kyotocabinet ];
+       libraryHaskellDepends = [ base bytestring cereal ];
+       librarySystemDepends = [ kyotocabinet ];
        description = "Mid level bindings to Kyoto Cabinet";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) kyotocabinet;};
@@ -80782,8 +82850,8 @@ self: {
        pname = "l-bfgs-b";
        version = "0.1.0.1";
        sha256 = "0ypzkq2rpbmdjfqba72pl3wf6d4wz0z5vmy84dq5m38ij5mlb4y7";
-       buildDepends = [ base vector ];
-       extraLibraries = [ lbfgsb ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ lbfgsb ];
        homepage = "http://nonempty.org/software/haskell-l-bfgs-b";
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
        license = stdenv.lib.licenses.bsd3;
@@ -80796,7 +82864,7 @@ self: {
        pname = "labeled-graph";
        version = "1.0.0.0";
        sha256 = "060nvnlh1h8vxi6k2hsz79fn4xypangdj5v4q0kc6abyf9garf7r";
-       buildDepends = [ base labeled-tree ];
+       libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80808,7 +82876,7 @@ self: {
        pname = "labeled-tree";
        version = "1.0.0.0";
        sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Labeled tree structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80824,10 +82892,14 @@ self: {
        sha256 = "18bgd9v4bh3wfh7p7xjzrsj130cppm6x55vzagcpn10cwqag41cs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bytestring cmdlib containers directory hslogger
          mtl old-locale parsec random split text time transformers uuid
        ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdlib containers directory hslogger mtl
+         random split text transformers uuid
+       ];
        jailbreak = true;
        homepage = "https://github.com/lucasdicioccio/laborantin-hs";
        description = "an experiment management framework";
@@ -80843,11 +82915,11 @@ self: {
        pname = "labyrinth";
        version = "0.5.0.0";
        sha256 = "1yi53vg248j8ww08z2a5v3agci84q3m2d37h9mdbprciryh3hfcl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers derive lens monad-loops MonadRandom mtl parsec
          random safecopy template-haskell transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers derive HTF HUnit lens monad-loops MonadRandom mtl
          parsec QuickCheck random safecopy template-haskell transformers
        ];
@@ -80872,14 +82944,14 @@ self: {
        sha256 = "00mx8zmwqawp2hh1a0v4r26w7wsji0iz7jwsh83742wimir316aw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state aeson base bytestring containers derive filepath hamlet
          labyrinth lens mtl parsec random safecopy shakespeare-css
          shakespeare-js template-haskell text transformers
          unordered-containers utf8-string vector wai-websockets warp
          websockets yesod yesod-static
        ];
-       testDepends = [
+       testHaskellDepends = [
          acid-state aeson base bytestring containers derive directory
          filepath hamlet HTF http-types HUnit labyrinth lens mtl parsec
          QuickCheck random safecopy shakespeare-css shakespeare-js
@@ -80903,8 +82975,10 @@ self: {
        pname = "lagrangian";
        version = "0.6.0.1";
        sha256 = "07jlmfynnq42syim9k7hks6zmkzq2i62slvwwik8w2rg07ran72v";
-       buildDepends = [ ad base hmatrix nonlinear-optimization vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         ad base hmatrix nonlinear-optimization vector
+       ];
+       testHaskellDepends = [
          ad base hmatrix HUnit nonlinear-optimization test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -80924,7 +82998,7 @@ self: {
        sha256 = "0brysrzz0cci6hqm5ldl7fk5zqhcjp7naifabks1zk3mzg8kr1x1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base-prelude either record system-fileio system-filepath
          template-haskell text transformers
        ];
@@ -80941,7 +83015,7 @@ self: {
        pname = "lambda-ast";
        version = "0.0.12";
        sha256 = "07i0fw7hvkzky9rwrnh4b3i35crbv4mkj0w001dwkgsh1flzh95f";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Lambda Calculi Abstract Syntax Trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80954,7 +83028,8 @@ self: {
        sha256 = "0qiqw4av62fdf2b1qc64lvj84lkzcfpik7lvq81qk015pz58cbs3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/LambdaBridge";
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
        license = stdenv.lib.licenses.bsd3;
@@ -80967,7 +83042,7 @@ self: {
        pname = "lambda-canvas";
        version = "0.1";
        sha256 = "14wl1w1sc0j1yjfad5v00346ccxp0grfs1677hnjqwisashdac92";
-       buildDepends = [ base GLUT mtl OpenGL time ];
+       libraryHaskellDepends = [ base GLUT mtl OpenGL time ];
        jailbreak = true;
        description = "Educational drawing canvas for FP explorers";
        license = stdenv.lib.licenses.mit;
@@ -80984,10 +83059,13 @@ self: {
        sha256 = "1j2j6clm35ffvdjlh7apydir06g7az40gsqvlcw8p4qbdk2z2vrh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary containers dimensional distributed-process
+       ];
+       executableHaskellDepends = [
          base binary containers dimensional distributed-process numtype
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary containers dimensional distributed-process HUnit
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -81004,7 +83082,7 @@ self: {
        pname = "lambda-options";
        version = "0.8.0.0";
        sha256 = "1z9gmps06w458v8i3zpkalby83p367r3z9i0c312jxl0zp51q891";
-       buildDepends = [ base containers mtl read-bounded ];
+       libraryHaskellDepends = [ base containers mtl read-bounded ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/lambda-options";
        description = "A modern command-line parser for Haskell";
@@ -81017,7 +83095,7 @@ self: {
        pname = "lambda-placeholders";
        version = "0.0.0.0";
        sha256 = "0s3y55yqa5js1q3rfq8dgdip6rnjag4w5j5vdldghq9ax5yph3gd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mmirman/lambda-placeholders";
        description = "A library to emulate laceholders similar to Scala";
        license = stdenv.lib.licenses.bsd3;
@@ -81031,7 +83109,7 @@ self: {
        sha256 = "1m11gdwq4nma3231043h5szplmask5152y2r9ayyrpacczddcbim";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://scravy.de/blog/2012-02-20/a-lambda-toolbox-in-haskell.htm";
        description = "An application to work with the lambda calculus (for learning)";
        license = stdenv.lib.licenses.bsd3;
@@ -81046,7 +83124,7 @@ self: {
        sha256 = "0490yswk7zsyc2lskyqkwa98xsaj5a2cgw4pyxbg5920lyjqb3n8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ haskell2010 parsec ];
+       executableHaskellDepends = [ haskell2010 parsec ];
        homepage = "https://patch-tag.com/r/mkollar/lambda2js/";
        description = "Untyped Lambda calculus to JavaScript compiler";
        license = stdenv.lib.licenses.gpl3;
@@ -81059,8 +83137,8 @@ self: {
        pname = "lambdaBase";
        version = "0.0.2.0";
        sha256 = "19c2bxipilb2lag7qzk4ajlzqch574dbhqk9cna13ijsjiyq24nd";
-       buildDepends = [ base parsec ];
-       testDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -81073,7 +83151,7 @@ self: {
        sha256 = "0gji0jix99qbldqkclymnwf5pnmiszy0qka9m2wq8kyi09f3y4h8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 html ];
+       executableHaskellDepends = [ base haskell98 html ];
        homepage = "http://www.cse.unsw.edu.au/~chak/haskell/lambdaFeed/";
        description = "RSS 2.0 feed generator";
        license = "GPL";
@@ -81090,7 +83168,7 @@ self: {
        sha256 = "1xw1496q84wrzy1r3dwvwy04sb3184namnmdj5kspc5pmd8ipx0h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring haskeline lambdaBase mtl network
        ];
        description = "...";
@@ -81110,7 +83188,7 @@ self: {
        sha256 = "1kbrmxz5604jzcx9l6j4lmbb0xqz2cmj0f30nmpzdkmzsqv1hfj2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base lambdabot-core lambdabot-haskell-plugins lambdabot-irc-plugins
          lambdabot-misc-plugins lambdabot-novelty-plugins
          lambdabot-reference-plugins lambdabot-social-plugins
@@ -81118,7 +83196,6 @@ 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
@@ -81133,7 +83210,7 @@ self: {
        pname = "lambdabot-core";
        version = "5.0.3";
        sha256 = "12gawsimdqch61rh4zwvzrx6pqx8yd645wqpki8dr56wnmbhbr03";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
          hslogger HTTP lifted-base monad-control mtl network parsec random
@@ -81159,7 +83236,7 @@ self: {
        pname = "lambdabot-haskell-plugins";
        version = "5.0.3";
        sha256 = "0iya4zipjjaqrld0a1v334praw1vnw186scfsi6inqdg314jc7x1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts hoogle HTTP IOSpec
          lambdabot-core lambdabot-reference-plugins lambdabot-trusted
@@ -81170,7 +83247,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -81182,7 +83258,7 @@ self: {
        pname = "lambdabot-irc-plugins";
        version = "5.0.3";
        sha256 = "1v4zh2yjdgy9ix6dmxdh8j5iqyrixaln78c5jgpiyjcwgi17blrw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath lambdabot-core
          lifted-base mtl network SafeSemaphore split time
        ];
@@ -81202,7 +83278,7 @@ self: {
        pname = "lambdabot-misc-plugins";
        version = "5.0.1";
        sha256 = "08dhwls7lgwrpyqzjxpg95cn80mqf3izrwnzbmygkp3my8xqxakp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers filepath hstatsd lambdabot-core
          lifted-base mtl network network-uri parsec process random random-fu
          random-source regex-tdfa SafeSemaphore split tagsoup
@@ -81223,14 +83299,13 @@ self: {
        pname = "lambdabot-novelty-plugins";
        version = "5.0.3";
        sha256 = "086y8p92a8g2zjjkxj1ny4s1dlza2dz1v64g3jg7p0dz1n1s1jpy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
        ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -81242,7 +83317,7 @@ self: {
        pname = "lambdabot-reference-plugins";
        version = "5.0.3";
        sha256 = "1yw1l0jl4iym2q2lfgzcmxm8865av37kf7zji0f7in2phqs3r1zz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
        ];
@@ -81259,7 +83334,7 @@ self: {
        pname = "lambdabot-social-plugins";
        version = "5.0.1";
        sha256 = "0ylp40j54whn4fsgxi0843mvs0gx286c5fm127ja1h7j6c74svkc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers lambdabot-core mtl split time
        ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
@@ -81273,7 +83348,7 @@ self: {
        pname = "lambdabot-trusted";
        version = "5.0.2.1";
        sha256 = "078yhq9d0vxgnc01hfa25kf4kdg4mymg9678jqmyk8csjy5gjw0h";
-       buildDepends = [ base oeis QuickCheck QuickCheck-safe ];
+       libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot trusted code";
        license = "GPL";
@@ -81287,10 +83362,10 @@ self: {
      mkDerivation {
        pname = "lambdabot-utils";
        version = "4.2.2";
-       revision = "3";
        sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7";
+       revision = "3";
        editedCabalFile = "f54d43d6964d63f1d8796606419b512a6e7b87b1defe960748c27c7417f59a08";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers haskell-src mtl network old-time
          process random regex-compat regex-posix syb tagsoup unix
          utf8-string zlib
@@ -81312,7 +83387,7 @@ self: {
        sha256 = "18m7z0lmi26ib1n1wrql96wb5i229k8fk3iw4vavs9j59b4pz1br";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cmdargs containers dyre glade gtk mtl network webkit
        ];
        jailbreak = true;
@@ -81333,19 +83408,18 @@ self: {
        pname = "lambdacms-core";
        version = "0.3.0.2";
        sha256 = "0m8piymzcciy4dqhxqxslpm1rbzasm1diasr8ab05r9lcrs1dn76";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers data-default esqueleto
          file-embed friendly-time gravatar lists mime-mail old-locale
          persistent shakespeare template-haskell text time uuid wai yesod
          yesod-auth yesod-core yesod-form
        ];
-       testDepends = [
+       testHaskellDepends = [
          base classy-prelude classy-prelude-yesod hspec yesod yesod-core
        ];
        homepage = "http://lambdacms.org";
        description = "LambdaCms 'core' subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacms-media" = callPackage
@@ -81356,14 +83430,13 @@ self: {
        pname = "lambdacms-media";
        version = "0.4.0.0";
        sha256 = "0vq32qppnasc24jrjh6c19hr2pxby65c5m5k90fk7afyms307b5c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath lambdacms-core persistent shakespeare text
          time yesod yesod-form
        ];
        homepage = "http://lambdacms.org";
        description = "LambdaCms \"media\" extension";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube" = callPackage
@@ -81374,7 +83447,7 @@ self: {
        sha256 = "1qwwcbs7slddpjlz3dlyjr32xk66clcbxbnb6j1d5v5dz9mvjh3b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base editline mtl pretty ];
+       executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81386,7 +83459,9 @@ self: {
        pname = "lambdacube-bullet";
        version = "0.2.1";
        sha256 = "1wnv8vgp100fdnx4g80d3gshbba9jni7rbjhhj8rx1mi0wcc1bcv";
-       buildDepends = [ base bullet lambdacube-engine mtl vector ];
+       libraryHaskellDepends = [
+         base bullet lambdacube-engine mtl vector
+       ];
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Example for combining LambdaCube and Bullet";
        license = stdenv.lib.licenses.bsd3;
@@ -81401,7 +83476,7 @@ self: {
        pname = "lambdacube-core";
        version = "0.2.0";
        sha256 = "001nw31h61dawh036yk4w9b35aha6c6xdmsl4vdipnr3kwykgk9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie containers mtl vector
        ];
        homepage = "http://lambdacube3d.wordpress.com/";
@@ -81417,7 +83492,7 @@ self: {
        pname = "lambdacube-edsl";
        version = "0.2.0";
        sha256 = "18lbkshc9wh7scb2bbvl565w6yryz7n1iy14r81cahnj7m68fj8m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie containers ghc-prim lambdacube-core
          mtl vector
        ];
@@ -81436,7 +83511,7 @@ self: {
        pname = "lambdacube-engine";
        version = "0.2.4";
        sha256 = "1xdp10nylndmfw16dywqrxj30g99rf9qbcx5qiglvzm1c1kxid3f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bitmap bytestring bytestring-trie containers
          directory filepath mtl OpenGLRaw stb-image uulib vect vector
          vector-algorithms xml zip-archive
@@ -81455,7 +83530,9 @@ self: {
        sha256 = "14l40ncbkblphmyn4prqiy2w70agcw830bpyawfdilf93bs340b9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base elerea GLFW-b lambdacube-engine mtl ];
+       executableHaskellDepends = [
+         base elerea GLFW-b lambdacube-engine mtl
+       ];
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Examples for LambdaCube";
        license = stdenv.lib.licenses.bsd3;
@@ -81471,7 +83548,7 @@ self: {
        pname = "lambdacube-gl";
        version = "0.2.0";
        sha256 = "1r26gvpyfvk87wx1fpp6y5687q5y7pxzmjvm55r96m976200lz50";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bitmap bytestring bytestring-trie containers
          lambdacube-core lambdacube-edsl language-glsl mtl OpenGLRaw
          prettyclass vector
@@ -81480,7 +83557,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "OpenGL backend for LambdaCube graphics language (main package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-samples" = callPackage
@@ -81494,7 +83570,7 @@ self: {
        sha256 = "0zl9d524a81vg3h7f9cbfi34b0hw452bd30xmgvg9ayfwxa842d1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bytestring-trie elerea GLFW-b lambdacube-core
          lambdacube-edsl lambdacube-gl mtl OpenGLRaw stb-image time vect
          vector
@@ -81520,7 +83596,7 @@ self: {
        sha256 = "01mqmhnq70k3yg29z492x7d6mzpwlijdrrgf0zbz8c8mlgnm4ljx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state authenticate-oauth base bytestring case-insensitive
          conduit containers data-default exceptions hint http-conduit
          http-types lens MissingH monad-control monad-logger mtl mueval
@@ -81544,7 +83620,7 @@ self: {
        sha256 = "0xlvz4r09vn1vdvs5wykry626hwcsg2zvdvl6jf6zrsq9331zcwy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring enumerator gtk mtl
        ];
        jailbreak = true;
@@ -81562,10 +83638,10 @@ self: {
        pname = "lame-tester";
        version = "1.2";
        sha256 = "1wa7h48a7hfb748i4chl2lpizrqmsdydg9vbwjf8gmy5cwlh816y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers semigroups validation
        ];
-       testDepends = [ base containers tasty tasty-hunit ];
+       testHaskellDepends = [ base containers tasty tasty-hunit ];
        homepage = "http://github.com/TheBizzle";
        description = "A strange and unnecessary selective test-running library";
        license = stdenv.lib.licenses.bsd3;
@@ -81580,7 +83656,7 @@ self: {
        sha256 = "14aiqk1l1d3bh7dcml4a85xg81583h3r30h5splw0lvcxmbggzp3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec syb ];
+       libraryHaskellDepends = [ base parsec syb ];
        homepage = "http://patch-tag.com/r/adept/language-asn1";
        description = "Parsing of ASN1 definitions";
        license = stdenv.lib.licenses.bsd3;
@@ -81592,7 +83668,7 @@ self: {
        pname = "language-bash";
        version = "0.6.0";
        sha256 = "07hb9hg4grmf01zlvfm583q9km4dxfgm4pkb9glihl3v7iqz21vs";
-       buildDepends = [ base parsec pretty transformers ];
+       libraryHaskellDepends = [ base parsec pretty transformers ];
        jailbreak = true;
        homepage = "http://github.com/knrafto/language-bash/";
        description = "Parsing and pretty-printing Bash shell scripts";
@@ -81611,7 +83687,11 @@ self: {
        sha256 = "166n9x3gil42w26r7p9d1jq6iy0yi9zacijkfmxj2gkkswyyb91x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers lens mtl parsec pretty random stream-monad
+         transformers
+       ];
+       executableHaskellDepends = [
          ansi-terminal base cmdargs containers filepath HUnit lens mtl
          parsec pretty random stream-monad time transformers
        ];
@@ -81630,11 +83710,11 @@ self: {
        pname = "language-c";
        version = "0.4.7";
        sha256 = "1r0jlncv6d6ai8kblrdq9gz8abx57b24y6hfh30xx20zdgccjvaz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath pretty process
          syb
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        homepage = "http://www.sivity.net/projects/language.c/";
        description = "Analysis and generation of C code";
        license = stdenv.lib.licenses.bsd3;
@@ -81646,8 +83726,8 @@ self: {
        pname = "language-c-comments";
        version = "0.3";
        sha256 = "1rmciff72zpcq7pvbbxlsg2339dbk00k18vxp35sz8haql0jnrf2";
-       buildDepends = [ array base language-c ];
-       buildTools = [ alex ];
+       libraryHaskellDepends = [ array base language-c ];
+       libraryToolDepends = [ alex ];
        homepage = "http://github.com/ghulette/language-c-comments";
        description = "Extracting comments from C code";
        license = stdenv.lib.licenses.bsd3;
@@ -81662,11 +83742,11 @@ self: {
        pname = "language-c-inline";
        version = "0.7.9.1";
        sha256 = "0apxv1mcmglb3m06dchs25sc7bhgz6v4gv098yfb79qmjmsxpc33";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
        ];
-       testDepends = [ base language-c-quote ];
+       testHaskellDepends = [ base language-c-quote ];
        jailbreak = true;
        homepage = "https://github.com/mchakravarty/language-c-inline/";
        description = "Inline C & Objective-C code in Haskell for language interoperability";
@@ -81684,16 +83764,16 @@ self: {
        pname = "language-c-quote";
        version = "0.11";
        sha256 = "1v55pmzrsd7nvxdkik0fh5psbycx9cv4j5zwzlv872lzhfsr3lc7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
          mtl srcloc syb symbol template-haskell
        ];
-       testDepends = [
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
          base bytestring HUnit mainland-pretty srcloc symbol test-framework
          test-framework-hunit
        ];
-       buildTools = [ alex happy ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
@@ -81705,7 +83785,7 @@ self: {
        pname = "language-cil";
        version = "0.2.2";
        sha256 = "0b3yapn53bwaxia7b59kizzcxh1d3842as1cbkyzd096v8wsgwfa";
-       buildDepends = [ base bool-extras ];
+       libraryHaskellDepends = [ base bool-extras ];
        jailbreak = true;
        homepage = "https://github.com/tomlokhorst/language-cil";
        description = "Manipulating Common Intermediate Language AST";
@@ -81718,7 +83798,7 @@ self: {
        pname = "language-css";
        version = "0.0.3";
        sha256 = "1g0mh08rz44533473isrqbfn6hp12np9dxm85cn5xpx68jl9ni9g";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "CSS 2.1 syntax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81731,7 +83811,7 @@ self: {
        sha256 = "0cjjfm7mcsl0x5by7gvbsdrr92x88i8sadb4pz6qh618sgrci7ax";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty ];
+       libraryHaskellDepends = [ base mtl parsec pretty ];
        description = "A library for the analysis and creation of Graphviz DOT files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81746,11 +83826,11 @@ self: {
        pname = "language-ecmascript";
        version = "0.17.0.1";
        sha256 = "1yawnk6ylx7g9fgx2ib11dgkwkpaz2cy3iph84pxzgqw30yh9q4l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default-class Diff mtl parsec QuickCheck
          template-haskell testing-feat uniplate wl-pprint
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers data-default-class Diff directory filepath HUnit
          mtl parsec QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 uniplate wl-pprint
@@ -81768,7 +83848,7 @@ self: {
        pname = "language-ecmascript-analysis";
        version = "0.9.1";
        sha256 = "04zc3iwls4hxlsa2c77an5q1h0xylndld02sn38sgykx6ibmmy9n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers language-ecmascript parsec uniplate
        ];
        homepage = "http://github.com/jswebtools/language-ecmascript-analysis";
@@ -81785,11 +83865,11 @@ self: {
        pname = "language-eiffel";
        version = "0.1.2";
        sha256 = "1v3m31ffx4pmgq92ahvlyzsh9hjvrdsmyzhd61qxzgpn3z9zzlcm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq derive ghc-prim
          hashable lens mtl parsec pretty text unordered-containers
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
        homepage = "https://github.com/scottgw/language-eiffel";
        description = "Parser and pretty printer for the Eiffel language";
        license = stdenv.lib.licenses.bsd3;
@@ -81803,8 +83883,8 @@ self: {
        pname = "language-fortran";
        version = "0.3";
        sha256 = "0csp0nmiwb2kflahhnnjxa7gmam3k9c4ivvh2wg919x85yp7v40z";
-       buildDepends = [ array base haskell-src parsec syb ];
-       buildTools = [ alex happy ];
+       libraryHaskellDepends = [ array base haskell-src parsec syb ];
+       libraryToolDepends = [ alex happy ];
        description = "Fortran lexer and parser, language support, and extensions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81815,7 +83895,7 @@ self: {
        pname = "language-gcl";
        version = "0.2";
        sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf";
-       buildDepends = [ base bifunctors parsers ];
+       libraryHaskellDepends = [ base bifunctors parsers ];
        jailbreak = true;
        description = "Something similar to Dijkstra's guarded command language";
        license = stdenv.lib.licenses.mit;
@@ -81831,8 +83911,9 @@ self: {
        sha256 = "1wmfzif1cc3a8sls3swms9x54hm9ic8y301zav6fg4mr7xa4hqr3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec prettyclass ];
-       testDepends = [
+       libraryHaskellDepends = [ base parsec prettyclass ];
+       executableHaskellDepends = [ base parsec prettyclass ];
+       testHaskellDepends = [
          base HUnit parsec prettyclass test-framework test-framework-hunit
        ];
        description = "GLSL abstract syntax tree, parser, and pretty-printer";
@@ -81845,7 +83926,7 @@ self: {
        pname = "language-go";
        version = "0.8";
        sha256 = "1p545115x73q4mzfja50f4lxal97ydvz9r3wq6pvcqls2xgvxzvc";
-       buildDepends = [ array base parsec utf8-string ];
+       libraryHaskellDepends = [ array base parsec utf8-string ];
        jailbreak = true;
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
@@ -81858,7 +83939,7 @@ self: {
        pname = "language-guess";
        version = "0.1.2";
        sha256 = "0gdnkc1hb0mcn494vk9r7fw19hvaba807brwh6fna0sxyh2nx3p0";
-       buildDepends = [ base bytestring cereal containers ];
+       libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81869,7 +83950,7 @@ self: {
        pname = "language-haskell-extract";
        version = "0.2.4";
        sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
-       buildDepends = [ base regex-posix template-haskell ];
+       libraryHaskellDepends = [ base regex-posix template-haskell ];
        homepage = "http://github.com/finnsson/template-helper";
        description = "Module to automatically extract functions from the local code";
        license = stdenv.lib.licenses.bsd3;
@@ -81877,19 +83958,19 @@ self: {
 
   "language-java" = callPackage
     ({ mkDerivation, alex, array, base, cpphs, directory, filepath
-     , HUnit, mtl, parsec, pretty, QuickCheck, syb, test-framework
+     , HUnit, mtl, parsec, pretty, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "language-java";
        version = "0.2.7";
        sha256 = "1519grsjw0f4skldxs563qz07mmj1cg72ma0plmvzpas7inkikyf";
-       buildDepends = [ array base cpphs parsec pretty syb ];
-       testDepends = [
+       libraryHaskellDepends = [ array base cpphs parsec pretty ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
          base directory filepath HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       buildTools = [ alex ];
        homepage = "http://github.com/vincenthz/language-java";
        description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -81904,7 +83985,7 @@ self: {
        pname = "language-java-classfile";
        version = "0.2.0";
        sha256 = "0pzlvzx5rv006mn88b15zvvrhf7h681xpl166368b92dc0x85gcf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754
          data-flags deepseq language-java LibZip mtl parsec utf8-string
        ];
@@ -81922,15 +84003,15 @@ self: {
        pname = "language-javascript";
        version = "0.5.14.2";
        sha256 = "0inm6yncl5dv9ij3fyk38c6mad8fm1vqs70rpqi1a7w2n5cbv1ia";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base blaze-builder bytestring containers mtl utf8-string
        ];
-       testDepends = [
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
          array base blaze-builder bytestring Cabal containers HUnit mtl
          QuickCheck test-framework test-framework-hunit utf8-light
          utf8-string
        ];
-       buildTools = [ alex happy ];
        homepage = "http://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
@@ -81945,12 +84026,12 @@ self: {
        pname = "language-kort";
        version = "0.1.0.0";
        sha256 = "0dhrzd470hfvkjpizgg9czgyz80nc9sq86r2zcimsch6rxmid0i0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring random razom-text-util
          regex-applicative smaoin text text-position utf8-string
          vocabulary-kadma
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck smaoin text vocabulary-kadma
        ];
        homepage = "http://rel4tion.org/projects/language-kort/";
@@ -81967,12 +84048,12 @@ self: {
        pname = "language-lua";
        version = "0.6.3.2";
        sha256 = "0wnmybaqiwwxg8xcs7g1ffsmv8kmld7m6s0a8wp0lvhdil7d9xq6";
-       buildDepends = [ array base deepseq mtl parsec safe ];
-       testDepends = [
+       libraryHaskellDepends = [ array base deepseq mtl parsec safe ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
          base deepseq directory filepath parsec QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
-       buildTools = [ alex ];
        homepage = "http://github.com/osa1/language-lua";
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -81986,7 +84067,8 @@ self: {
        sha256 = "0fgjkx003bn0bi4z6rgg8yvsl8k8almydh2lajkyp6zi5348vcv5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty ];
+       libraryHaskellDepends = [ base mtl parsec pretty ];
+       executableHaskellDepends = [ base pretty ];
        homepage = "http://github.com/jtdaugherty/language-mixal/";
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
@@ -82001,11 +84083,11 @@ self: {
        pname = "language-objc";
        version = "0.4.2.8";
        sha256 = "0dqx8fzbh53kakbh62zmq3x4gx4p5zfwisi3z6n03mjyfv3wv6jv";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath newtype pretty
          process syb
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://www.tiresiaspress.us/haskell/language-objc";
        description = "Analysis and generation of Objective C code";
@@ -82021,7 +84103,8 @@ self: {
        sha256 = "0xbwd0arsxinszlmdql5d61w33mpqya8gybkllyb1v7xhqskjasr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       executableHaskellDepends = [ attoparsec base bytestring ];
        jailbreak = true;
        homepage = "http://www.github.com/bgamari/language-openscad";
        description = "A simple parser for OpenSCAD";
@@ -82037,8 +84120,10 @@ self: {
        pname = "language-pig";
        version = "0.3.0.1";
        sha256 = "1lv8zm352him9rby1k0n90bklx8wlvr1w8anzmr54fmbd9ibx0f2";
-       buildDepends = [ base Cabal containers parsec pretty-tree ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base Cabal containers parsec pretty-tree
+       ];
+       testHaskellDepends = [
          base Cabal HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
@@ -82064,16 +84149,22 @@ self: {
        sha256 = "1h6zsslp3szc3m2ki273a6w47gf9fizyjh0xxby694cmhspknn90";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptohash Diff directory either
-         exceptions filecache Glob hashable hruby hslogger hslua hspec lens
-         lens-aeson luautils mtl operational optparse-applicative
-         parallel-io parsec parsers pcre-utils process regex-pcre-builtin
-         scientific servant servant-client split stm strict-base-types text
-         time transformers unix unordered-containers vector yaml
+         case-insensitive containers cryptohash directory either exceptions
+         filecache hashable hruby hslogger hslua lens lens-aeson luautils
+         mtl operational parsec parsers pcre-utils process
+         regex-pcre-builtin scientific servant servant-client split stm
+         strict-base-types text time transformers unix unordered-containers
+         vector yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring containers Diff either Glob
+         hslogger hspec lens mtl optparse-applicative parallel-io parsec
+         regex-pcre-builtin servant-client strict-base-types text
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
          ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers
          strict-base-types temporary text unix unordered-containers vector
        ];
@@ -82092,10 +84183,10 @@ self: {
        pname = "language-python";
        version = "0.5.0";
        sha256 = "1z0m0lbvrcjyh04zr52wi1zhmb28m4s67zlvf2wc6qh0z9y4l7wy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers monads-tf pretty transformers utf8-string
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
@@ -82109,7 +84200,9 @@ self: {
        sha256 = "1cspr1v0dm4lbjrb654n8lax9nvmj94a89cp3vqir8xccaxhggpz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 language-python xhtml ];
+       executableHaskellDepends = [
+         base haskell98 language-python xhtml
+       ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/";
        description = "Generate coloured XHTML for Python code";
        license = stdenv.lib.licenses.bsd3;
@@ -82124,7 +84217,7 @@ self: {
        sha256 = "0sxl2snzwi4v3fzfgdwy2fx1pih4qvh1z8s1qkkq346x76n4rgnv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base language-python ];
+       executableHaskellDepends = [ base language-python ];
        homepage = "http://github.com/bjpop/language-python-test";
        description = "testing code for the language-python library";
        license = stdenv.lib.licenses.bsd3;
@@ -82137,7 +84230,9 @@ self: {
        pname = "language-sh";
        version = "0.0.3.1";
        sha256 = "12yjynd1sib1mxx4jc28gs1k3r7kl1qv7xhanvn635dkcmswsd5k";
-       buildDepends = [ base directory filepath mtl parsec pcre-light ];
+       libraryHaskellDepends = [
+         base directory filepath mtl parsec pcre-light
+       ];
        jailbreak = true;
        homepage = "http://code.haskell.org/shsh/";
        description = "A package for parsing shell scripts";
@@ -82154,8 +84249,8 @@ self: {
        pname = "language-slice";
        version = "0.3.0.0";
        sha256 = "1d9g41z1nw327z5n7hj8gj0yfvmkj7hz7cpwhi4r32xa7x98hdzy";
-       buildDepends = [ base bytestring parsec transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring parsec transformers ];
+       testHaskellDepends = [
          base bytestring HUnit parsec QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -82173,11 +84268,13 @@ self: {
        pname = "language-spelling";
        version = "0.3.2";
        sha256 = "05jgx1rcfb9aidrim2h9vr72c3m9hak2njkh04hkf4q3v1pv03ym";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bk-tree bytestring containers ListLike
          listlike-instances text tst vector
        ];
-       testDepends = [ base bytestring criterion random-shuffle time ];
+       testHaskellDepends = [
+         base bytestring criterion random-shuffle time
+       ];
        homepage = "https://github.com/bitonic/language-spelling";
        description = "Various tools to detect/correct mistakes in words";
        license = stdenv.lib.licenses.publicDomain;
@@ -82192,7 +84289,7 @@ self: {
        pname = "language-sqlite";
        version = "1.1";
        sha256 = "1mpbp56xgqx6j4mfla00kvr9q6mysncjw57mphvrz86ificjw93m";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers mtl template-haskell utf8-string
        ];
        homepage = "http://dankna.com/software/";
@@ -82209,8 +84306,10 @@ self: {
        pname = "language-thrift";
        version = "0.4.0.0";
        sha256 = "0al6a9j9hwla8kyfw30m9ylw4wzxv0nr3nvri8w9wnh6ckaf5j2w";
-       buildDepends = [ base mtl parsers text trifecta wl-pprint ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base mtl parsers text trifecta wl-pprint
+       ];
+       testHaskellDepends = [
          base hspec hspec-discover QuickCheck text trifecta wl-pprint
        ];
        homepage = "https://github.com/abhinav/language-thrift";
@@ -82225,7 +84324,7 @@ self: {
        pname = "language-typescript";
        version = "0.0.4";
        sha256 = "07lm3d4m7c6j2b5gywqm05189iwkh2zjiv5xwwmcw1fm2a63r2zd";
-       buildDepends = [ base containers parsec pretty ];
+       libraryHaskellDepends = [ base containers parsec pretty ];
        homepage = "http://github.com/paf31/language-typescript";
        description = "A library for working with TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
@@ -82239,8 +84338,8 @@ self: {
        pname = "largeword";
        version = "1.2.3";
        sha256 = "1ldcsnnji6p84sn03j17pdcpg7vqn1xrhyn4wys0v5fyy0d383ln";
-       buildDepends = [ base binary ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary ];
+       testHaskellDepends = [
          base binary bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -82260,7 +84359,7 @@ self: {
        sha256 = "0snzcck07v3w1qcgw2j6w7g4ydm59cprf3cqivl9qbgsjljl3zxn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base cmdargs directory filepath haskell98 haxr HDBC
          HDBC-sqlite3 hsini HTTP mtl old-locale regex-compat tagsoup time
        ];
@@ -82281,12 +84380,17 @@ self: {
        sha256 = "0z6jl0i9d9r4nifyn2h6pk8s3ni5zfmbc4gpaqim3hzzbh6kqrn0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base http-client http-types lens network pipes
+         pipes-attoparsec pipes-bytestring pipes-http text text-format
+         transformers
+       ];
+       executableHaskellDepends = [
          aeson base cmdargs http-client http-types lens network pipes
          pipes-attoparsec pipes-bytestring pipes-http text text-format
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base hspec http-client http-types lens network pipes
          pipes-attoparsec pipes-bytestring pipes-http text text-format
          transformers
@@ -82304,7 +84408,7 @@ self: {
        pname = "latex";
        version = "0.1.0.3";
        sha256 = "1linwqab6z2s91vdxr874vk7rg7gv1ckabsxwmlr80gnhdfgyhmp";
-       buildDepends = [ base containers utility-ht ];
+       libraryHaskellDepends = [ base containers utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/LaTeX";
        description = "Parse, format and process LaTeX files";
        license = stdenv.lib.licenses.bsd3;
@@ -82318,7 +84422,7 @@ self: {
        pname = "lattices";
        version = "1.3";
        sha256 = "1jp63rh1girf9ka0lfi219wlisni8dsckf67h6413ihdxdh2mp3l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hashable unordered-containers
        ];
        homepage = "http://github.com/phadej/lattices/";
@@ -82335,7 +84439,10 @@ self: {
        sha256 = "0lbrrm5wfi3vgmvba9rvbzq78idq6z98psjfh5scjp8hg0qbf8q2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers hmidi mtl transformers ];
+       libraryHaskellDepends = [
+         array base containers hmidi mtl transformers
+       ];
+       executableHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "High and low-level interface to the Novation Launchpad midi controller";
        license = stdenv.lib.licenses.bsd3;
@@ -82347,7 +84454,7 @@ self: {
        pname = "lax";
        version = "0.1.0.3";
        sha256 = "12f0k2545nk50cvs3gd41dhsfls19xkhvn3avhmgx69y57mhalcy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/lax";
        description = "Lax arrows";
        license = stdenv.lib.licenses.bsd3;
@@ -82359,7 +84466,7 @@ self: {
        pname = "layers";
        version = "0.1";
        sha256 = "1yn8swgxb908wslcnh04919m9rzy47dxgawns89zw5v1gbq3wmdf";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/duairc/layers";
        description = "Modular type class machinery for monad transformer stacks";
@@ -82377,7 +84484,7 @@ self: {
        sha256 = "01j1gq3jd8mm519p3drxfpd32mm1qmik39vijncrx64p7wii73k8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs composition data-lens Gamgine GLFW-b ListZipper mtl
          OpenGLRaw pretty-show
        ];
@@ -82392,7 +84499,7 @@ self: {
        pname = "layout";
        version = "0.0.0.1";
        sha256 = "04075x2f646ifaw9pxi5s6avp1vis1j524w9a2m3apyrz583cj0g";
-       buildDepends = [ base convertible hinduce-missingh ];
+       libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82404,7 +84511,7 @@ self: {
        pname = "layout-bootstrap";
        version = "0.2.2";
        sha256 = "0rm0w5l4g865ais4rg3vdfx6fyzp1dginlhlabvqclbjwwzkiyqi";
-       buildDepends = [ base blaze-html containers text ];
+       libraryHaskellDepends = [ base blaze-html containers text ];
        homepage = "https://bitbucket.org/dpwiz/layout-bootstrap";
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
        license = stdenv.lib.licenses.mit;
@@ -82419,7 +84526,8 @@ self: {
        sha256 = "17v495xnv38bx9zfjfa8dl3prj94lg74dhn1jzqrjq488gfwp2w8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/lazy-csv";
        description = "Efficient lazy parsers for CSV (comma-separated values)";
        license = stdenv.lib.licenses.bsd3;
@@ -82431,7 +84539,7 @@ self: {
        pname = "lazy-io";
        version = "0.1.0";
        sha256 = "0fbvm8wwvp4xm4rq2mdfnrra7c88dps91j7ay2vn7iqmpdkcwly9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kawu/lazy-io";
        description = "Lazy IO";
        license = stdenv.lib.licenses.bsd3;
@@ -82443,7 +84551,7 @@ self: {
        pname = "lazyarray";
        version = "0.1.3";
        sha256 = "0bc2n7x8fydmzc84yb5zbdaca1r4qwpk7zlvbgcycycr87fk7p7n";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82457,7 +84565,7 @@ self: {
        sha256 = "16cl1yifcmfywqc7kgz9kmp0x6s4300ccgmcrzr4j4jgwcgl38bc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base transformers unsafe ];
+       libraryHaskellDepends = [ base transformers unsafe ];
        homepage = "http://www.haskell.org/haskellwiki/Lazy_IO";
        description = "Run IO actions lazily while respecting their order";
        license = stdenv.lib.licenses.bsd3;
@@ -82469,7 +84577,7 @@ self: {
        pname = "lazysmallcheck";
        version = "0.6";
        sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.york.ac.uk/~mfn/lazysmallcheck/";
        description = "A library for demand-driven testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -82481,7 +84589,7 @@ self: {
        pname = "lazysplines";
        version = "0.2";
        sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Differential solving with lazy splines";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82493,7 +84601,7 @@ self: {
        pname = "lbfgs";
        version = "0.0.5";
        sha256 = "0j69hq053ksypb5a3dcvnfa5pscvxhsnby1p5pj4bw6c209g8a06";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "L-BFGS optimization";
        license = "unknown";
      }) {};
@@ -82504,8 +84612,8 @@ self: {
        pname = "lca";
        version = "0.3";
        sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza";
-       buildDepends = [ base ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/ekmett/lca/";
        description = "O(log n) persistent on-line lowest common ancestor calculation without preprocessing";
        license = stdenv.lib.licenses.bsd3;
@@ -82517,7 +84625,7 @@ self: {
        pname = "lcs";
        version = "0.2";
        sha256 = "1w8z80vqb86zl6ap4nd87kpl91qms8310k1d8r6qrxg2skm6gnxl";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://urchin.earth.li/~ian/cabal/lcs/";
        description = "Find longest common sublist of two lists";
        license = "unknown";
@@ -82532,7 +84640,7 @@ self: {
        pname = "lda";
        version = "0.0.2";
        sha256 = "125y7syfpwg6356h4rq34k45h115ywbz9yisvd741jf6aij23is2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim mtl random-fu random-source rvar vector
        ];
        homepage = "https://bitbucket.org/gchrupala/colada";
@@ -82549,11 +84657,11 @@ self: {
        pname = "ldap-client";
        version = "0.1.0";
        sha256 = "18c33jfgwa7vdickxshyhmrqdpndy7ayjd3z0zqkjqa7awd0zcf4";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types async base bytestring connection
          containers network semigroups stm text
        ];
-       testDepends = [ base bytestring hspec process semigroups ];
+       testHaskellDepends = [ base bytestring hspec process semigroups ];
        homepage = "https://supki.github.io/ldap-client";
        description = "Pure Haskell LDAP Client Library";
        license = stdenv.lib.licenses.bsd2;
@@ -82570,11 +84678,14 @@ self: {
        sha256 = "0mf0cvjzgimrqf80g6hg75azv18930g5mrvjjxw70116mdpp718a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs containers directory filepath parsec
          rosezipper
        ];
-       testDepends = [ base HUnit ];
+       executableHaskellDepends = [
+         base bytestring cmdargs containers filepath
+       ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "http://rampa.sk/static/ldif.html";
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
@@ -82591,7 +84702,9 @@ self: {
        sha256 = "1czk4d2xa2g7djdz669h1q6ciflzwxm4n05m9jv3d3z7r6fcch6z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base blaze-html directory filepath pandoc split ];
+       executableHaskellDepends = [
+         base blaze-html directory filepath pandoc split
+       ];
        jailbreak = true;
        homepage = "https://github.com/skypers/leaf";
        description = "A simple portfolio generator";
@@ -82609,7 +84722,7 @@ self: {
        sha256 = "17cs1mszcfibfkcbwxdcn4pi3n6b84a23szv548vqxwypyrzlbf0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cpphs deepseq-bounded deepseq-generics generics-sop random
          seqaid template-haskell
        ];
@@ -82625,7 +84738,9 @@ self: {
        pname = "leankit-api";
        version = "0.4";
        sha256 = "14ax9w72cdmbsgy879mwwi2g0345xzfvivrq8b7ngkr8dyfp72r7";
-       buildDepends = [ aeson base bytestring colour curl split ];
+       libraryHaskellDepends = [
+         aeson base bytestring colour curl split
+       ];
        description = "LeanKit API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -82636,8 +84751,8 @@ self: {
        pname = "leapseconds-announced";
        version = "2015.0.0.1";
        sha256 = "0k8khjfq1cr8wb2wgwwk7yv6461h7z6wf6qn21qd9zq9i22bpyhm";
-       buildDepends = [ base time ];
-       testDepends = [ base QuickCheck time ];
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base QuickCheck time ];
        homepage = "https://github.com/bjornbm/leapseconds-announced";
        description = "Leap seconds announced at library release time";
        license = stdenv.lib.licenses.bsd3;
@@ -82649,7 +84764,7 @@ self: {
        pname = "learn";
        version = "0.1.1";
        sha256 = "1i2rn4pmgbqxj0xsjqp5rh50lv6zgnblbjgwmqh5cxb3dsillvpj";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82662,7 +84777,7 @@ self: {
        pname = "learn-physics";
        version = "0.5";
        sha256 = "0bh7p0pp4pspb5m4bfab5z3sfrywlw59yc7w11sa6ax29q9r9faq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gloss gnuplot not-gloss spatial-math vector-space
        ];
        jailbreak = true;
@@ -82681,7 +84796,7 @@ self: {
        sha256 = "0fwmc7q59srasciijd7ws1bqay4cc7jhi1469my67kchg0n45q3k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base gloss gnuplot learn-physics not-gloss spatial-math
        ];
        jailbreak = true;
@@ -82698,7 +84813,7 @@ self: {
        pname = "learning-hmm";
        version = "0.3.2.2";
        sha256 = "1a2a97cflnlalcqr54ssbmy047i6y1xgswssy64hsr36g2lhywrs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hmatrix random-fu random-source vector
        ];
        homepage = "https://github.com/mnacamura/learning-hmm";
@@ -82714,7 +84829,7 @@ self: {
        sha256 = "106pr7rlma67dqqyfhknh9fb6r37lsj00qjx1dq3xx7yxp368nvr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/phaazon/leetify";
        description = "Leetify text";
@@ -82738,17 +84853,21 @@ self: {
        sha256 = "0gjgaigkd34gzfvqhlxqqxcydh12064prnn0x653kb5ks8bq4qml";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary binary-shared blaze-html bytestring Cabal conduit
          containers cpphs deepseq directory executable-path filepath ghc
-         ghcjs-codemirror ghcjs-dom gio glib gtk3 gtksourceview3 hamlet
+         ghcjs-codemirror gio glib gtk3 gtksourceview3 hamlet
          haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl
          network network-uri old-time parsec pretty pretty-show QuickCheck
          regex-base regex-tdfa regex-tdfa-text shakespeare stm strict text
          time transformers unix utf8-string vado vcsgui vcswrapper
          webkitgtk3 webkitgtk3-javascriptcore
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base ghcjs-dom gtk3 gtksourceview3 jsaddle stm webkitgtk3
+         webkitgtk3-javascriptcore
+       ];
+       testHaskellDepends = [
          base Cabal containers glib gtk3 gtksourceview3 hslogger
          leksah-server ltk monad-loops QuickCheck stm text transformers
          webkitgtk3
@@ -82774,21 +84893,27 @@ self: {
        sha256 = "1pcf42hipc5q3n61pbd2sdgvhshl2ri261i94myb3fc13kbi90hb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base bin-package-db binary
          binary-shared bytestring Cabal conduit conduit-extra containers
          deepseq directory executable-path filepath ghc haddock-api
          haddock-library hslogger HTTP ltk network network-uri parsec pretty
          process resourcet strict text time transformers unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         attoparsec attoparsec-conduit base bin-package-db binary
+         binary-shared bytestring Cabal conduit conduit-extra containers
+         deepseq directory executable-path filepath ghc haddock-api
+         haddock-library hslogger HTTP ltk network network-uri parsec pretty
+         process resourcet strict text time transformers unix
+       ];
+       testHaskellDepends = [
          base conduit conduit-extra hslogger HUnit process resourcet
          transformers
        ];
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lendingclub" = callPackage
@@ -82799,7 +84924,7 @@ self: {
        pname = "lendingclub";
        version = "0.1.1";
        sha256 = "1r40qm7f45vgzdxnzlhpqhsi81rbwa2nss3gf1d5mqz32dscjwfx";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring HsOpenSSL http-streams
          io-streams mtl scientific text vector
        ];
@@ -82823,14 +84948,14 @@ self: {
        pname = "lens";
        version = "4.12.3";
        sha256 = "0898z1ws9sy77yfhvx5did0pibpp81yxz0jg418gdx3znd39vyj8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
          hashable kan-extensions mtl parallel profunctors reflection
          semigroupoids semigroups tagged template-haskell text transformers
          transformers-compat unordered-containers vector void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath
          generic-deriving hlint HUnit mtl nats parallel QuickCheck
          semigroups simple-reflect test-framework test-framework-hunit
@@ -82851,15 +84976,14 @@ self: {
        pname = "lens-action";
        version = "0.2.0.1";
        sha256 = "164fka3krz32zhxnhkylnkmgnx2qj4qvn6y1hfwwla4ddn0axm9n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad contravariant lens mtl profunctors semigroupoids
          semigroups transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/lens-action/";
        description = "Monadic Getters and Folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-aeson" = callPackage
@@ -82870,14 +84994,14 @@ self: {
      mkDerivation {
        pname = "lens-aeson";
        version = "1.0.0.4";
-       revision = "2";
        sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v";
+       revision = "2";
        editedCabalFile = "f9ddeac68a237cb5dbe8ab7457fb7529bdeeb675c5e80bc122e196255072393d";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
@@ -82892,7 +85016,7 @@ self: {
        pname = "lens-datetime";
        version = "0.2.1";
        sha256 = "1wqks7ynw3njlizdd9hvgrc1xjxcgcfck9ppj1lgg8wr3l2myi72";
-       buildDepends = [ base lens time ];
+       libraryHaskellDepends = [ base lens time ];
        homepage = "http://github.com/nilcons/lens-datetime";
        description = "Lenses for Data.Time.* types";
        license = stdenv.lib.licenses.bsd3;
@@ -82906,7 +85030,7 @@ self: {
        pname = "lens-family";
        version = "1.2.0";
        sha256 = "0pbyx43ajx96nhcw4brml1r5azs1041k7nv4m94ak6x77n5sr4mb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers lens-family-core mtl transformers
        ];
        description = "Lens Families";
@@ -82919,7 +85043,7 @@ self: {
        pname = "lens-family-core";
        version = "1.2.0";
        sha256 = "0hxrbbc4azfafnr4ab2zxgic093wwg6gx5h1ggp4xks55d8rhraz";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        description = "Haskell 98 Lens Families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82929,10 +85053,10 @@ self: {
      mkDerivation {
        pname = "lens-family-th";
        version = "0.4.1.0";
-       revision = "1";
        sha256 = "084yng26xyhw6c6hij3p70zvjpvm1dlw6klphw51car9gi6dqkvm";
+       revision = "1";
        editedCabalFile = "13c96ddf2d410ec4e6671c8412710b7cdbbfc837ff5be1d09a6dbb9ecdb9285d";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -82944,7 +85068,7 @@ self: {
        pname = "lens-properties";
        version = "4.11";
        sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w";
-       buildDepends = [ base lens QuickCheck transformers ];
+       libraryHaskellDepends = [ base lens QuickCheck transformers ];
        homepage = "http://github.com/ekmett/lens/";
        description = "QuickCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
@@ -82960,8 +85084,12 @@ self: {
        sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base lens regex-base template-haskell ];
-       testDepends = [ base directory doctest filepath regex-posix ];
+       libraryHaskellDepends = [
+         array base lens regex-base template-haskell
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath regex-posix
+       ];
        homepage = "https://github.com/himura/lens-regex";
        description = "Lens powered regular expression";
        license = stdenv.lib.licenses.bsd3;
@@ -82975,7 +85103,7 @@ self: {
        pname = "lens-simple";
        version = "0.1.0.7";
        sha256 = "08ynx0zhll603srdmgqf9pgdbzn4i9ry99hs7m35kwaj21whrq5q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens-family lens-family-core lens-family-th mtl transformers
        ];
        homepage = "https://github.com/michaelt/lens-simple";
@@ -82989,7 +85117,9 @@ self: {
        pname = "lens-sop";
        version = "0.1.0.2";
        sha256 = "1b56q8qsg3w5gzra7bjf76mqinv8vpjrb6any7c3wdpjgvssly56";
-       buildDepends = [ base fclabels generics-sop transformers ];
+       libraryHaskellDepends = [
+         base fclabels generics-sop transformers
+       ];
        description = "Computing lenses generically using generics-sop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83000,7 +85130,7 @@ self: {
        pname = "lens-text-encoding";
        version = "0.1.0.0";
        sha256 = "1yxab87ci6gl0c5gsdd8pb780ai8lmxxa3fxkpl1shv1pw124fsv";
-       buildDepends = [ base bytestring lens text ];
+       libraryHaskellDepends = [ base bytestring lens text ];
        jailbreak = true;
        homepage = "http://github.com/iand675/text-lens-encoding";
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
@@ -83013,7 +85143,7 @@ self: {
        pname = "lens-time";
        version = "0.1.0.0";
        sha256 = "1hrp9d6qja7yc3zj68w3hylgflyfsvh79m8daw9030yjdxm525za";
-       buildDepends = [ base lens time ];
+       libraryHaskellDepends = [ base lens time ];
        jailbreak = true;
        description = "lens for Data.Time";
        license = stdenv.lib.licenses.mit;
@@ -83025,7 +85155,7 @@ self: {
        pname = "lenses";
        version = "0.1.7";
        sha256 = "09p1ph5ih2dzrbn7h9wjnf4xch04g0amf8cc3q64g5a2clg3vjx4";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "http://github.com/jvranish/Lenses/tree/master";
        description = "Simple Functional Lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -83037,8 +85167,8 @@ self: {
        pname = "lensref";
        version = "0.2";
        sha256 = "0dj43hqrv198dgfnngq4l8kwnksqcm6nydcr1z1a5gqz5s99m4bn";
-       buildDepends = [ base monad-control mtl transformers ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base monad-control mtl transformers ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/LGtk";
        description = "References which can be joined and on which lenses can be applied";
@@ -83056,11 +85186,11 @@ self: {
        sha256 = "19zjwkj9is5fdayvwf6w8r42z0lyrbj2lqqw822zr87xaq96r2g2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base csv directory filemanip filepath natural-sort
          optparse-applicative parsec regex-tdfa
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-wl-pprint base csv directory filemanip filepath hspec
          natural-sort optparse-applicative parsec regex-tdfa
        ];
@@ -83075,7 +85205,7 @@ self: {
        pname = "level-monad";
        version = "0.4.1";
        sha256 = "1l5jyhpvbcj4fmyggp8bjy4gx9igcydply3yb1s23fxdcz0b638a";
-       buildDepends = [ base fmlist ];
+       libraryHaskellDepends = [ base fmlist ];
        homepage = "http://github.com/sebfisch/level-monad";
        description = "Non-Determinism Monad for Level-Wise Search";
        license = stdenv.lib.licenses.publicDomain;
@@ -83092,19 +85222,21 @@ self: {
        sha256 = "0vljwjcd9m63wk7zmkl2s6b6kpjn7hqmwwg0p2bjm0d7ras69pk5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base bytestring data-default exceptions filepath resourcet
+       libraryHaskellDepends = [
+         base bytestring data-default exceptions filepath resourcet
          transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ leveldb ];
+       executableHaskellDepends = [
+         async base bytestring data-default resourcet transformers
+       ];
+       testHaskellDepends = [
          base bytestring data-default directory exceptions mtl QuickCheck
          tasty tasty-quickcheck temporary transformers
        ];
-       extraLibraries = [ leveldb ];
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
@@ -83118,14 +85250,17 @@ self: {
        sha256 = "021ckykw5wwkm8gpbqq1znis4rakqmri8bz8ldmm8cmlb3v3b6aq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base bytestring data-default filepath resourcet transformers
+       libraryHaskellDepends = [
+         base bytestring data-default filepath resourcet transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ leveldb ];
+       executableHaskellDepends = [
+         async base bytestring data-default resourcet transformers
+       ];
+       testHaskellDepends = [
          base bytestring data-default hspec hspec-expectations mtl process
          QuickCheck transformers
        ];
-       extraLibraries = [ leveldb ];
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
@@ -83138,11 +85273,10 @@ self: {
        pname = "levmar";
        version = "1.2.1.5";
        sha256 = "09ambniwcvrss8s3f9rvgrq204d9y7baxiw52r3pp693spmwazkj";
-       buildDepends = [ base bindings-levmar hmatrix vector ];
+       libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "levmar-chart" = callPackage
@@ -83154,7 +85288,10 @@ self: {
        sha256 = "0ws9d2ipk67ir4b31rd7vakyglhrr290k400zpb24ny3vvdgcwaj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Chart colour data-accessor levmar random ];
+       libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
+       executableHaskellDepends = [
+         base Chart colour data-accessor levmar random
+       ];
        jailbreak = true;
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
@@ -83169,8 +85306,8 @@ self: {
        pname = "lexer-applicative";
        version = "2.1";
        sha256 = "1xryc4nnfs7vzvmdszksmzjmz0pi1gpip0qr3gf2lv0baayma7zj";
-       buildDepends = [ base regex-applicative srcloc ];
-       testDepends = [
+       libraryHaskellDepends = [ base regex-applicative srcloc ];
+       testHaskellDepends = [
          base deepseq regex-applicative srcloc tasty tasty-hunit
        ];
        homepage = "https://github.com/feuerbach/lexer-applicative";
@@ -83191,11 +85328,15 @@ self: {
        sha256 = "1bph09i8znzv3c8sqbg2xbrdlpvlnx52psgyybwn0imqip81lmv5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base cairo colour containers diagrams-cairo diagrams-lib
-         directory filepath fsnotify GLFW-b groups lens lensref
-         monad-control mtl OpenGLRaw operational random random-shuffle
-         semigroups system-filepath transformers vector
+       libraryHaskellDepends = [
+         base cairo colour containers diagrams-cairo diagrams-lib directory
+         filepath fsnotify GLFW-b groups lens lensref monad-control mtl
+         OpenGLRaw operational semigroups system-filepath transformers
+         vector
+       ];
+       executableHaskellDepends = [
+         array base containers diagrams-lib lens mtl random random-shuffle
+         vector
        ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/LGtk";
@@ -83210,7 +85351,7 @@ self: {
        pname = "lha";
        version = "0.1.2";
        sha256 = "0a5h1d0sdnpy209k4zkmcrrxl4b000226hif098bqs9pngpbgki1";
-       buildDepends = [ haskell2010 ];
+       libraryHaskellDepends = [ haskell2010 ];
        homepage = "https://github.com/bytbox/lha.hs";
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
@@ -83228,7 +85369,7 @@ self: {
        sha256 = "120g8x0wbd5va2gqvkr5mx643g8r4hrfyqa68nm3apvfc9z7f8g3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath hgettext mtl parsec
          process setlocale utf8-string wx wxcore
        ];
@@ -83253,7 +85394,7 @@ self: {
        sha256 = "1x50k6lx9p36qxl0qn9zfyqlkgsq3wdzvcv7l6sn920hg5scvcr3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base binary bytestring bytestring-trie Cabal
          containers core derive digest directory extensible-exceptions
          filepath haskell98 HUnit mtl parallel pretty process QuickCheck
@@ -83271,7 +85412,7 @@ self: {
        pname = "lhe";
        version = "0.5";
        sha256 = "08725r5i71ni9ip4qbc5fr111j256rsii936yvxbd7kbbw4ap2a9";
-       buildDepends = [ bytestring haskell2010 HaXml lha ];
+       libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83287,7 +85428,7 @@ self: {
        sha256 = "1mm6ikiv6zj025yh5abq3f8mqkw9302mfzd01xcihbh74bsdpi9l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs filepath haskell-src-exts syb uu-parsinglib
        ];
        jailbreak = true;
@@ -83304,14 +85445,14 @@ self: {
        sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath Glob ];
+       executableHaskellDepends = [ base directory filepath Glob ];
        description = "Compile lhs in bird style to md, html, hs";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "lhs2tex" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process
-     , regex-compat, texLive
+     , regex-compat
      }:
      mkDerivation {
        pname = "lhs2tex";
@@ -83319,19 +85460,13 @@ self: {
        sha256 = "03mhhkrqjjqmmh18im8di1cl6wqv30lsib5hv73f0wsnv5bhbbi4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath mtl process regex-compat
        ];
-       extraLibraries = [ texLive ];
-       postInstall = ''
-         mkdir -p "$out/share/doc/$name"
-         cp doc/Guide2.pdf $out/share/doc/$name
-         mkdir -p "$out/nix-support"
-       '';
        homepage = "http://www.andres-loeh.de/lhs2tex/";
        description = "Preprocessor for typesetting Haskell sources with LaTeX";
        license = "GPL";
-     }) { inherit (pkgs) texLive;};
+     }) {};
 
   "lhslatex" = callPackage
     ({ mkDerivation, base, directory, filepath, process, regex-posix }:
@@ -83341,7 +85476,9 @@ self: {
        sha256 = "0kgmx160i1rylgzh23qlg8ds0sq64yk1i3rah8kmgwabpnvds7f7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process regex-posix ];
+       executableHaskellDepends = [
+         base directory filepath process regex-posix
+       ];
        jailbreak = true;
        homepage = "https://github.com/tvh/lhslatex";
        description = "Tool for using pdflatex with .lhs files";
@@ -83356,7 +85493,7 @@ self: {
        pname = "libGenI";
        version = "0.16.1";
        sha256 = "1n37pccmx0466425zcbdfpgivsrnqzwsm0nwcjv8lkg8jxjxrwmz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers HUnit mtl parsec process QuickCheck
        ];
        homepage = "http://trac.loria.fr/~geni";
@@ -83373,8 +85510,10 @@ self: {
        pname = "libarchive-conduit";
        version = "0.1.0.0";
        sha256 = "022fnxxwz44cjzcldk3yg1xs77xqnrvkr9bv6hi7kdy120dk4p04";
-       buildDepends = [ base bytestring conduit resourcet transformers ];
-       extraLibraries = [ archive ];
+       libraryHaskellDepends = [
+         base bytestring conduit resourcet transformers
+       ];
+       librarySystemDepends = [ archive ];
        description = "Read many archive formats with libarchive and conduit";
        license = stdenv.lib.licenses.bsd3;
      }) { archive = null;};
@@ -83388,13 +85527,13 @@ self: {
        pname = "libconfig";
        version = "0.3.0.0";
        sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cereal cereal-text deepseq hashable text text-binary
          transformers transformers-compat
        ];
-       testDepends = [ base doctest doctest-prop ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ config ];
+       librarySystemDepends = [ config ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base doctest doctest-prop ];
        homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
@@ -83409,11 +85548,13 @@ self: {
        pname = "libcspm";
        version = "1.0.0";
        sha256 = "1v8w8i871a0fjyjqb8hr4yk9wli5v7djfpyjgg14rjb26v6yq79v";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath
          graph-wrapper hashable hashtables mtl pretty text value-supply
        ];
-       testDepends = [ base directory filepath mtl test-framework ];
+       testHaskellDepends = [
+         base directory filepath mtl test-framework
+       ];
        jailbreak = true;
        homepage = "https://github.com/tomgr/libcspm";
        description = "A library providing a parser, type checker and evaluator for CSPM";
@@ -83427,24 +85568,25 @@ self: {
        pname = "libexpect";
        version = "0.3.2";
        sha256 = "0xpsc9a16biqg4z9b9wk9wqz6ypshw99xrksnxi8nlh3qn98lrsc";
-       buildDepends = [ base unix ];
-       extraLibraries = [ expect tcl ];
+       libraryHaskellDepends = [ base unix ];
+       librarySystemDepends = [ expect tcl ];
        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;};
 
   "libffi" = callPackage
-    ({ mkDerivation, base, bytestring, libffi }:
+    ({ mkDerivation, base, bytestring, ffi, libffi }:
      mkDerivation {
        pname = "libffi";
        version = "0.1";
        sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28";
-       buildDepends = [ base bytestring ];
-       pkgconfigDepends = [ libffi ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ ffi ];
+       libraryPkgconfigDepends = [ libffi ];
        description = "A binding to libffi";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libffi;};
+     }) { ffi = null;  inherit (pkgs) libffi;};
 
   "libgit" = callPackage
     ({ mkDerivation, base, mtl, process }:
@@ -83452,7 +85594,7 @@ self: {
        pname = "libgit";
        version = "0.3.1";
        sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x";
-       buildDepends = [ base mtl process ];
+       libraryHaskellDepends = [ base mtl process ];
        homepage = "https://github.com/vincenthz/hs-libgit";
        description = "Simple Git Wrapper";
        license = stdenv.lib.licenses.bsd3;
@@ -83466,7 +85608,7 @@ self: {
        pname = "libgraph";
        version = "1.5";
        sha256 = "0pyync48lr2silvm3cdmn11zmv355hcmmaj6rm7lb365mqv444i1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers monads-tf process union-find
        ];
        homepage = "http://maartenfaddegon.nl";
@@ -83485,11 +85627,14 @@ self: {
        sha256 = "17wycfnp1f288fxq3vd9c206gcard3n59s0a0myy0hkl6xy281s8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory filepath ghc ghc-paths mtl process
          syb text time unordered-containers
        ];
-       testDepends = [ base bytestring ghc ghc-paths hspec mtl syb ];
+       executableHaskellDepends = [ base bytestring directory ];
+       testHaskellDepends = [
+         base bytestring ghc ghc-paths hspec mtl syb
+       ];
        homepage = "https://bitbucket.org/bhris/libhbb";
        description = "Backend for text editors to provide better Haskell editing support";
        license = stdenv.lib.licenses.lgpl21;
@@ -83508,12 +85653,12 @@ self: {
        pname = "libjenkins";
        version = "0.8.1";
        sha256 = "00h4wzzs6b3s9cv4bw2slj3c0ckb6p8gph7wzx8cgrxjyjqqx85z";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base bytestring conduit containers free
          http-client http-conduit http-types monad-control mtl network
          network-uri profunctors resourcet text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async attoparsec base bytestring conduit containers directory
          doctest filepath free hspec hspec-expectations-lens http-client
          http-conduit http-types lens lifted-async lifted-base monad-control
@@ -83536,12 +85681,12 @@ self: {
        pname = "liblastfm";
        version = "0.5.1";
        sha256 = "1bf508a1rqjb486wcwn0n36bm8lwnj3b4bg0826lp92zmaxiyxpy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cereal containers crypto-api http-client
          http-client-tls network-uri profunctors pureMD5 semigroups text
          xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring cereal containers crypto-api hspec
          hspec-expectations-lens http-client http-client-tls HUnit lens
          lens-aeson network-uri profunctors pureMD5 text xml-conduit
@@ -83557,7 +85702,9 @@ self: {
        pname = "liblinear-enumerator";
        version = "0.1.2";
        sha256 = "19x0y70fn2pr06qsz4z6s67sym7dw5x3qa3z6jf3nmwncsy64qi2";
-       buildDepends = [ base bindings-DSL enumerator mtl vector ];
+       libraryHaskellDepends = [
+         base bindings-DSL enumerator mtl vector
+       ];
        jailbreak = true;
        homepage = "http://github.com/NathanHowell/liblinear-enumerator";
        description = "liblinear iteratee";
@@ -83572,7 +85719,8 @@ self: {
        sha256 = "05a4l841w20l4a0wmbp93bb1vc4kmnbcv7pmnym5hrrd7daj2vzr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.eecs.harvard.edu/~mainland/projects/libffi";
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
@@ -83588,11 +85736,11 @@ self: {
        pname = "libmpd";
        version = "0.9.0.2";
        sha256 = "1q6lcp9gfzvzcsigv6958ng9c44kq68qh4amnszjjji0jq0lvdjz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          mtl network old-locale text time utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          hspec mtl network old-locale QuickCheck text time unix utf8-string
        ];
@@ -83607,8 +85755,8 @@ self: {
        pname = "libnotify";
        version = "0.1.1.0";
        sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0";
-       buildDepends = [ base bytestring glib gtk ];
-       extraLibraries = [ libnotify ];
+       libraryHaskellDepends = [ base bytestring glib gtk ];
+       librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) libnotify;};
@@ -83621,12 +85769,12 @@ self: {
        pname = "libnvvm";
        version = "1.0.0";
        sha256 = "00vblp869zyk8gr33b846rnvn9axlsbldhx1gkj14xgrlyambdmx";
-       buildDepends = [ base bytestring cuda ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cuda ];
+       librarySystemDepends = [ nvvm ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
          base bytestring Cabal HUnit test-framework test-framework-hunit
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ nvvm ];
        homepage = "https://github.com/nvidia-compiler-sdk/hsnvvm";
        description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA";
        license = stdenv.lib.licenses.mit;
@@ -83640,7 +85788,7 @@ self: {
        pname = "liboleg";
        version = "2010.1.10.0";
        sha256 = "1lv0il1psy8bfdxc76ivc5nlwga4m475gys1g0ia3wacdksgs7a6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base CC-delcont containers mtl template-haskell unix
        ];
        homepage = "http://okmij.org/ftp/";
@@ -83655,9 +85803,9 @@ self: {
        pname = "libpafe";
        version = "0.1.1.0";
        sha256 = "1l2s98y805mgxnwy2jvrab65gz1aq5zf48rqk88nclb97w04lnws";
-       buildDepends = [ base transformers ];
-       testDepends = [ base bytestring iconv transformers ];
-       extraLibraries = [ pafe ];
+       libraryHaskellDepends = [ base transformers ];
+       librarySystemDepends = [ pafe ];
+       testHaskellDepends = [ base bytestring iconv transformers ];
        jailbreak = true;
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
@@ -83670,8 +85818,8 @@ self: {
        pname = "libpq";
        version = "0.4.1";
        sha256 = "11s8zaxq7qwzqdgyfd3v7sk6vf5cq3wzv2j02g0gnri9w45wf2i7";
-       buildDepends = [ base bytestring unix ];
-       extraLibraries = [ postgresql ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ postgresql ];
        homepage = "http://github.com/tnarg/haskell-libpq";
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -83684,7 +85832,7 @@ self: {
        pname = "librandomorg";
        version = "0.0.1.0";
        sha256 = "07xg59f48jw78mjbx83bz1rc2fxvdnlb08cdfd7hwkj43a127kxn";
-       buildDepends = [ base bytestring curl ];
+       libraryHaskellDepends = [ base bytestring curl ];
        jailbreak = true;
        homepage = "https://github.com/supki/haskell-random.org";
        description = "Wrapper to Random.org API";
@@ -83700,7 +85848,7 @@ self: {
        pname = "librato";
        version = "0.2.0.1";
        sha256 = "1l0q8kx0v563glplz5blg5scnvwf1aak04w08abxkrbfdjq6a8z4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring either http-client http-conduit
          http-types mtl resourcet text unordered-containers uri-templater
          vector
@@ -83718,7 +85866,7 @@ self: {
        pname = "libravatar";
        version = "0.1.0.1";
        sha256 = "00rdnhxwp1h4ax3cwlmqa6digzl1b8br5ajg7k0dsydb9ik171x5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-api dns network-uri pureMD5 random SHA url
          utf8-string
        ];
@@ -83737,10 +85885,10 @@ self: {
        sha256 = "0xfdhszz4j98spmzwxwcjnm3kzjkg76bwszmky0lmx9zmqirzakw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring network syb time ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ ssh2 ];
-       pkgconfigDepends = [ libssh2 ];
+       libraryHaskellDepends = [ base bytestring network syb time ];
+       librarySystemDepends = [ ssh2 ];
+       libraryPkgconfigDepends = [ libssh2 ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/portnov/libssh2-hs";
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
@@ -83754,7 +85902,7 @@ self: {
        pname = "libssh2-conduit";
        version = "0.1";
        sha256 = "1zpcj6qwc4kpdcgdqlzspzwz99a990f3r5wpl13l54j8c1g0kc8h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit libssh2 monad-control stm transformers
        ];
        homepage = "http://redmine.iportnov.ru/projects/libssh2-hs";
@@ -83771,7 +85919,7 @@ self: {
        pname = "libstackexchange";
        version = "0.3.0.0";
        sha256 = "00v8hmk67dsb0j1bncc06fh46jkz4raf5a796l223mg6x0l3a828";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default
          http-conduit profunctors text
        ];
@@ -83781,24 +85929,22 @@ self: {
      }) {};
 
   "libsystemd-daemon" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, libsystemd-daemon
-     , network, systemd-daemon, test-framework, test-framework-hunit
-     , utf8-string
+    ({ mkDerivation, base, bytestring, HUnit, network, systemd-daemon
+     , test-framework, test-framework-hunit, utf8-string
      }:
      mkDerivation {
        pname = "libsystemd-daemon";
        version = "0.1.0.1";
        sha256 = "1rmzyca7ry30d6wvhv3k30jaksa3iw8kzk1rwp6gwclxizsvwgf0";
-       buildDepends = [ base bytestring network utf8-string ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring network utf8-string ];
+       librarySystemDepends = [ systemd-daemon ];
+       testHaskellDepends = [
          base HUnit network test-framework test-framework-hunit
        ];
-       extraLibraries = [ systemd-daemon ];
-       pkgconfigDepends = [ libsystemd-daemon ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libsystemd-daemon = null;  systemd-daemon = null;};
+     }) { systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
@@ -83809,11 +85955,11 @@ self: {
        pname = "libsystemd-journal";
        version = "1.3.3";
        sha256 = "02d1zpmimmisjngkx9l23af51v18pdbc5mh7yljyw81lm39yzvfn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring hashable hsyslog pipes pipes-safe text transformers
          uniplate unix-bytestring unordered-containers uuid vector
        ];
-       pkgconfigDepends = [ systemd ];
+       libraryPkgconfigDepends = [ systemd ];
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
@@ -83825,9 +85971,9 @@ self: {
        pname = "libtagc";
        version = "0.12.0";
        sha256 = "1f7r82cfrkxrqcrxk92y6zhk79qwpack2g67crww5q8hs7438vja";
-       buildDepends = [ base bytestring glib ];
-       extraLibraries = [ taglib ];
-       pkgconfigDepends = [ taglib ];
+       libraryHaskellDepends = [ base bytestring glib ];
+       librarySystemDepends = [ taglib ];
+       libraryPkgconfigDepends = [ taglib ];
        jailbreak = true;
        homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home";
        description = "Binding to TagLib C library";
@@ -83840,9 +85986,9 @@ self: {
        pname = "libvirt-hs";
        version = "0.1";
        sha256 = "0fgxvzzfw52s4hs838l0sr6lxln4bhqqhzzy6grww2fs27gjpb4c";
-       buildDepends = [ base syb ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ virt ];
+       libraryHaskellDepends = [ base syb ];
+       librarySystemDepends = [ virt ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://redmine.iportnov.ru/projects/libvirt-hs";
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
@@ -83855,7 +86001,7 @@ self: {
        pname = "libvorbis";
        version = "0.1.0.1";
        sha256 = "0ykv2jv559yalypadwnvpzv87rksn24b4h8qi9x1x6r2x4kbwvrl";
-       buildDepends = [ base bytestring cpu ];
+       libraryHaskellDepends = [ base bytestring cpu ];
        homepage = "https://github.com/the-real-blackh/libvorbis";
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
        license = stdenv.lib.licenses.bsd3;
@@ -83867,8 +86013,8 @@ self: {
        pname = "libxml";
        version = "0.1.1";
        sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ libxml2 ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ libxml2 ];
        description = "Binding to libxml2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83882,7 +86028,7 @@ self: {
        pname = "libxml-enumerator";
        version = "0.5";
        sha256 = "0mqh454w1f3k75kcshdn848ynva938q6xm3a5yzcyf7nflzw75pg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator libxml-sax text transformers xml-types
        ];
        jailbreak = true;
@@ -83897,9 +86043,9 @@ self: {
        pname = "libxml-sax";
        version = "0.7.5";
        sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r";
-       buildDepends = [ base bytestring text xml-types ];
-       extraLibraries = [ libxml2 ];
-       pkgconfigDepends = [ libxml2 ];
+       libraryHaskellDepends = [ base bytestring text xml-types ];
+       librarySystemDepends = [ libxml2 ];
+       libraryPkgconfigDepends = [ libxml2 ];
        homepage = "https://john-millikin.com/software/haskell-libxml/";
        description = "Bindings for the libXML2 SAX interface";
        license = stdenv.lib.licenses.mit;
@@ -83911,8 +86057,8 @@ self: {
        pname = "libxslt";
        version = "0.1";
        sha256 = "1szz8zkm1w8dbfgix3ii896sc4vljgivcgx8j7vpny4ci9sfmn5a";
-       buildDepends = [ base bytestring libxml ];
-       extraLibraries = [ xslt ];
+       libraryHaskellDepends = [ base bytestring libxml ];
+       librarySystemDepends = [ xslt ];
        jailbreak = true;
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
@@ -83927,7 +86073,7 @@ self: {
        sha256 = "0drsv1d0318yr7a0aa2j6kvsiyl8jj8h4z6wpdnrcyxw6z4qlssq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base GLUT OpenGL random ];
+       executableHaskellDepends = [ array base GLUT OpenGL random ];
        homepage = "http://github.com/sproingie/haskell-cells/";
        description = "Conway's Life cellular automaton";
        license = stdenv.lib.licenses.bsd3;
@@ -83942,10 +86088,10 @@ self: {
        pname = "lifted-async";
        version = "0.7.0.1";
        sha256 = "0skfpgqlxni3bdn7pdg2732xkijmwsz655962wrbmflh987ms8y3";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base HUnit lifted-base monad-control mtl tasty tasty-hunit
          tasty-th
        ];
@@ -83963,8 +86109,8 @@ self: {
        pname = "lifted-base";
        version = "0.2.3.6";
        sha256 = "1yz14a1rsgknwyl08n4kxrlc26hfwmb95a3c2drbnsgmhdyq7iap";
-       buildDepends = [ base monad-control transformers-base ];
-       testDepends = [
+       libraryHaskellDepends = [ base monad-control transformers-base ];
+       testHaskellDepends = [
          base HUnit monad-control test-framework test-framework-hunit
          transformers transformers-base transformers-compat
        ];
@@ -83979,7 +86125,9 @@ self: {
        pname = "lifted-threads";
        version = "1.0";
        sha256 = "1sq071bn5z8ks2qj52bfx6n8bdx2chijh62ai3rz6lmjai6dazbz";
-       buildDepends = [ base monad-control threads transformers-base ];
+       libraryHaskellDepends = [
+         base monad-control threads transformers-base
+       ];
        homepage = "https://github.com/scrive/lifted-threads";
        description = "lifted IO operations from the threads library";
        license = stdenv.lib.licenses.bsd3;
@@ -83995,7 +86143,7 @@ self: {
        sha256 = "11c0j2mdrp4rvinl4iym9mfsqzh101yb5sf710vm8n7qih1fzcpc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bitmap bytestring directory filepath gloss mtl stb-image
        ];
        homepage = "http://icfpcontest2012.wordpress.com/";
@@ -84010,7 +86158,7 @@ self: {
        pname = "ligature";
        version = "0.1.0.0";
        sha256 = "03h30lbhppi9hmpsc8fhsrsad6w9sjs9n53lz76czz3iqaknkcrb";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "Expand ligatures in unicode text";
        license = stdenv.lib.licenses.mit;
@@ -84022,7 +86170,7 @@ self: {
        pname = "ligd";
        version = "0.2";
        sha256 = "1hxfx514ar9hr9gqzzdgd7avfvlsvr7lv6hgza5k04b2xm73ysrp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/spl/ligd";
        description = "Lightweight Implementation of Generics and Dynamics";
        license = stdenv.lib.licenses.bsd3;
@@ -84036,10 +86184,10 @@ self: {
        pname = "lighttpd-conf";
        version = "0.4";
        sha256 = "085msb62wpqyc1sp4zbwbyn70k48p9k9cky9rxn93xm0gjsaydf8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring packedstring pretty template-haskell
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84053,7 +86201,7 @@ self: {
        pname = "lighttpd-conf-qq";
        version = "0.5";
        sha256 = "1nd30inhh6wzq34rg76lq6m3wp0x3sc0l7jv37gw6dk3dnkwqh6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring haskell-src-exts lighttpd-conf
          template-haskell
        ];
@@ -84070,7 +86218,7 @@ self: {
        pname = "lilypond";
        version = "1.9.0";
        sha256 = "1nb6kkp5gbsbkjbbicyd49ckg2j9dm4a1l9ya4vp38br5j7dn4gw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default music-dynamics-literal music-pitch-literal
          prettify process semigroups vector-space
        ];
@@ -84087,15 +86235,14 @@ self: {
        pname = "limp";
        version = "0.3.2.1";
        sha256 = "0fx8q7ll47qc06laagiap0z4b5mbp958r3b9mc6qm1h9rhksimjk";
-       buildDepends = [ base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
        ];
        jailbreak = true;
        homepage = "https://github.com/amosr/limp";
        description = "representation of Integer Linear Programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "limp-cbc" = callPackage
@@ -84104,9 +86251,9 @@ self: {
        pname = "limp-cbc";
        version = "0.3.2.1";
        sha256 = "0q4az96nbwvm7jhrwvbjp87vzkb5nlp739jhkya6z0iq340cjxjy";
-       buildDepends = [ base containers limp vector ];
-       testDepends = [ base limp ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base containers limp vector ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base limp ];
        homepage = "https://github.com/amosr/limp-cbc";
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
@@ -84119,7 +86266,7 @@ self: {
        pname = "lin-alg";
        version = "0.1.0.2";
        sha256 = "19123k967mql69my6c19mnvp4qwa4b3bgimmlbhipqdljykj7pqc";
-       buildDepends = [ base NumInstances vector ];
+       libraryHaskellDepends = [ base NumInstances vector ];
        description = "Low-dimensional matrices and vectors for graphics and physics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84131,7 +86278,7 @@ self: {
        pname = "linda";
        version = "0.1.2";
        sha256 = "0d58i69hvry9vzr4i7f1yhhm99808vqw238hfjc3sr51plc1is45";
-       buildDepends = [ base hmatrix HUnit ];
+       libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84142,7 +86289,7 @@ self: {
        pname = "lindenmayer";
        version = "0.1.0.1";
        sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinh/hs-lindenmayer";
        description = "L-systems in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -84156,7 +86303,7 @@ self: {
        sha256 = "01w5bk58n14vni6cb8rc4ri3hpgism1c78jk605927yf2llxnc14";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Convert newlines in text";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -84169,7 +86316,8 @@ self: {
        sha256 = "0x8kbjjd9i6gp0agdfsfgicj2z1g4jwj7axj4hq01c31wrzb6g95";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       executableHaskellDepends = [ base bytestring containers ];
        description = "Simple command-line utility to convert text into PDF";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84187,13 +86335,13 @@ self: {
        pname = "linear";
        version = "1.19.1.3";
        sha256 = "1hprmhs1nm6l81kpnnznz92l66j10z4asn3g3l9c47165q881592";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base binary bytes cereal containers deepseq
          distributive ghc-prim hashable lens reflection semigroupoids
          semigroups tagged template-haskell transformers transformers-compat
          unordered-containers vector void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring directory doctest filepath HUnit lens
          simple-reflect test-framework test-framework-hunit
        ];
@@ -84208,7 +86356,7 @@ self: {
        pname = "linear-accelerate";
        version = "0.2";
        sha256 = "0433mzw2cswk86nmj3gnygn3d07yq0sbmv2ylxbw8ri35yddjap6";
-       buildDepends = [ accelerate base lens linear ];
+       libraryHaskellDepends = [ accelerate base lens linear ];
        homepage = "http://github.com/ekmett/linear-accelerate/";
        description = "Instances to use linear vector spaces on accelerate backends";
        license = stdenv.lib.licenses.bsd3;
@@ -84224,9 +86372,11 @@ self: {
        sha256 = "1wsan17zrlg4kr9dwk23ggfvylignnmg4sa62krri45s925kvh3i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base ieee754 QuickCheck storable-complex test-framework
-         test-framework-quickcheck2 vector
+       libraryHaskellDepends = [
+         base ieee754 QuickCheck storable-complex vector
+       ];
+       executableHaskellDepends = [
+         QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://github.com/cartazio/hs-cblas";
        description = "A linear algebra library with bindings to BLAS and LAPACK";
@@ -84240,8 +86390,8 @@ self: {
        pname = "linear-grammar";
        version = "0.0.2.1";
        sha256 = "00vfhcqhg6azb1ay12n248l0bjg5g0c5y5ybz5rqf2jdlab7fg97";
-       buildDepends = [ base containers QuickCheck ];
-       testDepends = [ base containers hspec QuickCheck ];
+       libraryHaskellDepends = [ base containers QuickCheck ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A simple grammar for building linear equations and inclusive inequalities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84254,7 +86404,7 @@ self: {
        sha256 = "0671px94wvqg2yyc8qhjcwrv5k2ifwp5mrj7fkcwlwvg8w1bp19k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers HUnit ];
+       libraryHaskellDepends = [ base containers HUnit ];
        jailbreak = true;
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
@@ -84269,7 +86419,7 @@ self: {
        pname = "linear-opengl";
        version = "0.2.0.8";
        sha256 = "18yy35pcl4jg0albh9dhngi7q4ak40fzr6ypa2piz2di4zqhfqp6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
        jailbreak = true;
@@ -84284,7 +86434,7 @@ self: {
        pname = "linear-vect";
        version = "0.1.1.0";
        sha256 = "0i6z10pgqcykkygl6kq63phx5hvwi2d84j2f5vw4nrnic59sm9jy";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        jailbreak = true;
        homepage = "https://github.com/capsjac/linear-vect";
        description = "A low-dimensional linear algebra library, operating on the Num typeclass";
@@ -84297,7 +86447,7 @@ self: {
        pname = "linearEqSolver";
        version = "1.3";
        sha256 = "0bszi1k27ag4yk31zxkn3jk3cqh1xzdcscm4nb6k4n0psf0qm2rp";
-       buildDepends = [ base sbv ];
+       libraryHaskellDepends = [ base sbv ];
        homepage = "http://github.com/LeventErkok/linearEqSolver";
        description = "Use SMT solvers to solve linear systems over integers and rationals";
        license = stdenv.lib.licenses.bsd3;
@@ -84309,7 +86459,9 @@ self: {
        pname = "linearscan";
        version = "0.7.0";
        sha256 = "13sfwkjg94q47lfxw5zddi8xpf4az07g88yq5pvgnh3vs5xggwip";
-       buildDepends = [ base containers ghc-prim mtl transformers ];
+       libraryHaskellDepends = [
+         base containers ghc-prim mtl transformers
+       ];
        homepage = "http://github.com/jwiegley/linearscan";
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
@@ -84325,10 +86477,10 @@ self: {
        pname = "linearscan-hoopl";
        version = "0.7.0";
        sha256 = "1zvzgcj5yln6g3mqljgcyjpjj2visiigd7qwl70l1zclz5zcfynv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers free hoopl linearscan QuickCheck transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq fuzzcheck hoopl hspec hspec-expectations
          lens-family-core linearscan QuickCheck transformers
        ];
@@ -84345,7 +86497,7 @@ self: {
        pname = "linebreak";
        version = "1.0.0.3";
        sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7";
-       buildDepends = [ base hyphenation ];
+       libraryHaskellDepends = [ base hyphenation ];
        homepage = "http://ariis.it/static/articles/linebreak/page.html";
        description = "breaks strings to fit width";
        license = stdenv.lib.licenses.bsd3;
@@ -84357,7 +86509,7 @@ self: {
        pname = "linguistic-ordinals";
        version = "0.1.0.0";
        sha256 = "0adcdxf0lxc372j12fk87klyrgr3b42sas6f1smiyza4wicjp9h3";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "http://github.com/argiopetech/linguistic-ordinals";
        description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)";
@@ -84373,7 +86525,9 @@ self: {
        sha256 = "0fzszn8nb5kglg4s5hk9k51vdkarlc08bdp67rbrj0cwfxpkn6wd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk haskell98 popenhs regex-compat unix ];
+       executableHaskellDepends = [
+         base gtk haskell98 popenhs regex-compat unix
+       ];
        homepage = "http://www.haskell.org/~petersen/haskell/linkchk/";
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
@@ -84388,7 +86542,9 @@ self: {
        sha256 = "0m1jwqa3vbiyzcdrn1h63dm0709j5xijm00j2x7dpwgn8k92iq81";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers extcore filepath process ];
+       executableHaskellDepends = [
+         base containers extcore filepath process
+       ];
        description = "Combines multiple GHC Core modules into a single module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84402,10 +86558,10 @@ self: {
        pname = "linkedhashmap";
        version = "0.4.0.0";
        sha256 = "1bv39g9vivr3j8arnpla39dhnwaja5l9da2yw580pzmw5bqi0wyq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hashable unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq hashable mtl tasty tasty-hunit
          unordered-containers
        ];
@@ -84422,7 +86578,7 @@ self: {
        pname = "linklater";
        version = "3.2.0.0";
        sha256 = "15c6p63yd1g5if2nz9pig6kc0rvqpjixjs6zr2j9m16q0h6kgrfr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base-prelude bytestring containers http-types text wai
          wreq
        ];
@@ -84439,10 +86595,10 @@ self: {
        pname = "linux-blkid";
        version = "0.2.0.0";
        sha256 = "06f7zwb40zgps6503cyp65c68181gj3s9q1s6vh43y6najiimzqx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control transformers transformers-base
        ];
-       pkgconfigDepends = [ blkid ];
+       libraryPkgconfigDepends = [ blkid ];
        jailbreak = true;
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
@@ -84455,7 +86611,7 @@ self: {
        pname = "linux-cgroup";
        version = "0.1.1.2";
        sha256 = "0dd1ii1n6y9frilnkxikzahp9xrh3i334i7syvd8fyxp51dpzgy1";
-       buildDepends = [ base filepath ];
+       libraryHaskellDepends = [ base filepath ];
        jailbreak = true;
        description = "Very basic interface to the Linux CGroup Virtual Filesystem";
        license = stdenv.lib.licenses.mit;
@@ -84467,7 +86623,7 @@ self: {
        pname = "linux-evdev";
        version = "0.3.1";
        sha256 = "1zx5m0446rkbbj43m1f110a7jvl7vd7wkhikqql608a0jzqr7bk0";
-       buildDepends = [ base bytestring time unix ];
+       libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "http://github.com/bgamari/linux-evdev";
        description = "Bindings to Linux evdev input device interface";
        license = stdenv.lib.licenses.bsd3;
@@ -84481,7 +86637,7 @@ self: {
        sha256 = "1l4vznam1a8vf3nixhbmw38rpzkvmbka0cbdfdsgfrpn03kxjz3c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
        license = stdenv.lib.licenses.bsd3;
@@ -84493,7 +86649,7 @@ self: {
        pname = "linux-inotify";
        version = "0.2.0.1";
        sha256 = "1970v1zkbp45amylmg79bbdfhk8kg6vzxjznd76gfl5kff2cv12r";
-       buildDepends = [ base bytestring hashable unix ];
+       libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84504,8 +86660,8 @@ self: {
        pname = "linux-kmod";
        version = "0.1.0.1";
        sha256 = "1vqbibp93fw6r03v5q2cisya6m12xb12rad11myxrkbn29rjmhws";
-       buildDepends = [ base directory ];
-       pkgconfigDepends = [ libkmod ];
+       libraryHaskellDepends = [ base directory ];
+       libraryPkgconfigDepends = [ libkmod ];
        homepage = "https://github.com/tensor5/linux-kmod";
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
@@ -84518,7 +86674,7 @@ self: {
        pname = "linux-mount";
        version = "0.2.0.1";
        sha256 = "12bwrniaxg6gm347jdgbf535pdz4z57pkyiwa98c903y9q9ssnyi";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/tensor5/linux-mount";
        description = "Mount and unmount filesystems";
        license = stdenv.lib.licenses.bsd3;
@@ -84530,7 +86686,7 @@ self: {
        pname = "linux-namespaces";
        version = "0.1.2.0";
        sha256 = "0yznnp9rdz15drm79pvbqbrbk2nczbkmlf00pb7rki7w1l9njp2q";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/redneb/hs-linux-namespaces";
        description = "Create new or enter an existing linux namespaces";
        license = stdenv.lib.licenses.bsd3;
@@ -84546,9 +86702,12 @@ self: {
        sha256 = "18akjagbqw2fswrnp4ifzivwdwsbny28kvnm0hfc1ysyy9id8511";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring containers directory filepath ghc-events mtl
-         pretty process unix
+       libraryHaskellDepends = [
+         base binary bytestring containers mtl pretty
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory filepath ghc-events process
+         unix
        ];
        jailbreak = true;
        homepage = "https://github.com/bjpop/haskell-linux-perf";
@@ -84565,7 +86724,7 @@ self: {
        pname = "linux-ptrace";
        version = "0.1.2";
        sha256 = "0hzniy9vlycbsqkrr9xxdgnx070h5v6jz4gqx7rc60a3q0hqn43m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mmap posix-waitpid process template-haskell unix
        ];
        jailbreak = true;
@@ -84580,7 +86739,7 @@ self: {
        pname = "linux-xattr";
        version = "0.1.1.0";
        sha256 = "0rpq5sm557gm227id2rfsffgr47lrj4d4kpzh194d74dx2qkg5g6";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/tensor5/linux-xattr";
        description = "Read, set and list extended attributes";
        license = stdenv.lib.licenses.bsd3;
@@ -84596,8 +86755,9 @@ self: {
        sha256 = "0diacwvxpq2iyfzlcmdqrbfndhmlmgzq9hvxlyp12idlzwa9p1cq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring network time ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring network ];
+       executableHaskellDepends = [ base binary bytestring network time ];
+       testHaskellDepends = [
          base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -84613,7 +86773,7 @@ self: {
        pname = "lio";
        version = "0.11.5.0";
        sha256 = "10miy18x1898dcq58bnk0md3ymw9ckh9j26grsr6w3jqnvw69712";
-       buildDepends = [ base bytestring containers hashable ];
+       libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
        license = "GPL";
      }) {};
@@ -84626,7 +86786,7 @@ self: {
        pname = "lio-eci11";
        version = "0.2";
        sha256 = "11vl27kn0wdxndkwn3yvxd6kg9jv0lilxpvx2hkax37lq3x15rc8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers dclabel-eci11 directory filepath
          mtl old-time SHA time unix
        ];
@@ -84643,7 +86803,7 @@ self: {
        pname = "lio-fs";
        version = "0.0.1.2";
        sha256 = "1zzxsr0kg3bxm2wzhsqw2irk5myzshgqhr3fxi062hzw2rh0nqn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath lio SHA unix xattr
        ];
        description = "Labeled File System interface for LIO";
@@ -84661,10 +86821,13 @@ self: {
        sha256 = "1nddiakk6b9biay6ijnc48dxcfgpi9vx4g6a8r9vz6cjh6mh0154";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base base64-bytestring bytestring cmdargs conduit
-         directory filepath http-types lio simple simple-templates text wai
-         wai-extra warp
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring conduit filepath http-types lio
+         simple simple-templates text wai wai-extra warp
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs directory filepath
+         simple-templates text
        ];
        jailbreak = true;
        homepage = "http://simple.cx";
@@ -84679,7 +86842,7 @@ self: {
        pname = "lipsum-gen";
        version = "0.1.0.2";
        sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        description = "Generators for random sequences of English-like nonsense text";
        license = stdenv.lib.licenses.bsd3;
@@ -84688,9 +86851,9 @@ self: {
   "liquid-fixpoint" = callPackage
     ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors
      , bytestring, cmdargs, containers, deepseq, directory, filemanip
-     , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty
+     , filepath, ghc-prim, hashable, intern, mtl, parsec, pretty
      , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format
-     , transformers, unordered-containers, z3
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
@@ -84698,22 +86861,25 @@ self: {
        sha256 = "00s5ch8i96nqjy2kq6y3i25mji3ld6z8121ngpbz87zbgp3zwhaw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal array attoparsec base bifunctors bytestring cmdargs
          containers deepseq directory filemanip filepath ghc-prim hashable
          intern mtl parsec pretty process syb text text-format transformers
          unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         ansi-terminal array base bifunctors bytestring cmdargs containers
+         deepseq directory filepath hashable mtl parsec pretty process syb
+         text text-format unordered-containers
+       ];
+       testHaskellDepends = [
          base directory filepath process tasty tasty-hunit tasty-rerun text
        ];
-       buildTools = [ ocaml z3 ];
-       configureFlags = [ "-fbuild-external" ];
        homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ocaml;  inherit (pkgs) z3;};
+     }) {};
 
   "liquidhaskell" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors
@@ -84722,7 +86888,7 @@ self: {
      , hashable, hpc, hscolour, intern, liquid-fixpoint, mtl
      , optparse-applicative, parsec, pretty, process, syb, tagged, tasty
      , tasty-hunit, tasty-rerun, template-haskell, text, time
-     , unordered-containers, vector, z3
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "liquidhaskell";
@@ -84730,23 +86896,29 @@ self: {
        sha256 = "1yxg6zii0mbsri5j37k2s976nyglijyjfgz9vwafiqdrca328z4s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-terminal array base bifunctors bytestring cmdargs
          containers cpphs data-default deepseq Diff directory filemanip
          filepath fingertree ghc ghc-paths hashable hpc hscolour intern
          liquid-fixpoint mtl parsec pretty process syb template-haskell text
          time unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson ansi-terminal array base bifunctors bytestring cmdargs
+         containers cpphs data-default deepseq Diff directory filemanip
+         filepath fingertree ghc ghc-paths hashable hpc hscolour
+         liquid-fixpoint mtl parsec pretty process syb template-haskell text
+         time unordered-containers vector
+       ];
+       testHaskellDepends = [
          base directory filepath optparse-applicative process tagged tasty
          tasty-hunit tasty-rerun
        ];
-       buildTools = [ z3 ];
        homepage = "http://goto.ucsd.edu/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) z3;};
+     }) {};
 
   "lispparser" = callPackage
     ({ mkDerivation, base, parsec }:
@@ -84754,7 +86926,7 @@ self: {
        pname = "lispparser";
        version = "0.3.1";
        sha256 = "1hj5fwmzxp2gw2gx86wa1fy36jmmh3sf8kd4acc8x0rghpmlw0w8";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Simple parser for LISP S-expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84765,7 +86937,7 @@ self: {
        pname = "list-extras";
        version = "0.4.1.4";
        sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Common not-so-common functions for lists";
        license = stdenv.lib.licenses.bsd3;
@@ -84777,8 +86949,8 @@ self: {
        pname = "list-fusion-probe";
        version = "0.1.0.3";
        sha256 = "1djmh6bwnmp64vwq5f5j4f54ygrjkl56gp0la06yxknyvyn9k8jp";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84789,7 +86961,7 @@ self: {
        pname = "list-grouping";
        version = "0.1.1";
        sha256 = "0w9f68cr4k0p8zl81y8ax19i6ypzks0y27hdlz71wwmgn5v2y63l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://coder.bsimmons.name/blog/2009/08/list-grouping-module-released/";
        description = "Functions for grouping a list into sublists";
        license = stdenv.lib.licenses.bsd3;
@@ -84801,7 +86973,7 @@ self: {
        pname = "list-mux";
        version = "1.0";
        sha256 = "147zb156g79a5p1w0b9vcvjy5x7nsrhng5rgjqq3cy3xpbam4nys";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/hellertime/list-mux";
        description = "List Multiplexing";
@@ -84820,12 +86992,12 @@ self: {
        sha256 = "1bq5244ys4xy3pfj72dq399x0g57q41lrllbd5hgvk9z0j92lxys";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs configurator containers directory dns
          filepath HDBC HDBC-postgresql HDBC-sqlite3 MissingH tasty
          tasty-hunit tasty-quickcheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cmdargs configurator containers directory dns
          doctest filemanip filepath HDBC HDBC-postgresql HDBC-sqlite3
          MissingH tasty tasty-hunit tasty-quickcheck
@@ -84842,11 +87014,11 @@ self: {
        pname = "list-t";
        version = "0.4.5.1";
        sha256 = "0mf1dv0pcbc2sgnimjkhmivl32ivjck7arhkq679s1ba5hc6np3a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude mmorph monad-control mtl transformers
          transformers-base
        ];
-       testDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
@@ -84861,10 +87033,10 @@ self: {
        pname = "list-t-attoparsec";
        version = "0.4.0.2";
        sha256 = "02sr57qpw8r38s9hb0wj0pik7x4rqgs51hl4s1mmnihgdflm0jb1";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base-prelude either list-t text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base-prelude either hspec list-t list-t-text text
        ];
        homepage = "https://github.com/nikita-volkov/list-t-attoparsec";
@@ -84882,12 +87054,12 @@ self: {
        pname = "list-t-html-parser";
        version = "0.4.0.0";
        sha256 = "1i243xa52ljqr79zccybx3x5nb58lvsfq4q99n2kk2qyhwyv7wb5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text either html-entities
          html-tokenizer list-t mtl-prelude text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base-prelude conversion conversion-text hspec html-tokenizer
          list-t-attoparsec list-t-text text
        ];
@@ -84906,7 +87078,7 @@ self: {
        pname = "list-t-http-client";
        version = "0.1.0.1";
        sha256 = "02wxqsfixzv7ccznydp3vij7maqvxhsbailakij2fcfrf2acw3g2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude bytestring http-client list-t mtl-prelude
        ];
        homepage = "https://github.com/nikita-volkov/list-t-http-client";
@@ -84922,7 +87094,7 @@ self: {
        pname = "list-t-libcurl";
        version = "0.3.0.0";
        sha256 = "1hcgxr87q7k6ixisj4p4gghm7nqb1l7bg361rcnqxf1145xmyyr5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude bytestring curlhs either list-t mtl-prelude
          resource-pool stm
        ];
@@ -84939,8 +87111,10 @@ self: {
        pname = "list-t-text";
        version = "0.2.0.2";
        sha256 = "1hsbisvmjprfzhqlhzmicxzyv67ylik0dazl4yjyilh8frjd7qlm";
-       buildDepends = [ base-prelude bytestring list-t mtl-prelude text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base-prelude bytestring list-t mtl-prelude text
+       ];
+       testHaskellDepends = [
          base base-prelude bytestring hspec list-t QuickCheck
          quickcheck-instances text transformers
        ];
@@ -84957,7 +87131,8 @@ self: {
        sha256 = "06li8zwhy3i3shgqrq4505af1b1dz9xpzx2lpx2has4p79bgd1mq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary containers dlist ];
+       libraryHaskellDepends = [ base binary containers dlist ];
+       executableHaskellDepends = [ base binary containers dlist ];
        homepage = "http://iki.fi/matti.niemenmaa/list-tries/";
        description = "Tries and Patricia tries: finite sets and maps for list keys";
        license = stdenv.lib.licenses.bsd3;
@@ -84969,7 +87144,7 @@ self: {
        pname = "listlike-instances";
        version = "0.2.3.1";
        sha256 = "0mkhnqn7wxspzxvivhaksxmxp7d6x9bazhl28nl9gck56bpa90sm";
-       buildDepends = [ base bytestring ListLike text vector ];
+       libraryHaskellDepends = [ base bytestring ListLike text vector ];
        jailbreak = true;
        homepage = "http://jwlato.webfactional.com/haskell/listlike-instances";
        description = "Extra instances of the ListLike class";
@@ -84983,7 +87158,7 @@ self: {
        pname = "lists";
        version = "0.4.2";
        sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln";
-       buildDepends = [ base list-extras split ];
+       libraryHaskellDepends = [ base list-extras split ];
        description = "Functions for dealing with lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84994,7 +87169,7 @@ self: {
        pname = "listsafe";
        version = "0.1.0.1";
        sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs";
-       buildDepends = [ base exceptions ];
+       libraryHaskellDepends = [ base exceptions ];
        homepage = "https://github.com/ombocomp/listsafe";
        description = "Safe wrappers for partial list functions, supporting MonadThrow";
        license = stdenv.lib.licenses.asl20;
@@ -85011,7 +87186,7 @@ self: {
        sha256 = "0xnbifi0g1kmxi88l9f77ypkgmdvhi69vy3fycbxwn926gc12v1r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html blaze-markup cheapskate directory filepath
          highlighting-kate parsec text time unordered-containers
        ];
@@ -85027,7 +87202,7 @@ self: {
        pname = "literals";
        version = "1.0";
        sha256 = "06n4svp0qss78l8827qmppmd63877wq01d6w9xagd10vn3c4hs2j";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85047,12 +87222,13 @@ self: {
        sha256 = "04n8s2p772ylzfjpclbrq01im0j9rlp0xd37i8jshll7r51iz66l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base event-list non-negative ];
+       executableHaskellDepends = [
          alsa-core alsa-seq base bytestring cgi concurrent-split containers
-         data-accessor data-accessor-transformers directory event-list
+         data-accessor data-accessor-transformers directory
          explicit-exception filepath html httpd-shed midi midi-alsa network
-         non-empty non-negative parsec pretty process stm stm-split strict
-         transformers unix utility-ht wx wxcore
+         non-empty parsec pretty process stm stm-split strict transformers
+         unix utility-ht wx wxcore
        ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer";
@@ -85067,8 +87243,8 @@ self: {
        pname = "ll-picosat";
        version = "0.1.0.0";
        sha256 = "0393ccnlink30492aw1gyv4jzd7rsckd8ymkm1wgbpma13vkf67h";
-       buildDepends = [ base ];
-       extraLibraries = [ picosat ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ picosat ];
        jailbreak = true;
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85080,7 +87256,7 @@ self: {
        pname = "llrbtree";
        version = "0.1.1";
        sha256 = "057bp1f1mpzlgg408b02x1bdzsixrrkcl1536nyvhp43rvxmgj61";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Purely functional sets and heaps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85096,7 +87272,7 @@ self: {
        sha256 = "1v1yaaj02qk6z58kiz3g7dr9cik8141vv409cyxlzqv1k79rpzrg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers dataenc ghc-prim hexpat
          mtl network old-locale parsec pretty random template-haskell text
          time utf8-string uuid
@@ -85116,7 +87292,7 @@ self: {
        pname = "llvm";
        version = "3.2.0.2";
        sha256 = "11k1m80vg9x6fgiyh9gxzl1i2i0l0jw9hbn3gs1d1dd7avzl9mrr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory llvm-base mtl process
          type-level
        ];
@@ -85137,14 +87313,14 @@ self: {
        pname = "llvm-analysis";
        version = "0.3.0";
        sha256 = "0jck1c9wy11wjss6aji64jw927mrncwd2nmnq65zq85r5hha3m8k";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base boomerang bytestring containers deepseq directory
          failure fgl filemanip filepath GenericPretty graphviz hashable
          hoopl HUnit ifscs itanium-abi lens llvm-base-types monad-par
          process temporary test-framework test-framework-hunit text
          transformers uniplate unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers filepath HUnit itanium-abi
          llvm-data-interop transformers uniplate unordered-containers
        ];
@@ -85153,17 +87329,16 @@ self: {
      }) {};
 
   "llvm-base" = callPackage
-    ({ mkDerivation, base, llvm, mtl }:
+    ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "llvm-base";
        version = "3.2.0.2";
        sha256 = "1f76nb85hnidp06v6lbl4aasac4h7ff9r8i054m8cnby2vc59r4n";
-       buildDepends = [ base mtl ];
-       extraLibraries = [ llvm ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/bos/llvm";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {};
 
   "llvm-base-types" = callPackage
     ({ mkDerivation, base, c2hs, containers, deepseq, dwarf, failure
@@ -85174,12 +87349,12 @@ self: {
        pname = "llvm-base-types";
        version = "0.3.0";
        sha256 = "142xc7w250y0nx60qnm4gc5hrqjm1bxk0nhgsp669g5kvxqcd3bn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq dwarf failure GenericPretty graphviz
          hashable pretty regex-tdfa text transformers unordered-containers
          vector
        ];
-       buildTools = [ c2hs ];
+       libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85190,7 +87365,7 @@ self: {
        pname = "llvm-base-util";
        version = "3.0.1.0";
        sha256 = "07q6dvwkg7h6qkwq0a7719g82anipj2pk0xid5p24pvzssa9z22w";
-       buildDepends = [ base llvm-base ];
+       libraryHaskellDepends = [ base llvm-base ];
        homepage = "https://github.com/bos/llvm";
        description = "Utilities for bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -85206,12 +87381,12 @@ self: {
        pname = "llvm-data-interop";
        version = "0.3.0";
        sha256 = "08kflxb0qannp6nb2sizz0bhl850dl1sszl1hk9l28m21r2akdy1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers data-default deepseq dwarf
          hashable hashtables llvm-base-types loch-th mtl text transformers
          unification-fd unordered-containers vector
        ];
-       buildTools = [ c2hs ];
+       libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85226,7 +87401,7 @@ self: {
        sha256 = "0nlh5l070zc7y1jpwnyxnc0223w8xaw0z92agmigiw6bm8vcs568";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers cpuid llvm-tf non-empty tfp transformers unsafe
          utility-ht
        ];
@@ -85243,8 +87418,8 @@ self: {
        sha256 = "07hb4n7wk0gmprjps045cvhcyvmis0jp5f11jbk55y4mgn4jy0cv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       pkgconfigDepends = [ llvm ];
+       libraryHaskellDepends = [ base ];
+       libraryPkgconfigDepends = [ llvm ];
        homepage = "http://haskell.org/haskellwiki/LLVM";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -85262,18 +87437,17 @@ self: {
        pname = "llvm-general";
        version = "3.4.5.3";
        sha256 = "03rps9ga20cdqfh2khqnahwrkljs714ac7yx9x7krb3dngf83zsm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
          utf8-string
        ];
-       testDepends = [
+       libraryToolDepends = [ llvm-config ];
+       testHaskellDepends = [
          base containers HUnit llvm-general-pure mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          transformers transformers-compat
        ];
-       buildTools = [ llvm-config ];
-       doCheck = false;
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
      }) { llvm-config = null;};
@@ -85287,15 +87461,14 @@ self: {
        pname = "llvm-general-pure";
        version = "3.4.5.3";
        sha256 = "1b3zh2y3b3jj5sg6421wv2qsrhyjs23qdzrk693r7mpj10rd258k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl parsec setenv template-haskell transformers
          transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       doCheck = false;
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85310,15 +87483,15 @@ self: {
        pname = "llvm-general-quote";
        version = "0.2.0.0";
        sha256 = "02j3npamy5s6ircfd9njg0y25asbpxl6fpsxjpxy7k4v1y6c3b75";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers haskell-src-meta llvm-general-pure
          mainland-pretty mtl split srcloc syb symbol template-haskell
          th-lift
        ];
-       testDepends = [
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
          base containers HUnit llvm-general-pure tasty tasty-hunit
        ];
-       buildTools = [ alex happy ];
        jailbreak = true;
        homepage = "https://github.com/tvh/llvm-general-quote";
        description = "QuasiQuoting llvm code for llvm-general";
@@ -85334,7 +87507,7 @@ self: {
        pname = "llvm-ht";
        version = "0.7.0.0";
        sha256 = "1yn8wyp2jjjdggvf1jz7iras4f7fg2dq57ramr5prvcapc6r5yn6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory mtl process type-level
        ];
        homepage = "http://darcs.serpentine.com/llvm/";
@@ -85353,7 +87526,7 @@ self: {
        sha256 = "1sfw901bhnwiam8mm7h50fb6rpqv7vs8j7bxdx6azcf02cmivx6w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal explicit-exception process transformers utility-ht
        ];
        jailbreak = true;
@@ -85367,7 +87540,7 @@ self: {
        pname = "llvm-pretty";
        version = "0.3.1.1";
        sha256 = "1qk3dlinhic9m8ahynqqi90y7ai728p10c4mkmj2w135wp8a8ran";
-       buildDepends = [ base containers monadLib pretty ];
+       libraryHaskellDepends = [ base containers monadLib pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85383,11 +87556,15 @@ self: {
        sha256 = "15h66zdkisjg1mrrchkyzknj0mq5xybjn41mrnfs3pzalnffsfqs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring cereal containers fgl llvm-pretty monadLib
+         pretty
+       ];
+       executableHaskellDepends = [
          array base bytestring cereal containers fgl fgl-visualize
          llvm-pretty monadLib pretty
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath llvm-pretty process
        ];
        description = "LLVM bitcode parsing library";
@@ -85404,7 +87581,7 @@ self: {
        sha256 = "0bkx86gv5f7w14hxny6h36balsklscxzm3qakv8f2ana0bk1sv09";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers llvm-ffi non-empty process storable-record tfp
          transformers utility-ht
        ];
@@ -85425,11 +87602,14 @@ self: {
        sha256 = "1nyp0sgdqsaa2f2v7xgmm3s8mf2a170mzz2h3wwsi163ggvxwvhd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec attoparsec-conduit base blaze-html blaze-markup
-         bytestring conduit containers directory filemanip filepath graphviz
-         llvm-analysis llvm-data-interop optparse-applicative parallel-io
-         process-conduit unordered-containers xml
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring directory filemanip
+         filepath graphviz llvm-analysis llvm-data-interop parallel-io xml
+       ];
+       executableHaskellDepends = [
+         attoparsec attoparsec-conduit base bytestring conduit containers
+         graphviz llvm-analysis llvm-data-interop optparse-applicative
+         process-conduit unordered-containers
        ];
        jailbreak = true;
        description = "Useful tools built on llvm-analysis";
@@ -85442,8 +87622,8 @@ self: {
        pname = "lmdb";
        version = "0.2.5";
        sha256 = "0z8wj06b5ii0w6pls2jlqmd3mhyrplhxd1c6h1my1p0w45b2hmc0";
-       buildDepends = [ array base ];
-       extraLibraries = [ lmdb ];
+       libraryHaskellDepends = [ array base ];
+       librarySystemDepends = [ lmdb ];
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
@@ -85455,8 +87635,8 @@ self: {
        pname = "load-env";
        version = "0.1.1";
        sha256 = "05pxxplp96pcnzk61xcckxnxljl3hjl13ckn4xrr93zmlw49rqwg";
-       buildDepends = [ base directory parsec ];
-       testDepends = [ base directory hspec HUnit parsec ];
+       libraryHaskellDepends = [ base directory parsec ];
+       testHaskellDepends = [ base directory hspec HUnit parsec ];
        description = "Load environment variables from a file";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85467,7 +87647,7 @@ self: {
        pname = "loadavg";
        version = "0.1";
        sha256 = "13q2yxqyzkh099jwz32plmdc71p4w2gkajx5bbi3fkvl2gylqlk6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Load average parsing from /proc/loadavg and bindings to getloadavg (3)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85478,7 +87658,7 @@ self: {
        pname = "local-address";
        version = "0.0.1";
        sha256 = "1846lhs0jc8finxcp1hfgifzs7hwzzxvmmv03laxzl63p5h2k8x9";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        homepage = "http://bitbucket.org/khibino/haskell-local-address";
        description = "Functions to get local interface address";
        license = stdenv.lib.licenses.bsd3;
@@ -85492,7 +87672,7 @@ self: {
        pname = "local-search";
        version = "0.0.7";
        sha256 = "0xrp34m2qfbz458g7bxdkp2lvsm0hskwxfcrm1d8n8g150ddn2xf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base combinatorial-problems containers erf random
        ];
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch";
@@ -85507,8 +87687,7 @@ self: {
        pname = "located-base";
        version = "0.1.0.0";
        sha256 = "0jb4ziagvbvgaihgw9ajsni0nylqbh5hw3q4dw561qmx2msjjfpj";
-       buildDepends = [ base ];
-       jailbreak = true;
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gridaphobe/located-base";
        description = "Location-aware variants of partial functions";
        license = stdenv.lib.licenses.bsd3;
@@ -85522,8 +87701,10 @@ self: {
        pname = "locators";
        version = "0.2.4.2";
        sha256 = "172fbxb51p09afsgp9g28zpbisxnf0wxdr3bwi6hwp40ac3363g4";
-       buildDepends = [ base bytestring cereal containers cryptohash ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal containers cryptohash
+       ];
+       testHaskellDepends = [
          base bytestring cereal containers cryptohash hspec
          hspec-expectations HUnit QuickCheck
        ];
@@ -85539,7 +87720,8 @@ self: {
        sha256 = "1dwv4v76i1fd60rrr0bla3wjz62x9dcgpd48p8z11lsjgpqarld3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85551,7 +87733,7 @@ self: {
        pname = "loch-th";
        version = "0.2.1";
        sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p";
-       buildDepends = [ base pretty template-haskell ];
+       libraryHaskellDepends = [ base pretty template-haskell ];
        homepage = "https://github.com/liskin/loch-th";
        description = "Support for precise error locations in source files (Template Haskell version)";
        license = stdenv.lib.licenses.bsd3;
@@ -85566,11 +87748,11 @@ self: {
        pname = "lock-file";
        version = "0.5.0.2";
        sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class directory exceptions tagged-exception-core
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-default-class directory exceptions filepath HUnit
          tagged-exception-core test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
@@ -85578,7 +87760,6 @@ self: {
        homepage = "https://github.com/trskop/lock-file";
        description = "Provide exclusive access to a resource using lock file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -85590,10 +87771,10 @@ self: {
        pname = "lockfree-queue";
        version = "0.2.3.1";
        sha256 = "131s1w6bdd958pg42s2i62xvw4basagir45y3vhbvsp8p9a6lmra";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque atomic-primops base bytestring ghc-prim
        ];
-       testDepends = [
+       testHaskellDepends = [
          abstract-deque abstract-deque-tests atomic-primops base bytestring
          ghc-prim HUnit test-framework test-framework-hunit
        ];
@@ -85611,7 +87792,7 @@ self: {
        pname = "log";
        version = "0.2.2";
        sha256 = "05izcd3qwwfwj5kl2k2pzjs8fk14hq10qls3a8m057gg4pd6nw1n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
          monad-control monad-time mtl old-locale split stm text time
          transformers-base unordered-containers
@@ -85631,11 +87812,11 @@ self: {
        pname = "log-domain";
        version = "0.10.2";
        sha256 = "0v91xilbgw0cym43fn5abz5ljrxz8anfj1w5x6nzp1qcqcwgwcg4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
          hashable-extras safecopy semigroupoids semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
@@ -85652,7 +87833,7 @@ self: {
        pname = "log-effect";
        version = "0.4.0.1";
        sha256 = "05rx54bsypisw6k8xm87a4rssyb0lwx7xavwamb1ciiwmvg3j14m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-effects fast-logger time
        ];
        jailbreak = true;
@@ -85670,7 +87851,7 @@ self: {
        sha256 = "0cidi9zkvqvdqpibr0jpnlk33kprmxwh016w0f86zg9cm3dfb5zf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers json parsec ];
+       executableHaskellDepends = [ base containers json parsec ];
        jailbreak = true;
        homepage = "https://github.com/haroldl/log2json";
        description = "Turn log file records into JSON";
@@ -85684,7 +87865,7 @@ self: {
        pname = "logfloat";
        version = "0.13.3.1";
        sha256 = "0rqnp2zkp247sb3parn3ywsk9clasy4l906a1wyrrybc3p72126s";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -85698,7 +87879,7 @@ self: {
        pname = "logger";
        version = "0.1.0.0";
        sha256 = "1v264iv34k13lz63ajci03iikc7ajqcl3dvcaxcv7m3h538km8vm";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base containers lens mtl template-haskell time
          transformers unagi-chan
        ];
@@ -85717,11 +87898,11 @@ self: {
        pname = "logging";
        version = "2.2.0";
        sha256 = "0awcaj88754bppjmaay6lwmrmv0n53fppn2sjrnyi876r1ibr4qp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring fast-logger lifted-base monad-control
          monad-logger old-locale pcre-light text time transformers
        ];
-       testDepends = [ base hspec monad-logger unix ];
+       testHaskellDepends = [ base hspec monad-logger unix ];
        description = "Simplified logging in IO for application writers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -85731,11 +87912,11 @@ self: {
      mkDerivation {
        pname = "logging-facade";
        version = "0.0.0";
-       revision = "1";
        sha256 = "0i7m4dpj7b556bfiahisvxcvdb1lv352zggjyrcr69iqnrac30z8";
+       revision = "1";
        editedCabalFile = "18d32076d981102462c3f24c95c6d9dc2470be80f5f36f99759cb23cc3db2d24";
-       buildDepends = [ base template-haskell transformers ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base hspec ];
        description = "Simple logging abstraction that allows multiple backends";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -85748,10 +87929,10 @@ self: {
        pname = "logging-facade-journald";
        version = "0.0.0";
        sha256 = "151p7574v9mxiniwxa4lngm5g4viznw4kg9adnngc3pi5nnh1z7l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base libsystemd-journal logging-facade text unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec libsystemd-journal logging-facade text
          unordered-containers
        ];
@@ -85768,11 +87949,11 @@ self: {
        pname = "logic-TPTP";
        version = "0.4.3.0";
        sha256 = "0hjznn92ippwgrsmklj02w2pf6dfylyiw1kifa4svjqwa9mx4hpv";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl pointed QuickCheck syb
          transformers transformers-compat
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        description = "Import, export etc. for TPTP, a syntax for first-order logic";
        license = "GPL";
      }) {};
@@ -85785,11 +87966,11 @@ self: {
        pname = "logic-classes";
        version = "1.5.2";
        sha256 = "05p291y7hw8cfp0s0pb2vm9zpfs092nr92axwz6f74bkfdhrafwj";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base containers HUnit mtl pretty PropLogic
          safecopy set-extra syb template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          applicative-extras base containers HUnit mtl pretty PropLogic
          set-extra syb
        ];
@@ -85805,7 +87986,7 @@ self: {
        pname = "logicst";
        version = "0.1.0.0";
        sha256 = "061x6g92334m2776xclh8mcbjind3l595pggc0g7yi4qzs31zbdc";
-       buildDepends = [ base logict transformers ];
+       libraryHaskellDepends = [ base logict transformers ];
        homepage = "http://github.com/sonyandy/logicst";
        description = "Backtracking mutable references in the ST and IO monads";
        license = stdenv.lib.licenses.bsd3;
@@ -85817,7 +87998,7 @@ self: {
        pname = "logict";
        version = "0.6.0.2";
        sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://code.haskell.org/~dolio/";
        description = "A backtracking logic-programming monad";
        license = stdenv.lib.licenses.bsd3;
@@ -85829,8 +88010,8 @@ self: {
        pname = "logsink";
        version = "0.1.0";
        sha256 = "1yxzqx47017z0djm8bymz43pc8cccnpkawaisvvzb646j6nbrw93";
-       buildDepends = [ base hsyslog logging-facade time ];
-       testDepends = [ base hspec logging-facade ];
+       libraryHaskellDepends = [ base hsyslog logging-facade time ];
+       testHaskellDepends = [ base hspec logging-facade ];
        description = "A logging framework for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -85843,15 +88024,16 @@ self: {
      mkDerivation {
        pname = "lojban";
        version = "0.3";
-       revision = "1";
        sha256 = "0pd31g21db8yh1mrnmy7r60lr0dbpwlxpwc0hli3y1wcr4fisnx6";
+       revision = "1";
        editedCabalFile = "9d30c9c8f1aa80aea24ca606d74ee1b3a9af0ecde15a0e65b1150d483d6b1cfc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers curl directory haskell98 HTTP markov-chain mtl
-         parsec process random regex-compat strict tagsoup xml
+       libraryHaskellDepends = [
+         base containers curl directory HTTP markov-chain mtl parsec process
+         random regex-compat strict tagsoup xml
        ];
+       executableHaskellDepends = [ haskell98 ];
        jailbreak = true;
        description = "Useful utilities for the Lojban language";
        license = stdenv.lib.licenses.bsd3;
@@ -85866,7 +88048,8 @@ self: {
        sha256 = "0axi63dvls9k87samaa0jihisfqyl92jbhmx1j9q73yjrn5wsk8j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "lojban parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85880,7 +88063,8 @@ self: {
        sha256 = "1h7jmhs38v6mfas4nj22shm2dwphx46247sv3mia28xlzim3xdsp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85894,7 +88078,7 @@ self: {
        sha256 = "0c571fk7kz4szpba85d7bf5awak5bc25r59kyx3xvyvk011y9hhd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base lojbanParser yjtools ];
+       executableHaskellDepends = [ base lojbanParser yjtools ];
        homepage = "http://homepage3.nifty.com/salamander/myblog/lojysamban.html";
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
@@ -85909,7 +88093,7 @@ self: {
        pname = "loli";
        version = "2011.6.24";
        sha256 = "1m23dkxh2vah7d47arpqx5zdpwczm8k4jixzslmqbdizm9h933ja";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default hack hack-contrib mps mtl
          template utf8-string
        ];
@@ -85926,8 +88110,8 @@ self: {
        pname = "loop";
        version = "0.2.0";
        sha256 = "11ifqahlg9ky5klid1fhsyfvfb6w8yb0dsy43s0cxcmldbw3qv5x";
-       buildDepends = [ base ];
-       testDepends = [ base hspec mtl ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec mtl ];
        homepage = "https://github.com/nh2/loop";
        description = "Fast loops (for when GHC can't optimize forM_)";
        license = stdenv.lib.licenses.mit;
@@ -85939,7 +88123,7 @@ self: {
        pname = "loop-effin";
        version = "0.1.1.0";
        sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52";
-       buildDepends = [ base effin ];
+       libraryHaskellDepends = [ base effin ];
        jailbreak = true;
        homepage = "https://github.com/konn/loop-effin";
        description = "control-monad-loop port for effin";
@@ -85953,7 +88137,7 @@ self: {
        pname = "loop-while";
        version = "1.0.0";
        sha256 = "1yvw91gn1iyw72rbq455zzrbb3pq8ph9cv1c6800qzjyxx0694bd";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "A monad transformer supporting various styles of while loop";
        license = stdenv.lib.licenses.bsd3;
@@ -85967,8 +88151,8 @@ self: {
        pname = "loops";
        version = "0.2.0.2";
        sha256 = "1syx22gp2zra2dhwvmm2np6c1lvqk622a62k4xxjd8y1fs2ckks7";
-       buildDepends = [ base primitive transformers vector ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base primitive transformers vector ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Fast imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85983,7 +88167,7 @@ self: {
        sha256 = "0gyd7l4i3vzv7swyqfywzwhsdxq3j5869c2id6hz6nm7db47wyy6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers directory filepath GoogleChart hmatrix
          process random
        ];
@@ -86007,14 +88191,21 @@ self: {
        sha256 = "0kzvi4310mbz51zkgmm84qyxxpi4m5ww2bsrfkj73a45bn7z198j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec-conduit base bytestring
+         case-insensitive conduit conduit-extra data-default directory
+         fast-logger html-conduit HTTP http-conduit http-types libmpd
+         process resourcet text transformers unix unordered-containers
+         utf8-string wai-logger xml-conduit yaml
+       ];
+       executableHaskellDepends = [
          aeson ansi-terminal attoparsec-conduit base bytestring
          case-insensitive conduit conduit-extra daemons data-default
          directory fast-logger html-conduit HTTP http-conduit http-types
          libmpd optparse-applicative process resourcet text transformers
          unix unordered-containers utf8-string wai-logger xml-conduit yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson ansi-terminal attoparsec-conduit base bytestring
          case-insensitive conduit daemons data-default directory fast-logger
          hspec html-conduit HTTP http-conduit http-types HUnit libmpd
@@ -86035,7 +88226,8 @@ self: {
        sha256 = "1fx7z90k9y12rii0yxk58159paiix1qi8y4j0za4k4szylr8f5ni";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/sfischer13/haskell-lorem";
        description = "Library for generating filler text";
@@ -86048,9 +88240,9 @@ self: {
        pname = "loris";
        version = "0.3.1";
        sha256 = "19w1c3gsmy03y4a238yp844wgqcv9s53cwrcapv2yvn9xpchm2gq";
-       buildDepends = [ base vector ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ loris ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ loris ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://www.tiresiaspress.us/haskell/loris";
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
@@ -86067,7 +88259,7 @@ self: {
        sha256 = "01jjbcgzpkh3mp729xahy2437hrg6wc2l1qnwcm069zrs3c1bdny";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary bytestring cryptohash directory hex network
          process split
        ];
@@ -86087,7 +88279,9 @@ self: {
        sha256 = "1avlq28k0jcfbnd0pfww80ixz5lvpp4jkf20dybjl7pfqyhj3s9p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskell98 mtl wx wxcore ];
+       executableHaskellDepends = [
+         array base containers haskell98 mtl wx wxcore
+       ];
        jailbreak = true;
        homepage = "http://www.ncc.up.pt/~pbv/stuff/lostcities";
        description = "An implementation of an adictive two-player card game";
@@ -86101,7 +88295,7 @@ self: {
        pname = "lowgl";
        version = "0.3.1.1";
        sha256 = "1c354ddx9niimfnppbg43d0v2dfr5s9s5dkppi0sld06jxaakxc5";
-       buildDepends = [ base data-default gl linear vector ];
+       libraryHaskellDepends = [ base data-default gl linear vector ];
        jailbreak = true;
        description = "Basic gl wrapper and reference";
        license = stdenv.lib.licenses.bsd2;
@@ -86113,7 +88307,7 @@ self: {
        pname = "lrucache";
        version = "1.2.0.0";
        sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz";
-       buildDepends = [ base containers contravariant ];
+       libraryHaskellDepends = [ base containers contravariant ];
        homepage = "http://github.com/chowells79/lrucache";
        description = "a simple, pure LRU cache";
        license = stdenv.lib.licenses.bsd3;
@@ -86129,7 +88323,7 @@ self: {
        sha256 = "08xaf27iirdxax7gjjjzvw4nv0qya6vz46826bzmp7f0i0rn88qk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base base-unicode-symbols cmdtheline text usb
          usb-id-database vector
        ];
@@ -86150,7 +88344,7 @@ self: {
        sha256 = "14j19jcmx20nhvb9a7im81j3wwkkx6lkb6b1kfizv8qkgnp0jd5j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath pretty process
        ];
        homepage = "http://code.haskell.org/~dons/code/lscabal";
@@ -86167,11 +88361,11 @@ self: {
        pname = "lss";
        version = "0.1.0.0";
        sha256 = "1r890sya0db0xvs9cm5ghhr6x55hkqplirv95km6y7py7hj69cjr";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers directory filepath language-css
          language-css-attoparsec text xmlhtml
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base containers hspec2 language-css
          language-css-attoparsec text
        ];
@@ -86190,7 +88384,9 @@ self: {
        sha256 = "1wk41hsr7pp9azac3449xp0xv8kd31bwif3yw6cfw9jfg3g498xg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 uu-parsinglib wx wxcore ];
+       executableHaskellDepends = [
+         base haskell98 uu-parsinglib wx wxcore
+       ];
        description = "Paint an L-System Grammar";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86207,12 +88403,16 @@ self: {
        sha256 = "0dr99prlsbzisaz8jbiw297fw1fysr9zq0g5ywc959ar3nki039f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers deepseq mtl mtl-compat parsec pretty
+         template-haskell text transformers
+       ];
+       executableHaskellDepends = [
          aeson base containers data-default deepseq directory mtl mtl-compat
          optparse-applicative parsec pretty template-haskell text
          transformers yaml
        ];
-       testDepends = [ base hspec mtl ];
+       testHaskellDepends = [ base hspec mtl ];
        description = "Higher-order file applicator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86225,7 +88425,7 @@ self: {
        pname = "ltk";
        version = "0.15.0.2";
        sha256 = "19wnkl9acibs6kcnm0m02jhjxrn19sanf5z2w0kqwjbqlfcrcc4a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
        ];
@@ -86241,7 +88441,7 @@ self: {
        pname = "ltl";
        version = "0.0.0";
        sha256 = "0h3jxngsdmakcr35zapxjaykjsqs44lxxk86d5i4rg0gi0i9qw3g";
-       buildDepends = [ base vcd ];
+       libraryHaskellDepends = [ base vcd ];
        homepage = "http://tomahawkins.org";
        description = "Using linear temporal logic (LTL) to verify embedded software and hardware";
        license = stdenv.lib.licenses.bsd3;
@@ -86255,7 +88455,7 @@ self: {
        pname = "lua-bytecode";
        version = "0.1.0.0";
        sha256 = "1cwpixaxxkfd8n714c8w82z97h3h8bqqqnh2wsn22cll168rb6zl";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers hashable numeric-extras
          vector
        ];
@@ -86271,7 +88471,7 @@ self: {
        pname = "luachunk";
        version = "0.1.0.0";
        sha256 = "03a8adaz3m93wnfmrvsqbmc57h1d8h0a90spfj1cb7yrpz0pr3ck";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring custom-prelude ghc-prim pretty
          text
        ];
@@ -86290,10 +88490,10 @@ self: {
        pname = "luautils";
        version = "0.1.4";
        sha256 = "176szfrz1ydnin1zi50235j4f4l87j516yjddmqbmd834dzvk20d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers hslua monad-loops text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary containers hslua QuickCheck quickcheck-instances
          test-framework test-framework-quickcheck2 test-framework-th text
          text-binary
@@ -86309,7 +88509,7 @@ self: {
        pname = "lub";
        version = "0.1.7";
        sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h";
-       buildDepends = [ base unamb ];
+       libraryHaskellDepends = [ base unamb ];
        homepage = "http://haskell.org/haskellwiki/lub";
        description = "information operators: least upper bound (lub) and greatest lower bound (glb)";
        license = stdenv.lib.licenses.bsd3;
@@ -86323,14 +88523,16 @@ self: {
      mkDerivation {
        pname = "lucid";
        version = "2.9.2";
-       revision = "1";
        sha256 = "0r3bzh9pmcqsac5id064jcscn9x2pyfhpazdzvz0666smf4b9jah";
+       revision = "1";
        editedCabalFile = "62ded561d5846fbcbe77e7f491c5fed2f4beddbf5cda336685f3d980df525218";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers hashable mtl text
          transformers unordered-containers
        ];
-       testDepends = [ base bifunctors hspec HUnit mtl parsec text ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -86344,8 +88546,10 @@ self: {
        pname = "lucid-foundation";
        version = "0.0.2.1";
        sha256 = "10l6xvb3kmkjb9sq92ijwnnbpm3rmp6j8r8vf00kdxkgx84n1zqd";
-       buildDepends = [ base lucid text ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base lucid text ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "Basic Zurb Foundation API in Lucid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86356,7 +88560,9 @@ self: {
        pname = "lucid-svg";
        version = "0.5.0.0";
        sha256 = "1p7ipdy0nmqfg1b038a1b5nd3xh2779d2gnw4h683mm5jcbf0mvj";
-       buildDepends = [ base blaze-builder lucid text transformers ];
+       libraryHaskellDepends = [
+         base blaze-builder lucid text transformers
+       ];
        homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
        description = "DSL for SVG using lucid for HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -86373,7 +88579,7 @@ self: {
        sha256 = "1dcvax756cqpqg6rrrjrd4sfr3ggvqdiwp42rb8fdrsi3v2skwrj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base64-bytestring blaze-html bson bytestring
          compact-string-fix feed happstack happstack-server HTTP mongoDB mtl
          network SHA text time
@@ -86391,7 +88597,7 @@ self: {
        pname = "luhn";
        version = "0.2";
        sha256 = "0ix7x28kmd3iarydl709vqd041h0qx6kv582c8ca54z8ag7lzynz";
-       buildDepends = [ base digits QuickCheck ];
+       libraryHaskellDepends = [ base digits QuickCheck ];
        description = "An implementation of Luhn's check digit algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86404,7 +88610,7 @@ self: {
        pname = "lui";
        version = "0.0.6";
        sha256 = "081451gpm20z8zl3y1mjy9015a461g7q99w7sjnr8alvd3pbhd6v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell98 haskgame MaybeT mtl SDL
        ];
        description = "Purely FunctionaL User Interface";
@@ -86418,8 +88624,8 @@ self: {
        pname = "luka";
        version = "2012.8.29";
        sha256 = "00g7a80nlw1bgw6x2pqg1qn4786ra3bwbwbfm9b7iyhb101b7s9s";
-       buildDepends = [ air base bytestring libffi ];
-       extraLibraries = [ objc ];
+       libraryHaskellDepends = [ air base bytestring libffi ];
+       librarySystemDepends = [ objc ];
        homepage = "https://github.com/nfjinjing/luka";
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
@@ -86434,7 +88640,7 @@ self: {
        sha256 = "0325c064nsczypapvwdchx7x5n69jxjbyjs90ah7q5ydxbjl6w9c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts text vector ];
+       executableHaskellDepends = [ base haskell-src-exts text vector ];
        jailbreak = true;
        homepage = "https://github.com/bitc/lushtags";
        description = "Create ctags compatible tags files for Haskell programs";
@@ -86447,8 +88653,8 @@ self: {
        pname = "luthor";
        version = "0.0.1";
        sha256 = "023kckpcdn6n5dyq0dip0132jp1w30hdx1qb5hbsd3js86j52a12";
-       buildDepends = [ base mtl parsec ];
-       testDepends = [ base mtl parsec ];
+       libraryHaskellDepends = [ base mtl parsec ];
+       testHaskellDepends = [ base mtl parsec ];
        jailbreak = true;
        homepage = "https://github.com/Zankoku-Okuno/luthor";
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
@@ -86466,14 +88672,14 @@ self: {
      mkDerivation {
        pname = "lvish";
        version = "1.1.4";
-       revision = "2";
        sha256 = "1s7i1jxb6m7ivk4nd60dy8hn4wgfhv1gcamvv6hgjvcw6rxn4k44";
+       revision = "2";
        editedCabalFile = "bb376e7ac0598a623c8222824a2ace2649a395be610f81912eb7193450aa3e7e";
-       buildDepends = [
+       libraryHaskellDepends = [
          async atomic-primops base bits-atomic containers deepseq ghc-prim
          lattices missing-foreign random transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          async atomic-primops base bits-atomic containers deepseq ghc-prim
          HUnit lattices missing-foreign QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
@@ -86495,7 +88701,10 @@ self: {
        sha256 = "1lr2qr817mb8qb7b3wvry9jpj3wjphj5s60rn3dyqibx8gny36bg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base containers directory filepath parsec wl-pprint
+       ];
+       executableHaskellDepends = [
          array base containers directory filepath parsec wl-pprint
        ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
@@ -86523,7 +88732,7 @@ self: {
        pname = "lxc";
        version = "0.3.1.1";
        sha256 = "1mksram2nlb611b81yh5smvgr3dqxyabphrrpimspixwwl8173zr";
-       buildDepends = [ base bindings-lxc mtl transformers ];
+       libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
        jailbreak = true;
        homepage = "https://github.com/fizruk/lxc";
        description = "High level Haskell bindings to LXC (Linux containers)";
@@ -86540,7 +88749,7 @@ self: {
        sha256 = "1pmlxvnlwdsb51pjrkak1sakfh3nyk5lia5pqmr7larlm1n3dx9m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers free HCodecs lens parsers transformers trifecta
        ];
        description = "A Lilypond-compiling music box";
@@ -86555,8 +88764,8 @@ self: {
        pname = "lz4";
        version = "0.2.3.1";
        sha256 = "1wck0sl7m873pqnpmn95vrp9jbr7awjdp9rrkqgj0nd3l6z65k4q";
-       buildDepends = [ base bytestring cereal ];
-       testDepends = [ base bytestring hspec HUnit QuickCheck ];
+       libraryHaskellDepends = [ base bytestring cereal ];
+       testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        homepage = "http://github.com/mwotton/lz4hs";
        description = "LZ4 compression for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -86571,14 +88780,14 @@ self: {
        pname = "lzma-conduit";
        version = "1.1.3";
        sha256 = "01pf7q56y4m377qcbfwdv767dhlvkhd4cs01bqcg9k667iy21fr4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL bytestring conduit resourcet transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ lzma ];
+       testHaskellDepends = [
          base bytestring conduit HUnit QuickCheck resourcet test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       extraLibraries = [ lzma ];
        homepage = "http://github.com/alphaHeavy/lzma-conduit";
        description = "Conduit interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
@@ -86593,12 +88802,14 @@ self: {
        pname = "lzma-enumerator";
        version = "0.1.3";
        sha256 = "0pzz8bf6310p23pmsa013i8vib0xsfvlkj7zp0w9xs2xsi4j7jk1";
-       buildDepends = [ base bindings-DSL bytestring enumerator mtl ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bindings-DSL bytestring enumerator mtl
+       ];
+       librarySystemDepends = [ lzma ];
+       testHaskellDepends = [
          base bytestring enumerator HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       extraLibraries = [ lzma ];
        jailbreak = true;
        homepage = "http://github.com/alphaHeavy/lzma-enumerator";
        description = "Enumerator interface for lzma/xz compression";
@@ -86614,12 +88825,12 @@ self: {
        pname = "lzma-streams";
        version = "0.0.0.0";
        sha256 = "0klgi097b8mky989hfzn3kk3r25yq1p0sjna4r68k7z9y143yzm2";
-       buildDepends = [ base bytestring io-streams ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring io-streams ];
+       librarySystemDepends = [ lzma ];
+       testHaskellDepends = [
          base bytestring HUnit io-streams QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       extraLibraries = [ lzma ];
        homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
@@ -86635,7 +88846,7 @@ self: {
        sha256 = "1r6vp774gjb52bd1lmjx6xzh0pw82b060pl7bh8n0z58i67bvm9q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers directory ghc template-haskell text
        ];
        jailbreak = true;
@@ -86650,7 +88861,7 @@ self: {
        pname = "mac";
        version = "0.1.0.0";
        sha256 = "1ym5hk774y65mjxhp1vwa40ji2yjf4abqrpf3v9dknc28r64v8bi";
-       buildDepends = [ base network transformers ];
+       libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86663,7 +88874,7 @@ self: {
        sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary parsec process ];
+       libraryHaskellDepends = [ base binary parsec process ];
        description = "Obtain the host MAC address on *NIX and Windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86675,17 +88886,18 @@ self: {
      mkDerivation {
        pname = "machinecell";
        version = "2.0.1";
-       revision = "1";
        sha256 = "0gl207a97zcs48k6pdr82x9ckg1bc2vn6wachc57gmnspk3j43xd";
+       revision = "1";
        editedCabalFile = "5470f26ae4ebbbe5f88e6c70d3193a28ce9e5f94fd48b76c4ef576fcac92ac7d";
-       buildDepends = [ arrows base free mtl profunctors semigroups ];
-       testDepends = [
+       libraryHaskellDepends = [
+         arrows base free mtl profunctors semigroups
+       ];
+       testHaskellDepends = [
          arrows base hspec mtl profunctors QuickCheck semigroups
        ];
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines" = callPackage
@@ -86696,14 +88908,14 @@ self: {
      mkDerivation {
        pname = "machines";
        version = "0.5.1";
-       revision = "1";
        sha256 = "1dyvyy0yv9qha1ff2nfrl304vmmbi4hd881jyj3xpqhgc3zz8ab2";
+       revision = "1";
        editedCabalFile = "c50d5fcc8b1b5635539169a5da097a25c7a7b7e9b8cc582abba3703014ba2d1d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers free mtl pointed profunctors semigroups
          transformers void
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/machines/";
        description = "Networked stream transducers";
@@ -86718,7 +88930,7 @@ self: {
        pname = "machines-directory";
        version = "0.2.0.6";
        sha256 = "03faha5zbxikbrz40wb0qar8qyjkzaylnk78ba925vms57dwwxva";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath machines machines-io transformers
        ];
        homepage = "http://github.com/aloiscochard/machines-directory";
@@ -86734,7 +88946,7 @@ self: {
        pname = "machines-io";
        version = "0.2.0.6";
        sha256 = "19xi9ia2f18nwqx58qb4l1hc2cv25jwcsl4qxd7snp4ynjyy6ln1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring chunked-data machines transformers
        ];
        homepage = "http://github.com/aloiscochard/machines-io";
@@ -86749,7 +88961,9 @@ self: {
        pname = "machines-process";
        version = "0.2.0.4";
        sha256 = "1v0jskb8m1s7cd51672v4fj9sjy5l1q01vm6qyvkrsabjp04lq4l";
-       buildDepends = [ base chunked-data machines machines-io process ];
+       libraryHaskellDepends = [
+         base chunked-data machines machines-io process
+       ];
        homepage = "http://github.com/aloiscochard/machines-process";
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
@@ -86762,7 +88976,9 @@ self: {
        pname = "machines-zlib";
        version = "0.1.0";
        sha256 = "0ajdc7878vzam5zphdaw8zn8knzk8kq80y3yf84jwlakb6ihrv6d";
-       buildDepends = [ base basic-prelude machines streaming-commons ];
+       libraryHaskellDepends = [
+         base basic-prelude machines streaming-commons
+       ];
        jailbreak = true;
        homepage = "https://github.com/lshift/machines-zlib";
        description = "Decompression support for machines";
@@ -86775,7 +88991,7 @@ self: {
        pname = "macho";
        version = "0.22";
        sha256 = "13i8bap38ha8j0259kw4gfx18jxc4860awp3s9rz16i4q2vik0v2";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://github.com/erikcharlebois/macho";
        description = "Parser for Mach-O object format";
        license = stdenv.lib.licenses.bsd3;
@@ -86792,10 +89008,13 @@ self: {
        sha256 = "0qf44jza8avq2yfsx2f0bdxbnda4lm3xq9qaivmslfbdfjy3mxv3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base filemanip filepath optparse-applicative parsec strict
+       libraryHaskellDepends = [ base filemanip filepath parsec strict ];
+       executableHaskellDepends = [
+         base filemanip filepath optparse-applicative strict
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
        ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
        homepage = "http://github.com/tych0/maclight";
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
@@ -86812,7 +89031,7 @@ self: {
        sha256 = "04j5fpj4758bl8ksaqn4zz6dl8pg24ih65k1b0pg8qrar4275r14";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers data-lens data-lens-template deepseq directory
          filepath graph-visit mtl process transformers unix
        ];
@@ -86829,8 +89048,8 @@ self: {
        sha256 = "0fknvy48sanvq7vg5pxwbjsahpiby1hba5wf8w6rq2g3d0a1cjwz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl random ];
-       extraLibraries = [ ncurses ];
+       executableHaskellDepends = [ array base containers mtl random ];
+       executableSystemDepends = [ ncurses ];
        homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz";
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
@@ -86843,8 +89062,8 @@ self: {
        pname = "magic";
        version = "1.1";
        sha256 = "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j";
-       buildDepends = [ base ];
-       extraLibraries = [ magic ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ magic ];
        description = "Interface to C file/magic library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86856,7 +89075,7 @@ self: {
        pname = "magma";
        version = "0.3.0.0";
        sha256 = "0bk4a9kw2jxvvz81ppj6qh3kk8cbknnqmg6vvkd0kpn70rcx0hnv";
-       buildDepends = [ base deepseq profunctors semigroups ];
+       libraryHaskellDepends = [ base deepseq profunctors semigroups ];
        jailbreak = true;
        homepage = "https://github.com/cutsea110/magma";
        description = "magma is an algebraic structure consisting a set together with an binary operation";
@@ -86875,7 +89094,7 @@ self: {
        sha256 = "0fmhms0415wawd539ipdj47gf27h2jjq2gpzhb0s21r6z63ayp7f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile containers curl directory happstack-state MissingH
          mtl network old-time regex-posix tagsoup utf8-string XMPP
        ];
@@ -86896,7 +89115,7 @@ self: {
        sha256 = "1gss86263pzwvm14yx5lqzskrwc3z6521z9yp0mg8780qgr8h9sr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          air air-th base bytestring containers data-default directory
          filepath hack2 hack2-contrib hack2-handler-snap-server moe process
          text
@@ -86917,11 +89136,11 @@ self: {
        sha256 = "1zd3vd0sj4pq8nhjn768rpfyn9a06a9c3j2fnhxsb9d800ilpvvf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs configurator containers directory filepath HDBC
          HDBC-postgresql HDBC-sqlite3 MissingH tasty tasty-hunit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs configurator containers directory doctest filemanip
          filepath HDBC HDBC-postgresql HDBC-sqlite3 MissingH tasty
          tasty-hunit
@@ -86940,7 +89159,7 @@ self: {
        sha256 = "0c6sn7bpzw82iarpw40l88f58xrjl9gzdqx1xnbafzdyfhbrnzbi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base http-client http-client-tls http-types reflection scotty
          text transformers wai-extra
        ];
@@ -86961,11 +89180,12 @@ self: {
        sha256 = "01xcr0dwbkpryavk054y52fdk9qis4s6df8d0yxz05kdl8b5nczq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit exceptions failure http-client
          http-client-multipart http-conduit monad-control network text
          transformers
        ];
+       executableHaskellDepends = [ base http-conduit text transformers ];
        jailbreak = true;
        homepage = "https://github.com/AndrewRademacher/mailgun";
        description = "Connector to Rackspace's Mailgun Service";
@@ -86978,7 +89198,7 @@ self: {
        pname = "mainland-pretty";
        version = "0.4.1.0";
        sha256 = "0r8xhlbpws6wq305dv3z074d7492jif9dsscz4sjbwvh5dk4x1zl";
-       buildDepends = [ base containers srcloc text ];
+       libraryHaskellDepends = [ base containers srcloc text ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
        license = stdenv.lib.licenses.bsd3;
@@ -86994,9 +89214,11 @@ self: {
        sha256 = "1rjarfwjqlrq9cdgjv93v6jwg58984c0dwjk506svsr29ll0p1b1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cmdargs monad-loops old-locale threads time unix
-         zeromq-haskell
+       libraryHaskellDepends = [
+         base bytestring monad-loops old-locale time zeromq-haskell
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs threads unix
        ];
        jailbreak = true;
        description = "Majordomo protocol for ZeroMQ";
@@ -87010,7 +89232,7 @@ self: {
        pname = "majority";
        version = "1.1";
        sha256 = "1442xw8i9jgk3hqavqikks98qs9l3i37lk63xyzpdgnlkfqapzka";
-       buildDepends = [ haskell2010 ];
+       libraryHaskellDepends = [ haskell2010 ];
        homepage = "https://github.com/niswegmann/majority";
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
@@ -87027,7 +89249,7 @@ self: {
        sha256 = "0bynbrn7fnnw7s6wafaji5yf21zjsrdmdfyb7m97bk77ss0gprq2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath unix
        ];
        description = "Change duplicated files into hard-links";
@@ -87045,7 +89267,7 @@ self: {
        sha256 = "1502pggc0gcmsj6fhzkjcrbqydaxz4qivsmv57jm6cxpbypkyin3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base bytestring configurator containers directory filepath
          github haskeline lens lens-datetime mtl process text time
        ];
@@ -87060,7 +89282,7 @@ self: {
        pname = "makedo";
        version = "0.1";
        sha256 = "0sc2fa45a046lw5x5z839gb1zk0d5nj663ghxajiclm6iw65kl2n";
-       buildDepends = [ base directory filepath HSH process ];
+       libraryHaskellDepends = [ base directory filepath HSH process ];
        jailbreak = true;
        homepage = "http://darcsden.com/kowey/makedo";
        description = "Helper for writing redo scripts in Haskell";
@@ -87073,7 +89295,7 @@ self: {
        pname = "managed";
        version = "1.0.0";
        sha256 = "06nb71pd68m5l6a48sz5kkrdif74phbg3y6bn9ydd00y515b9gn5";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "A monad for managed values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87089,7 +89311,7 @@ self: {
        sha256 = "1v44kml92i426hbinjmx00znyp7dwxa8qj0bmhb3hz0fwmgck1c3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary cairo containers dbus-client dbus-core derive directory
          filepath gtk gtk-serialized-event manatee-core mtl stm
          template-haskell text unix utf8-string
@@ -87113,7 +89335,7 @@ self: {
        sha256 = "1l3s22svds27q8hyh9nsawpc11crcll3vrcbfy6dvk64s04mwr21";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base manatee manatee-browser manatee-core manatee-curl
          manatee-editor manatee-filemanager manatee-imageviewer
          manatee-ircclient manatee-mplayer manatee-pdfviewer
@@ -87135,7 +89357,7 @@ self: {
        sha256 = "1ag0272cv700yi7y539hz3r04hqfqq9mx3cacp4hix4wag25f0n8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers dataenc dbus-client dbus-core filepath
          gio GoogleSuggest gtk manatee-core mtl network proc regex-tdfa
          split stm text unix utf8-string
@@ -87156,7 +89378,7 @@ self: {
        sha256 = "01blfcfynfbshznrz4arn89j7s063s7xhlkqnzbv42wqk04i083h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          mtl stm text utf8-string webkit
        ];
@@ -87178,7 +89400,7 @@ self: {
        pname = "manatee-core";
        version = "0.1.1";
        sha256 = "05s5cd43a395jgyh4i01wzzzwha9rx9vrflwyr6lpz5nqnfp755v";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Cabal cairo containers dataenc
          dbus-client dbus-core derive directory filepath gconf ghc ghc-paths
          gio glib gtk gtk-serialized-event gtksourceview2 haskell-src-exts
@@ -87203,7 +89425,7 @@ self: {
        sha256 = "0v525dcg6cs8mfrcbaxk9vx86gnd37c2z8gp9q8fck11616vckvn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers curl dbus-client dbus-core derive
          directory filepath gio glib gtk manatee-core mtl network old-locale
          old-time regex-tdfa stm template-haskell text utf8-string
@@ -87225,7 +89447,7 @@ self: {
        sha256 = "0rd6xjc1hmvfchwjh32ij4sa36z0v6b1k81gnx7278qqsscmgl9y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
        ];
@@ -87246,7 +89468,7 @@ self: {
        sha256 = "06zrhycpsnfi8r3a071p6qlrqidddv004h10zcglb9ryhw0sh2p1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gio glib gtk
          manatee-core mtl old-locale old-time stm text utf8-string
        ];
@@ -87267,7 +89489,7 @@ self: {
        sha256 = "0yn32xsckvw96kxskfhgcqg98rffl07hkwfjzyd7cm221hwd9s0g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gio glib gtk
          gtkimageview manatee-core regex-tdfa stm text utf8-string
        ];
@@ -87290,7 +89512,7 @@ self: {
        sha256 = "0l14r4mw5bwyjzs5m49sp3vdi2lzfgyjwhsb0q94l3937wb4abgy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Cabal containers curl dbus-client
          dbus-core derive fastirc filepath ghc GoogleTranslate groom gtk
          gtksourceview2 manatee-core MorseCode mtl nano-md5 network
@@ -87312,7 +89534,7 @@ self: {
        sha256 = "1jg9ikshscpjyq73g125acqndd049ry8zw7h0gglsi63xbqpldz4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gio gtk libtagc manatee-core process random regex-tdfa stm
          text time unix utf8-string
@@ -87334,7 +89556,7 @@ self: {
        sha256 = "0k00drrk7mpbc8ak5cwzx245xf968186dkc12cxp7n2h2mccb456";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cairo containers dbus-client derive filepath gtk
          manatee-core mtl poppler stm text utf8-string
        ];
@@ -87354,7 +89576,7 @@ self: {
        sha256 = "1zxkfil6anh2v692ky9l6gf40784y2czbx8853xmypnhnvgr95ll";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          proc stm text
        ];
@@ -87375,7 +89597,7 @@ self: {
        sha256 = "07zkjg1q3gdqiw1pp0325pyvh84740mxvlf8k6sc6l1l258zpk90";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers curl dbus-client derive download-curl feed
          filepath gtk manatee-core stm text utf8-string webkit
        ];
@@ -87396,7 +89618,7 @@ self: {
        sha256 = "0lcd3g7gp3fl4xpc51wgk0q9q1lijgnfdla521h7nqz84wcdfbcy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
        ];
@@ -87416,7 +89638,7 @@ self: {
        sha256 = "1aj1pghad0jdm3biy9f4caahvpyby0ia3clrl8lg2rmp2j703wkd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          stm text unix vte
        ];
@@ -87437,7 +89659,7 @@ self: {
        sha256 = "1vwj91i05rwgqmral4v2mmcmlrqy54h816j8vi6d0ivs1693p308";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gtk manatee-core regex-tdfa stm text
        ];
@@ -87455,7 +89677,7 @@ self: {
        sha256 = "1vsrp69qhndagzlw5fg9chi0hhphfbjmlvarypqi3g9fgrdghn46";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/julianalucena/mancala";
        description = "Simple mancala game";
        license = stdenv.lib.licenses.gpl3;
@@ -87471,12 +89693,12 @@ self: {
        pname = "mandrill";
        version = "0.2.2.1";
        sha256 = "0fs9fid7d87cnx5wi513xjqkgq425pfd4v9dx82x2c0pvnyfdvhk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
          old-locale QuickCheck text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
          tasty-quickcheck text
        ];
@@ -87494,7 +89716,7 @@ self: {
        sha256 = "1wrpzai3482c9g7zfacmjszi6h073ip00fbq17nyc22z2zw4908s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory filepath GLUT hslua time
        ];
        homepage = "http://gitorious.org/maximus/mandulia";
@@ -87518,7 +89740,7 @@ self: {
        sha256 = "0yb6i97ihcywbgzqkrad72q33m7fgx903rqizlhb4nz4bkl8793d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base base16-bytestring base64-bytestring
          blaze-builder bytestring case-insensitive conduit conduit-extra
          connection country-codes data-default http-conduit http-types HUnit
@@ -87526,7 +89748,10 @@ self: {
          text time tls transformers transformers-base unordered-containers
          utf8-string vector wai warp x509-system
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring http-conduit monad-logger text transformers
+       ];
+       testHaskellDepends = [
          aeson async attoparsec base base16-bytestring base64-bytestring
          blaze-builder bytestring case-insensitive conduit conduit-extra
          connection country-codes data-default HTF http-conduit http-types
@@ -87549,7 +89774,7 @@ self: {
        pname = "manifolds";
        version = "0.1.0.2";
        sha256 = "05ysr2rmjc0rqgy409qcga8j748l0w322vxbjdw9yyhcp2kbrv14";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad constrained-categories containers MemoTrie MonadRandom
          random semigroups tagged transformers vector vector-algorithms
          vector-space void
@@ -87568,8 +89793,8 @@ self: {
        pname = "map-syntax";
        version = "0.2";
        sha256 = "02v1dvq86qzbfbwbza4myj3a6a6a5p059fi5m3g548hmqk3v2p1r";
-       buildDepends = [ base containers mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [
          base containers deepseq HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -87587,7 +89812,7 @@ self: {
        sha256 = "0k25m5q8p592xrg2qa0mvm3749gllrj4cmmx2h1k5hssan68bk9g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers gloss mtl splines vector vector-space
        ];
        jailbreak = true;
@@ -87606,11 +89831,11 @@ self: {
        pname = "markdown";
        version = "0.1.13.2";
        sha256 = "15aiwjs006g8aajw88rgfvrpcwaxml9hnpz7jrhmdm2pqxfrkb8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup conduit conduit-extra
          containers data-default text transformers xss-sanitize
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-html conduit conduit-extra containers directory filepath
          hspec text transformers
        ];
@@ -87629,11 +89854,11 @@ self: {
        pname = "markdown-kate";
        version = "0.1.2.1";
        sha256 = "0zjqy163rxpjy0w3bn21j193qp04f7sdc8mfskaddqfks402h4i0";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base blaze-html conduit containers
          data-default highlighting-kate text transformers xss-sanitize
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-html conduit containers hspec markdown system-fileio
          system-filepath text transformers
        ];
@@ -87649,7 +89874,7 @@ self: {
        pname = "markdown-pap";
        version = "0.0.1.10";
        sha256 = "0cq0s9yixkg98vhsgiv1xjia2cn0b4q6gjl1wv0q7yrm26anaqcq";
-       buildDepends = [ base monads-tf papillon ];
+       libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87665,8 +89890,9 @@ self: {
        sha256 = "1bc3vcifv2xcddh8liq380c6sxarrs5pf21pfs9i4dx9rfl3hvhq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base directory hspec QuickCheck silently stringbuilder
        ];
        description = "Literate Haskell support for Markdown";
@@ -87683,7 +89909,7 @@ self: {
        sha256 = "0sman1849sfr0d56kifpyb0ba9pqghvmyhr3gchcd13qimp80395";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary-file Cabal directory filepath markdown-pap monads-tf
          papillon png-file yjsvg
        ];
@@ -87698,8 +89924,8 @@ self: {
        pname = "marked-pretty";
        version = "1.1.2.1";
        sha256 = "01dsqdckrm93ydc5frsxj55vgj238213qr31n1iybjdmw5x2r0dl";
-       buildDepends = [ base deepseq ghc-prim ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/marked-pretty";
        description = "Pretty-printing library, with scoping, based on pretty";
        license = stdenv.lib.licenses.bsd3;
@@ -87711,7 +89937,7 @@ self: {
        pname = "markov";
        version = "0.1";
        sha256 = "1ka44rvrl9ppshbjmk95997cna670bqwjsharcr9qsalp6pchmdf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Simple interpreter for Markov's normal algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87722,7 +89948,7 @@ self: {
        pname = "markov-chain";
        version = "0.0.3.3";
        sha256 = "1y9fjsf6dg6a9ha75w2szq4gi5fhq89l1r7wqb20hmadkcjjplx8";
-       buildDepends = [ base containers random transformers ];
+       libraryHaskellDepends = [ base containers random transformers ];
        homepage = "http://code.haskell.org/~thielema/markov-chain/";
        description = "Markov Chains for generating random sequences with a user definable behaviour";
        license = "GPL";
@@ -87736,8 +89962,10 @@ self: {
        pname = "markov-processes";
        version = "0.0.2";
        sha256 = "1pd09fdy05l3drmpdd3rbid6g2vdyalrpc704xmacbp186hmnf38";
-       buildDepends = [ base bifunctors memoize MonadRandom random ];
-       testDepends = [ assertions base bifunctors memoize random ];
+       libraryHaskellDepends = [
+         base bifunctors memoize MonadRandom random
+       ];
+       testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87751,11 +89979,11 @@ self: {
        pname = "markup";
        version = "1.1.0";
        sha256 = "0p037nq20vdbrvn29n3xlaval98fs0lml3y5h0j9fy04x6zcdkz8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup comonad lucid mtl text transformers
          urlpath
        ];
-       testDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec ];
        description = "Abstraction for markup languages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87771,7 +89999,7 @@ self: {
        sha256 = "09gfmh9hdzyjijkv2h5a6gfa9rfmba2642rhhh80wsw9y4rg8ns1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory glib gtk gtk2hs-buildtools MissingH mtl
          pandoc temporary text transformers webkit
        ];
@@ -87793,13 +90021,16 @@ self: {
        sha256 = "0643l0xnm4rq6zfbbd01ps3z7qnw7crvpblg7n5rwigi0m1zl4n9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring Cabal data-default directory exceptions
-         filepath http-client http-client-tls http-types keyring mtl network
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions http-client http-client-tls
+         http-types mtl network text transformers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring Cabal data-default directory filepath keyring
          optparse-applicative process shake split text transformers
          zip-archive
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base exceptions tasty tasty-hunit text transformers
        ];
        jailbreak = true;
@@ -87825,16 +90056,20 @@ self: {
        sha256 = "1w2lvns840hdzyismdwv70s70qd2af2ms14y58nhp24yf6h58j7b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base binary bytestring containers cryptohash
-         data-binary-ieee754 directory either errors fast-logger filepath
-         hashable hslogger lifted-async mmorph monad-control monad-logger
-         mtl old-locale optparse-applicative packer pipes pipes-attoparsec
-         pipes-bytestring pipes-group semigroups siphash text time
-         transformers transformers-base unix unordered-containers
+         directory either errors fast-logger filepath hashable hslogger
+         lifted-async mmorph monad-control monad-logger mtl packer pipes
+         pipes-attoparsec pipes-bytestring pipes-group semigroups siphash
+         text time transformers transformers-base unix unordered-containers
          vaultaire-common zeromq4-haskell
        ];
-       testDepends = [ base bytestring hspec ];
+       executableHaskellDepends = [
+         async attoparsec base bytestring containers data-binary-ieee754
+         hslogger old-locale optparse-applicative packer pipes text time
+         unix unordered-containers vaultaire-common
+       ];
+       testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87852,10 +90087,13 @@ self: {
        sha256 = "01yz9ry25k6kq1r8z3dbqj2xqm95wssfh2jhwarv3w3z65wa6x8n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base configurator containers cubicbezier directory dlist filepath
-         glpk-hs graphviz labeled-tree lens mtl parsek polynomials-bernstein
-         pretty process text typography-geometry vector
+       libraryHaskellDepends = [
+         base containers cubicbezier directory filepath glpk-hs graphviz
+         labeled-tree lens mtl polynomials-bernstein process text
+         typography-geometry vector
+       ];
+       executableHaskellDepends = [
+         base configurator dlist parsek pretty
        ];
        jailbreak = true;
        description = "Markup language preprocessor for Haskell";
@@ -87875,7 +90113,7 @@ self: {
        sha256 = "1p9d2vy3c7yh1w1aczh3f4886q0hldrpisnkk40w62cqvjg7sig7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          authenticate-oauth base bytestring conduit datetime lens
          monad-logger parsers persistent persistent-sqlite
          persistent-template regex-posix text transformers twitter-conduit
@@ -87896,7 +90134,7 @@ self: {
        sha256 = "0bxzjs19n2c7xd1v2hrzx6h1rrw6m8yax7kbcar0q766bv36qfmy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base random ];
+       executableHaskellDepends = [ base random ];
        homepage = "http://wiki.github.com/paolino/mastermind";
        description = "console mastermind decypher";
        license = stdenv.lib.licenses.bsd3;
@@ -87908,8 +90146,8 @@ self: {
        pname = "matchers";
        version = "0.24.0.0";
        sha256 = "171ncbch38nzy46lb6p9navaar1b492hgf4b9kbd3g6fsldvny64";
-       buildDepends = [ base bytestring prednote text ];
-       extraLibraries = [ pcre ];
+       libraryHaskellDepends = [ base bytestring prednote text ];
+       librarySystemDepends = [ pcre ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/matchers";
        description = "Text matchers";
@@ -87926,8 +90164,10 @@ self: {
        pname = "math-functions";
        version = "0.1.5.2";
        sha256 = "12cznf7gwia1ki7xhvlhk5p8d09zrdvfgn07pkp4sfrwsc4vijcy";
-       buildDepends = [ base deepseq erf vector vector-th-unbox ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base deepseq erf vector vector-th-unbox
+       ];
+       testHaskellDepends = [
          base HUnit ieee754 QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
@@ -87947,7 +90187,7 @@ self: {
        sha256 = "01iyzrwscqirhcr4622d0n16mr4p54qbvg5m2a0ns36j59xfd79g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring ConfigFile directory filepath HStringTemplate HUnit
          old-locale pandoc pandoc-types process SHA test-framework
          test-framework-hunit time unix
@@ -87969,7 +90209,7 @@ self: {
        sha256 = "1gbk1bv5v7s4mbs3cr30zhfnm3zrhxhly3791mar5807bqw86q5v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring cmdargs containers directory fgl filepath
          graphviz HTTP process safe tagsoup text
        ];
@@ -87987,8 +90227,10 @@ self: {
        pname = "mathlink";
        version = "2.0.1.1";
        sha256 = "1agqbhl6r40swsvsllyx9vf9hc9a709wvg546rh6fn315waifqqk";
-       buildDepends = [ array base containers haskell98 ix-shapable mtl ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [
+         array base containers haskell98 ix-shapable mtl
+       ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~TracyWadleigh/mathlink";
        description = "Write Mathematica packages in Haskell";
@@ -88002,8 +90244,8 @@ self: {
        pname = "matlab";
        version = "0.2.0.0";
        sha256 = "08kalclinzqxy5l7j115hz6h9nw1g7mf9rzmpz8dblbhbwvj4l7x";
-       buildDepends = [ array base Cabal filepath ];
-       extraLibraries = [ eng mat mx ];
+       libraryHaskellDepends = [ array base Cabal filepath ];
+       librarySystemDepends = [ eng mat mx ];
        jailbreak = true;
        description = "Matlab bindings and interface";
        license = stdenv.lib.licenses.bsd3;
@@ -88017,11 +90259,13 @@ self: {
      mkDerivation {
        pname = "matrices";
        version = "0.4.2";
-       revision = "1";
        sha256 = "1mcv3ihaf15biai6m98jfgv31whgmwbzgagxyj3bfpnilslp98l6";
+       revision = "1";
        editedCabalFile = "6aabde42e016b428562ed0e983444308c23d79837f04453fe57f60a6cbc02fe4";
-       buildDepends = [ base primitive vector ];
-       testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ];
+       libraryHaskellDepends = [ base primitive vector ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck vector
+       ];
        description = "native matrix based on vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88034,8 +90278,8 @@ self: {
        pname = "matrix";
        version = "0.3.4.4";
        sha256 = "03aaw60x8849rsrcqc8n0d3k8a6dp8naxnqfq2xq776q5zbbcrpv";
-       buildDepends = [ base deepseq loop primitive vector ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base deepseq loop primitive vector ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A native implementation of matrix operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88046,7 +90290,7 @@ self: {
        pname = "matrix-market";
        version = "1.2";
        sha256 = "1hzpjkmwr24073mf9i13rx3n23ri0b5vmvwx8k9lxbrg1821hy28";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://stat.stanford.edu/~patperry/code/matrix-market";
        description = "Read and write NIST Matrix Market files";
        license = stdenv.lib.licenses.bsd3;
@@ -88058,7 +90302,7 @@ self: {
        pname = "matrix-market-pure";
        version = "0.2";
        sha256 = "05jjf5wnxhbafrca1qfzlrxvysy5bff22mzk45pia5b9gwdhygn1";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        homepage = "http://bitbucket.org/jetxee/hs-matrix-market";
        description = "Pure and composable reader and writer of the Matrix Market format";
        license = stdenv.lib.licenses.bsd3;
@@ -88074,7 +90318,7 @@ self: {
        sha256 = "15pjqyy9qs9bn2vfayl73h5maf01snv7rvq1acb3ly8pain36lh4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile containers directory MissingH mtl network
          old-locale split time vty vty-ui XMPP
        ];
@@ -88092,7 +90336,7 @@ self: {
        pname = "maude";
        version = "0.6.1";
        sha256 = "0qadqpj5vzg84mqh29p6vr2ffih7y69ds0jdpxmr17am5bh3mhql";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath process process-extras temporary text xml
        ];
        homepage = "https://github.com/davidlazar/maude-hs";
@@ -88110,10 +90354,10 @@ self: {
        pname = "maxent";
        version = "0.7";
        sha256 = "0vxfxlvcrmqcxplw6f2r7nljcam9iv92jy2nxa7x67ldyj7yxk28";
-       buildDepends = [
+       libraryHaskellDepends = [
          ad base lagrangian nonlinear-optimization vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          ad base hmatrix lagrangian nonlinear-optimization QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
@@ -88130,7 +90374,7 @@ self: {
        pname = "maximal-cliques";
        version = "0.1.1";
        sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh";
-       buildDepends = [ base containers vector ];
+       libraryHaskellDepends = [ base containers vector ];
        description = "Enumerate all maximal cliques of a graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88146,7 +90390,7 @@ self: {
        sha256 = "1a9z3bmdjl5mhn718bj8h95m4xlhiyimkz7z54d0dmcv6ryld4wx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols boxes containers
          containers-unicode-symbols HaLeX IndentParser mtl parsec process
          uuagc uuagc-cabal
@@ -88164,8 +90408,8 @@ self: {
        pname = "maybe-justify";
        version = "0.1.0.0";
        sha256 = "0zgc3niz0vz4b3xcxj6s4fpxzizgkimllyd0r6vcafbl9ffv2a38";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Simple higher order function for Maybe";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -88180,8 +90424,9 @@ self: {
        sha256 = "1iqfmvj9maa0f4gk66g0j1dv1prhac3vb0b225d9sw9bliwnb1br";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base benchpress Cabal directory filepath mtl old-time process time
+       libraryHaskellDepends = [ base benchpress old-time process ];
+       executableHaskellDepends = [
+         base benchpress Cabal directory filepath mtl process time
        ];
        jailbreak = true;
        homepage = "http://code.google.com/p/maybench/";
@@ -88196,7 +90441,7 @@ self: {
        pname = "mbox";
        version = "0.3.1";
        sha256 = "13hq6h280wbc9xwbvdcq4qqrhbjnnzg824lk4zxkh4bvqpabjwni";
-       buildDepends = [ base safe text time time-locale-compat ];
+       libraryHaskellDepends = [ base safe text time time-locale-compat ];
        description = "Read and write standard mailbox files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88211,7 +90456,7 @@ self: {
        sha256 = "1j0dl97skgbxq2gcd3w6jzsdd2yv1mw6z4fz61akcimzyn8c2lvh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring codec-mbox containers fclabels hsemail mtl parsec
          process pureMD5 random
        ];
@@ -88229,7 +90474,7 @@ self: {
        sha256 = "178f2n2r7m4jznkzhnqqslqf0czvz9h7cifhbdmvr1nihhgb532q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gloss ];
+       executableHaskellDepends = [ base gloss ];
        jailbreak = true;
        homepage = "http://www.cas.mcmaster.ca/~anand/";
        license = stdenv.lib.licenses.mit;
@@ -88243,7 +90488,7 @@ self: {
        pname = "mcmc-samplers";
        version = "0.1.1.1";
        sha256 = "0pqc6i86b5vdhfw93x220k0x7dcfs77s7az6avaw7fn2q6xl1qli";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hakaru hmatrix mwc-random primitive statistics
        ];
        jailbreak = true;
@@ -88258,7 +90503,7 @@ self: {
        pname = "mcmc-synthesis";
        version = "0.1.2.2";
        sha256 = "14z1x9dqnjj391nrlngs9s887yqh3arc7kfgk0m3d89vrkc185vq";
-       buildDepends = [ base MonadRandom ];
+       libraryHaskellDepends = [ base MonadRandom ];
        jailbreak = true;
        description = "MCMC applied to probabilistic program synthesis";
        license = stdenv.lib.licenses.gpl3;
@@ -88272,7 +90517,8 @@ self: {
        sha256 = "15ab4fl49nq398q49wz5fgphfb7xzbrf4j51rnd80qb30rm6xfl6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network pipes split transformers ];
+       libraryHaskellDepends = [ base network split transformers ];
+       executableHaskellDepends = [ base network pipes transformers ];
        jailbreak = true;
        homepage = "https://github.com/DougBurke/hmcpi";
        description = "Connect to MineCraft running on a Raspberry PI";
@@ -88288,7 +90534,12 @@ self: {
        sha256 = "0jynmcawrxwv6xfbwvz3915rsp2ssx9s8h7i3pgd5adlzqpws19l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base directory pandoc terminfo ];
+       libraryHaskellDepends = [
+         ansi-terminal base directory pandoc terminfo
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base directory pandoc terminfo
+       ];
        jailbreak = true;
        homepage = "https://github.com/dorafmon/mdcat";
        description = "Markdown viewer in your terminal";
@@ -88304,7 +90555,7 @@ self: {
        sha256 = "13i4lb74m69k6ij3rq0dqwghdazwmc60fs55prc1h3p7b0rz15mv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        description = "Command-line tool to run a command on each of the items";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88315,8 +90566,8 @@ self: {
        pname = "mecab";
        version = "0.4.0";
        sha256 = "0z650y4fnxr4mk0i5s8axjbq14dcpgnrzkafbpg17vfhl2v5a3z3";
-       buildDepends = [ base bytestring text ];
-       extraLibraries = [ mecab ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ mecab ];
        jailbreak = true;
        homepage = "http://github.com/tanakh/hsmecab";
        description = "A Haskell binding to MeCab";
@@ -88332,7 +90583,7 @@ self: {
        sha256 = "0y3rzif667kjaxmnf9d382lcbxf27y4ik02kisij125kc7yi6d21";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://tomahawkins.org";
        description = "A constructive solid geometry (CSG) modeling language";
        license = stdenv.lib.licenses.bsd3;
@@ -88348,7 +90599,10 @@ self: {
        sha256 = "1wfrhii7zqrw6rmskab40h9zliidi34kd4n07rdkvf8f8nypwg1r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HTTP mime network pretty utf8-string xml ];
+       libraryHaskellDepends = [ base HTTP mime network utf8-string xml ];
+       executableHaskellDepends = [
+         base HTTP mime network pretty utf8-string xml
+       ];
        description = "Interfacing with the MediaWiki API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88367,7 +90621,7 @@ self: {
        sha256 = "0q708hh5280k5hknf1mh3nza7qvpszplcis90y0i78a2jd0x2r3w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base blaze-html bytestring containers directory
          directory-tree file-embed filepath happstack-server
          highlighting-kate HTTP http-conduit hxt hxt-http mtl network parsec
@@ -88389,8 +90643,10 @@ self: {
        pname = "meep";
        version = "0.1.2.0";
        sha256 = "1jr3zgja3m40ajygi1jqsxfwhsf7yf0lwblffd8z096w67pn4idr";
-       buildDepends = [ base bifunctors lens semigroupoids semigroups ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bifunctors lens semigroupoids semigroups
+       ];
+       testHaskellDepends = [
          base bifunctors doctest hspec hspec-expectations-lens lens
          QuickCheck semigroupoids semigroups
        ];
@@ -88409,7 +90665,7 @@ self: {
        sha256 = "0x85l77q9zzi1gmcl9h3rrjbgyfynxqcczl636iah88wvdg7lplg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring conduit containers directory http-conduit
          http-types network shelly system-fileio system-filepath tar text
          transformers zlib-conduit
@@ -88426,7 +90682,7 @@ self: {
        pname = "meldable-heap";
        version = "2.0.3";
        sha256 = "1p75zjlls38sd1lma7w95mpmb9kdff19s2as6pz1ki1g20nnxdk3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/priority-queues/";
        description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues";
        license = stdenv.lib.licenses.bsd3;
@@ -88442,10 +90698,11 @@ self: {
        sha256 = "1sbwd1xmgh94ll3xm7ancjsaalk2mphnr1l331zix5s3kqvy6g6p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers either lens mtl parsec ParsecTools
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base containers HUnit mtl test-framework test-framework-hunit
        ];
        jailbreak = true;
@@ -88461,14 +90718,14 @@ self: {
      mkDerivation {
        pname = "memcache";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1x2lw802m02p9z28rsmvwczsax9f6vl16p9kwjq4zmn8ak0s74m5";
+       revision = "1";
        editedCabalFile = "6e2508fa18aae99fee1c0aa41cc86e97d73ff504647b5265e54adf3566ca81e7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder bytestring hashable network resource-pool
          time vector vector-algorithms
        ];
-       testDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/dterei/memcache-hs";
        description = "A memcached client library";
        license = stdenv.lib.licenses.bsd3;
@@ -88485,10 +90742,14 @@ self: {
        sha256 = "1y1jysshvwddr3rymbzr9s6bq4pg7rd0bkk7ip4xwa8kpzf8k3pj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring conduit conduit-extra
-         containers hashtables memcache-haskell monad-control mtl network
-         resourcet split stm transformers
+         memcache-haskell mtl network resourcet split
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra containers hashtables
+         memcache-haskell monad-control mtl network resourcet stm
+         transformers
        ];
        description = "Conduit library for memcache procotol";
        license = stdenv.lib.licenses.mit;
@@ -88506,11 +90767,14 @@ self: {
        sha256 = "0j3fn59nz4iynlmhv3hxbfqip0rjj94fkb3kx8jax90jbnf7s6sc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring conduit-extra containers hashable
-         hashtables mtl network resourcet split stm transformers
+       libraryHaskellDepends = [
+         attoparsec base bytestring hashable network split transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring conduit-extra containers hashtables mtl resourcet
+         stm transformers
+       ];
+       testHaskellDepends = [
          base bytestring HUnit network QuickCheck split test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
@@ -88524,7 +90788,7 @@ self: {
        pname = "memcached";
        version = "0.2.1";
        sha256 = "1a6wzznhpz06c0y3wrjf5bskdd8myild8v0p0x1h0swhmy6di2yd";
-       buildDepends = [ base bytestring network utf8-light ];
+       libraryHaskellDepends = [ base bytestring network utf8-light ];
        jailbreak = true;
        homepage = "http://github.com/olegkat/haskell-memcached";
        description = "haskell bindings for memcached";
@@ -88539,14 +90803,14 @@ self: {
      mkDerivation {
        pname = "memcached-binary";
        version = "0.2.0";
-       revision = "2";
        sha256 = "137vb065f744jq3avpraqryzspch78vc5krp0fw2zzcbk5cm92ad";
+       revision = "2";
        editedCabalFile = "663a104dc09413397f9640534b6d1a743835a395598f641d02ef0dbd44093530";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class network resource-pool
          storable-endian time unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring data-default-class hspec HUnit network process
        ];
        homepage = "https://github.com/philopon/memcached-binary";
@@ -88559,10 +90823,10 @@ self: {
      mkDerivation {
        pname = "memexml";
        version = "0.0.2";
-       revision = "1";
        sha256 = "07cmjx10wbpfcblnd23rzdkma04nyjcpd1g58gp0phajj6xj4i7a";
+       revision = "1";
        editedCabalFile = "a1712ea7643a27f1fb40a771fdae76282818b5d317fe8da6a22e705b06bc3b3e";
-       buildDepends = [ base hxt ];
+       libraryHaskellDepends = [ base hxt ];
        jailbreak = true;
        homepage = "https://github.com/eggzilla/memexml";
        description = "Library for reading Meme XML output";
@@ -88575,7 +90839,7 @@ self: {
        pname = "memo-ptr";
        version = "0.1.0.0";
        sha256 = "1vy3673dvf0crs384vhi56i7bir9k8yk3cjcrcc7bn15qyclif19";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Pointer equality memoization";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -88586,7 +90850,7 @@ self: {
        pname = "memo-sqlite";
        version = "0.1";
        sha256 = "1gijza29wj79k8czfg4mghq7nqsbpyf1scnm9hmg2ykhnllpzvy3";
-       buildDepends = [ base direct-sqlite ];
+       libraryHaskellDepends = [ base direct-sqlite ];
        jailbreak = true;
        homepage = "https://gitorious.org/memo-sqlite";
        description = "memoize functions using SQLite3 database";
@@ -88600,7 +90864,7 @@ self: {
        pname = "memoize";
        version = "0.7";
        sha256 = "1sqi9n9r2q3sh00isgj3rmayrlm970a2g9x389rlfb0kczixdnq4";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "A memoization library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88613,12 +90877,11 @@ self: {
        pname = "memory";
        version = "0.7";
        sha256 = "1yj1v4xr3y3inrn1rzlh1lfmgxi8p15k4qm48bac76qg3a2wh8z1";
-       buildDepends = [ base bytestring deepseq ghc-prim ];
-       testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abtraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memscript" = callPackage
@@ -88629,7 +90892,7 @@ self: {
        sha256 = "0vbmgvdjq4mxax39zr6anmb96pr2pgqlwmc4qbkrz2c7v8hg2mjb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base readline ];
+       executableHaskellDepends = [ base readline ];
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/memscript";
        description = "Command line utility for memorizing scriptures or any other text";
        license = "GPL";
@@ -88641,7 +90904,7 @@ self: {
        pname = "mersenne-random";
        version = "1.0.0.1";
        sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
-       buildDepends = [ base old-time ];
+       libraryHaskellDepends = [ base old-time ];
        homepage = "http://code.haskell.org/~dons/code/mersenne-random";
        description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
@@ -88653,7 +90916,7 @@ self: {
        pname = "mersenne-random-pure64";
        version = "0.2.0.4";
        sha256 = "0qh72ynfg1k4c70qxdzsa6f1x9wyxil2d9gi85c879wrc41k899h";
-       buildDepends = [ base old-time random ];
+       libraryHaskellDepends = [ base old-time random ];
        homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
@@ -88667,8 +90930,8 @@ self: {
        pname = "messagepack";
        version = "0.4.0";
        sha256 = "198rd9yy99zsgp48gmz3kxzljcpmbqh2gghzndn3q0n7cv0lls0i";
-       buildDepends = [ base bytestring cereal containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cereal containers ];
+       testHaskellDepends = [
          base bytestring cereal containers QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
@@ -88685,7 +90948,7 @@ self: {
        pname = "messagepack-rpc";
        version = "0.2.0.0";
        sha256 = "0lx0qyv41pylbz2580zvw4qw07pih4l9sbdd2h99gwkqjpjnc8x8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers messagepack network-simple
        ];
        homepage = "http://github.com/rodrigosetti/messagepack-rpc";
@@ -88699,7 +90962,9 @@ self: {
        pname = "messente";
        version = "0.1.0.1";
        sha256 = "1yv2dspkn34yf61z8c09aijngjr96w30s2sjmhyv9c2c48ys6jc5";
-       buildDepends = [ base bytestring HTTP http-conduit network ];
+       libraryHaskellDepends = [
+         base bytestring HTTP http-conduit network
+       ];
        homepage = "http://github.com/kaiko/messente-haskell";
        description = "Messente SMS Gateway";
        license = stdenv.lib.licenses.mit;
@@ -88711,7 +90976,7 @@ self: {
        pname = "meta-misc";
        version = "0.1.0.3";
        sha256 = "0pxsg67r2z0f9zxr8m98sndlii0bixyxwgjkc31z5743ciw9ch0c";
-       buildDepends = [ base loch-th template-haskell ];
+       libraryHaskellDepends = [ base loch-th template-haskell ];
        homepage = "https://github.com/bairyn/meta-misc";
        description = "Utility library providing miscellaneous meta-programming utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -88725,7 +90990,7 @@ self: {
        pname = "meta-par";
        version = "0.3";
        sha256 = "012blwbwxac2wikiydvjsa4b7f866wws3g33bczv8dzcx3123ljn";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque abstract-par base bytestring containers deepseq mtl
          mwc-random transformers vector
        ];
@@ -88743,7 +91008,7 @@ self: {
        pname = "meta-par-accelerate";
        version = "0.3.5";
        sha256 = "0gl6bh2jqf697vl4cg88z39g6180bbha01h67qz46f1vcyvi0lwq";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque abstract-par abstract-par-accelerate accelerate
          array base meta-par QuickCheck transformers vector
        ];
@@ -88759,7 +91024,7 @@ self: {
        pname = "metadata";
        version = "0.2.0.0";
        sha256 = "148c7vgh8zxgy5fb0xflk0lzm5d233d1ynjncpiwi1bb9jzbdm3r";
-       buildDepends = [ base text time ];
+       libraryHaskellDepends = [ base text time ];
        jailbreak = true;
        homepage = "http://github.com/cutsea110/metadata";
        description = "metadata library for semantic web";
@@ -88772,7 +91037,7 @@ self: {
        pname = "metamorphic";
        version = "0.1.2.3";
        sha256 = "0pazw2kdsl8g4dax6bg0hfg7vp2nna6lrsnzdkixpins7ac95078";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/technogeeky/metamorphic";
        description = "metamorphisms: ana . cata or understanding folds and unfolds";
        license = "unknown";
@@ -88784,7 +91049,7 @@ self: {
        pname = "metaplug";
        version = "0.1.1";
        sha256 = "086n9kqyi2jqki31jgylm0r63ahgvw3pf7mi5hln2m86a5x4ij4n";
-       buildDepends = [ base Cabal filepath ghc haskell98 ];
+       libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88798,8 +91063,10 @@ self: {
        pname = "metric";
        version = "0.2.0";
        sha256 = "172drfn8p5yqyvka2jphhi1lfj5msv2xssa271lfb3w757br452d";
-       buildDepends = [ base data-default edit-distance hmatrix vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base data-default edit-distance hmatrix vector
+       ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        description = "Metric spaces";
@@ -88816,17 +91083,16 @@ self: {
        pname = "metrics";
        version = "0.3.0.2";
        sha256 = "00iwairgi9lvb4f8iz4d834v8vq1f4awr34nl72fbkqgccdq1whd";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring containers lens mtl mwc-random
          primitive text time unix unordered-containers vector
          vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base lens mwc-random primitive QuickCheck unix
        ];
        description = "High-performance application metric tracking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metricsd-client" = callPackage
@@ -88835,7 +91101,7 @@ self: {
        pname = "metricsd-client";
        version = "0.1";
        sha256 = "1q807wvmj1q605257jj60h0j2wal6ypjiad9wkjmv836p3mis5q9";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        jailbreak = true;
        description = "Client for the metrics aggregator Metricsd";
        license = stdenv.lib.licenses.bsd3;
@@ -88847,7 +91113,9 @@ self: {
        pname = "metronome";
        version = "0.1";
        sha256 = "0gx0g8s5w99mhvip1v1kj03dhij3fhig1b8myha0zdssf2x6vjwc";
-       buildDepends = [ base data-lens data-lens-template hosc stm ];
+       libraryHaskellDepends = [
+         base data-lens data-lens-template hosc stm
+       ];
        description = "Time Synchronized execution";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88861,8 +91129,8 @@ self: {
        pname = "mfsolve";
        version = "0.1.0";
        sha256 = "1lvx3nlxhfmvh9xbi62hik8ypv4n28ax86nqzwkchb60k1djnagg";
-       buildDepends = [ base hashable unordered-containers ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base hashable unordered-containers ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Equation solver and calculator à la metafont";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88873,7 +91141,9 @@ self: {
        pname = "mgeneric";
        version = "0.0.0.2";
        sha256 = "1pgmgssysl0nv9z4vvlmxjijl6y7jvy1b7ph30jnj3fmcrwdf6w3";
-       buildDepends = [ base containers lens mtl template-haskell ];
+       libraryHaskellDepends = [
+         base containers lens mtl template-haskell
+       ];
        homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/";
        description = "Generics with multiple parameters";
        license = stdenv.lib.licenses.mit;
@@ -88887,7 +91157,7 @@ self: {
        pname = "mi";
        version = "0.0.1";
        sha256 = "03virg707xxy330xq4g60fy1rvs1rq9w5p08yc5khzh64v1g3i2b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta parsec split template-haskell
        ];
        jailbreak = true;
@@ -88902,7 +91172,7 @@ self: {
        pname = "microbench";
        version = "0.1";
        sha256 = "05yphn77rxg7zqpn27292yvmah2634hqfx2mgfyp5yws5ickrvkg";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "http://neugierig.org/software/darcs/browse/?r=microbench;a=summary";
        description = "Microbenchmark Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -88921,19 +91191,22 @@ self: {
        sha256 = "0n4clyzaw2a9vi0qcf6f2pdp7wckl3z84sfjqdj8k4dbp1qnwl55";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-html blaze-markup containers data-default either
-         html-conduit microformats2-types network options pcre-heavy safe
-         scotty streaming-commons stringable text time wai-extra warp
-         xml-lens xss-sanitize
+       libraryHaskellDepends = [
+         base blaze-markup containers data-default either html-conduit
+         microformats2-types pcre-heavy safe text time xml-lens xss-sanitize
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base blaze-html blaze-markup microformats2-types network 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
        ];
        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
@@ -88944,7 +91217,7 @@ self: {
        pname = "microformats2-types";
        version = "0.4.1";
        sha256 = "1p2s2g78bnqbcf0www0x11pz5nyxjfac7q7sbd2qfn1v777ylv7b";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default-class pandoc-types setters text time
        ];
        homepage = "https://github.com/myfreeweb/microformats2-types";
@@ -88958,7 +91231,7 @@ self: {
        pname = "microlens";
        version = "0.1.3.0";
        sha256 = "1ryjxc3qa583ryp9sig3rjjr3dpv9sx2ybag4qrlkwja1dz8r2dm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
        license = stdenv.lib.licenses.bsd3;
@@ -88970,7 +91243,7 @@ self: {
        pname = "microlens-each";
        version = "0.1.0.0";
        sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
-       buildDepends = [ base microlens ];
+       libraryHaskellDepends = [ base microlens ];
        homepage = "http://github.com/aelve/microlens";
        description = "'each' for microlens";
        license = stdenv.lib.licenses.bsd3;
@@ -88984,7 +91257,7 @@ self: {
        pname = "microlens-mtl";
        version = "0.1.2.0";
        sha256 = "1jvw9pspnr24rh7bvl6q7hv7x0g6vwy2a5xl19pxf36rl8wlfm9v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
        homepage = "http://github.com/aelve/microlens";
@@ -88998,7 +91271,9 @@ self: {
        pname = "microlens-th";
        version = "0.2.0.0";
        sha256 = "048q6ridxvg7zi272q01k6ds0f411kg27p5whgj63qgg3k9w72sp";
-       buildDepends = [ base containers microlens template-haskell ];
+       libraryHaskellDepends = [
+         base containers microlens template-haskell
+       ];
        homepage = "http://github.com/aelve/microlens";
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
@@ -89010,7 +91285,7 @@ self: {
        pname = "microtimer";
        version = "0.0.1.2";
        sha256 = "09w8jn6g8fq3zsp2ahdrzv33mvayh8vladmc2wf8pbmpmdii0kap";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "http://thoughtpolice.github.com/hs-microtimer";
        description = "A tiny library for benchmarking IO actions";
        license = stdenv.lib.licenses.bsd3;
@@ -89028,12 +91303,16 @@ self: {
        sha256 = "0x71qih8r48kp2anvdnwfkja3sz8iigzprsqkaqi259mn58qd9ch";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers HCodecs mersenne-random-pure64 mtl parsec text
+         transformers
+       ];
+       executableHaskellDepends = [
          base containers directory filepath haskeline HCodecs
          mersenne-random-pure64 mtl optparse-applicative parsec process text
          text-format transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HCodecs mersenne-random-pure64 mtl parsec
          QuickCheck test-framework test-framework-quickcheck2 text
          transformers
@@ -89053,12 +91332,12 @@ self: {
        pname = "midi";
        version = "0.2.1.5";
        sha256 = "0vi9pslbix7wcbciv3nlk1v6v6f45xf1lq85nl8awhs488fhbl3z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring event-list explicit-exception
          monoid-transformer non-negative QuickCheck random transformers
          utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring event-list explicit-exception non-negative
          QuickCheck transformers utility-ht
        ];
@@ -89073,7 +91352,9 @@ self: {
        pname = "midi-alsa";
        version = "0.2.1";
        sha256 = "13dc299d252nrll1vzp7pl1ncv0qw3xhz5b3kqnc8hb0g4mkkgpc";
-       buildDepends = [ alsa-seq base data-accessor midi utility-ht ];
+       libraryHaskellDepends = [
+         alsa-seq base data-accessor midi utility-ht
+       ];
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
@@ -89090,7 +91371,7 @@ self: {
        sha256 = "0hnlnjgn378mkrhky8fvpzs6i34s3n6lx81mf3hnxmb1vgwy2nmf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers diagrams-lib diagrams-postscript event-list midi
          non-empty optparse-applicative utility-ht
        ];
@@ -89105,10 +91386,12 @@ self: {
      mkDerivation {
        pname = "midi-util";
        version = "0.1.1.1";
-       revision = "1";
        sha256 = "1g8rhx1n6rhyi49x6rkim1bnv7rg6wc0x89dzkrbzyxm28hkvjfk";
+       revision = "1";
        editedCabalFile = "2c42b8e0940125f6354a9174ad5cb19da6fc0122b4947576e28abb753a7cff14";
-       buildDepends = [ base containers event-list midi non-negative ];
+       libraryHaskellDepends = [
+         base containers event-list midi non-negative
+       ];
        homepage = "http://github.com/mtolly/midi-util";
        description = "Utility functions for processing MIDI files";
        license = "GPL";
@@ -89124,7 +91407,7 @@ self: {
        sha256 = "13bfb2s6ybvspmmq427v55nb2csvcp4ijfgm9fvfh6cab2pm1dyz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          alsa-core alsa-seq base containers random transformers wx wxcore
        ];
        jailbreak = true;
@@ -89143,7 +91426,9 @@ self: {
        sha256 = "0i1g1hqr1jjjnrrkfgp0i9zm5cm6aza1kzqy2z8hmbqjdvyv21fz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ alsa-core alsa-seq base containers gtk mtl stm ];
+       executableHaskellDepends = [
+         alsa-core alsa-seq base containers gtk mtl stm
+       ];
        jailbreak = true;
        description = "A control midi surface";
        license = stdenv.lib.licenses.bsd3;
@@ -89161,7 +91446,7 @@ self: {
        sha256 = "0xl6x4755x8sz2igqfp3mr5n29q7hb4v5b1mycah9vffk1bhi0yf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring c10k directory filepath haskell98 hdaemonize
          hslogger network parsec time unix webserver
        ];
@@ -89185,14 +91470,18 @@ self: {
        sha256 = "0gxdf9xkw1w4cdb8cdq1slj5x1ch39kxrqhnaxdkb8w4jdxqbj5p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array async auto-update base blaze-builder byteorder bytestring
-         case-insensitive conduit conduit-extra directory filepath
-         http-client http-date http-types io-choice network old-locale
-         parsec resourcet streaming-commons time transformers unix unix-time
-         unordered-containers wai wai-app-file-cgi wai-logger warp
+         case-insensitive conduit conduit-extra directory filepath http-date
+         http-types io-choice network parsec resourcet streaming-commons
+         unix unix-time unordered-containers wai wai-app-file-cgi warp
        ];
-       testDepends = [ base hspec http-client ];
+       executableHaskellDepends = [
+         base bytestring conduit-extra directory filepath http-client
+         http-date http-types network old-locale streaming-commons time
+         transformers unix wai wai-app-file-cgi wai-logger warp
+       ];
+       testHaskellDepends = [ base hspec http-client ];
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "High performance web server on WAI/warp";
        license = stdenv.lib.licenses.bsd3;
@@ -89204,7 +91493,7 @@ self: {
        pname = "mikmod";
        version = "0.2.0.0";
        sha256 = "0wr671a7r20ysnry92qimdsdnf5gijbxzv382mb7w8fav88v5kvv";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/evanrinehart/mikmod";
        description = "MikMod bindings";
@@ -89219,14 +91508,13 @@ self: {
        pname = "miku";
        version = "2014.11.17";
        sha256 = "1zfvi7v05cdp94cdrwxxhwkzqyliaakl16klk9zb0byvsg32ns3n";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-th base bytestring containers data-default hack2
          hack2-contrib mtl
        ];
        homepage = "https://github.com/nfjinjing/miku";
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "milena" = callPackage
@@ -89238,11 +91526,11 @@ self: {
        pname = "milena";
        version = "0.2.0.0";
        sha256 = "08nfjd1jn9cniksj8zrifaz3fjgnhzgydlswbz2h4lqv9kyqvvrm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers digest either lens mtl network
          random resource-pool transformers
        ];
-       testDepends = [ base bytestring hspec network QuickCheck ];
+       testHaskellDepends = [ base bytestring hspec network QuickCheck ];
        jailbreak = true;
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -89255,7 +91543,7 @@ self: {
        pname = "mime";
        version = "0.4.0.2";
        sha256 = "0x9qx8adradc5irfwfn4xs4j9pd228j1b3lpngap2qxabhz2iyp7";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/GaloisInc/mime";
        description = "Working with MIME types";
        license = stdenv.lib.licenses.bsd3;
@@ -89269,7 +91557,7 @@ self: {
        pname = "mime-directory";
        version = "0.5.1";
        sha256 = "1f54rbznv52m4h72yazr397k1d9jyb1i524pfl3d494swvn9b05r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-string bytestring containers old-locale regex-pcre time
        ];
        homepage = "http://code.haskell.org/~mboes/mime-directory.git";
@@ -89286,11 +91574,11 @@ self: {
        pname = "mime-mail";
        version = "0.4.9";
        sha256 = "1l638jr7914227mg8854i6xgyhq403kb1zc2py77yb0xifm20534";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
        ];
-       testDepends = [ base blaze-builder bytestring hspec text ];
+       testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        homepage = "http://github.com/snoyberg/mime-mail";
        description = "Compose MIME email messages";
        license = stdenv.lib.licenses.mit;
@@ -89306,7 +91594,7 @@ self: {
        pname = "mime-mail-ses";
        version = "0.3.2.2";
        sha256 = "1dzlfrpqw3bdqkwgp5i52azkp8lv2cgvrdvl1w39q484ra4by2y1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring conduit cryptohash
          http-client http-conduit http-types mime-mail old-locale text time
          transformers xml-conduit xml-types
@@ -89324,7 +91612,7 @@ self: {
        pname = "mime-string";
        version = "0.4";
        sha256 = "0v028cgqll918zdaa95myazlg7dnvb2cvvvm1iyyqw81grza3r61";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-string bytestring iconv mtl network old-time
        ];
        description = "MIME implementation for String's";
@@ -89338,7 +91626,7 @@ self: {
        pname = "mime-types";
        version = "0.1.0.6";
        sha256 = "090z3dp928243amnc6s8g10rk2h2bprk9y138q6wj3cpflzr72pw";
-       buildDepends = [ base bytestring containers text ];
+       libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/yesodweb/wai";
        description = "Basic mime-type handling types and functions";
        license = stdenv.lib.licenses.mit;
@@ -89352,7 +91640,7 @@ self: {
        sha256 = "16s98hwskycl2bqv1n2bnivh8w8q3xhhj687hk8flcg9s9ny4s8k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory mtl random ];
+       executableHaskellDepends = [ base directory mtl random ];
        homepage = "http://finder.homelinux.org/haskell/Mines";
        description = "Minesweeper simulation using neural networks";
        license = "unknown";
@@ -89368,7 +91656,7 @@ self: {
        sha256 = "1cbw136wl9rdcl4vbbz9i5w1mw33qhr0gzbww0qf63zfz2lg4gs2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary binary-generic bytestring cairo containers directory
          filepath glade gtk random time
        ];
@@ -89384,7 +91672,7 @@ self: {
        pname = "miniball";
        version = "0.1.0.2";
        sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://nonempty.org/software/haskell-miniball";
        description = "Bindings to Miniball, a smallest enclosing ball library";
        license = stdenv.lib.licenses.gpl3;
@@ -89401,9 +91689,12 @@ self: {
        sha256 = "1f2scxg7j6zifqj6q2khxb8s49ilnk4r9qms72vysp1s5p76zk0g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers lens MonadRandom mtl mtl-compat parsec
-         parsec3-numbers readline
+         parsec3-numbers
+       ];
+       executableHaskellDepends = [
+         base containers lens mtl parsec readline
        ];
        jailbreak = true;
        description = "Miniature FORTH-like interpreter";
@@ -89416,10 +91707,12 @@ self: {
      mkDerivation {
        pname = "minimal-configuration";
        version = "0.1.1";
-       revision = "1";
        sha256 = "06r710l30kf5aaz2k446z9fhc6zshdsssp1zwri0572r1jryzd43";
+       revision = "1";
        editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80";
-       buildDepends = [ base containers directory filepath tconfig ];
+       libraryHaskellDepends = [
+         base containers directory filepath tconfig
+       ];
        jailbreak = true;
        description = "Minimal ini like configuration library with a few extras";
        license = stdenv.lib.licenses.bsd3;
@@ -89433,8 +91726,8 @@ self: {
        pname = "minimorph";
        version = "0.1.6.0";
        sha256 = "17ds0bjpyz7ngsq7nnlqix6yjfr6clr7xkwgpg4fysii7qvymbkz";
-       buildDepends = [ base text ];
-       testDepends = [
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit text
        ];
        homepage = "https://github.com/Mikolaj/minimorph";
@@ -89450,7 +91743,7 @@ self: {
        sha256 = "0i825bd751adfj22lkgc929jlgxjj16i81k8qqkhqh7ib131kqlf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT haskell98 unix ];
+       executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89464,7 +91757,9 @@ self: {
        sha256 = "1r7c07pa9lr7h32y1mgxrlrj6a4sf8kfwc7vvvrr6bjfwr3m54vl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base MissingH process time ];
+       executableHaskellDepends = [
+         ansi-terminal base MissingH process time
+       ];
        jailbreak = true;
        homepage = "http://github.com/jhickner/minions";
        description = "A fast parallel ssh tool";
@@ -89479,7 +91774,7 @@ self: {
        pname = "minioperational";
        version = "0.4.9";
        sha256 = "0kbfk3gpgzxi84kyjf7awdc2x579339zd7c42khlflhk6y88j95m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers elevator extensible mtl template-haskell
          transformers
        ];
@@ -89498,7 +91793,9 @@ self: {
        sha256 = "15rsg617wmh8cb0f2pkd5hyzrj96qjvar4p6nx21vlxr3b2plcg4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base colock directory mtl network stm unix ];
+       libraryHaskellDepends = [
+         base colock directory mtl network stm unix
+       ];
        jailbreak = true;
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
@@ -89516,7 +91813,7 @@ self: {
        sha256 = "15hgag1r0w6smilab7059z7bsn9i1czhdknma53rmj1ma2pd148y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base data-accessor data-accessor-template directory filepath mtl
          old-locale old-time process safe split template-haskell
        ];
@@ -89533,7 +91830,7 @@ self: {
        pname = "minisat";
        version = "0.1.2";
        sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd";
-       buildDepends = [ async base ];
+       libraryHaskellDepends = [ async base ];
        description = "A Haskell bundle of the Minisat SAT solver";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89548,7 +91845,7 @@ self: {
        sha256 = "05ddhr50pbqy0yjgcw0wgfjxlkgapg0zppqqyxfy5apr68zd02mm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath monads-tf parsec pretty
          transformers xhtml
        ];
@@ -89566,8 +91863,10 @@ self: {
        pname = "miniutter";
        version = "0.4.4.2";
        sha256 = "1nr08cm6qrww01sqxvr4bmkhxxihcl9sm8077gl25alj1s3gq21s";
-       buildDepends = [ base binary containers ghc-prim minimorph text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary containers ghc-prim minimorph text
+       ];
+       testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit text
        ];
        homepage = "https://github.com/Mikolaj/miniutter";
@@ -89582,8 +91881,8 @@ self: {
        pname = "minst-idx";
        version = "0.1.2.2";
        sha256 = "06ixg6bm55h1mjym3qp667gddy7f32inaxgyfbrh918zl283briv";
-       buildDepends = [ base binary bytestring vector ];
-       testDepends = [ base binary directory hspec vector ];
+       libraryHaskellDepends = [ base binary bytestring vector ];
+       testHaskellDepends = [ base binary directory hspec vector ];
        homepage = "https://github.com/kryoxide/minst-idx/";
        description = "Read and write IDX data that is used in e.g. the MINST database.";
        license = stdenv.lib.licenses.gpl3;
@@ -89599,7 +91898,7 @@ self: {
        sha256 = "07dz0c65xkb7kgr2rby7m3g5893rqsbyl2nmjhf4q2wqsypmiipa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          authenticate-oauth base bytestring conduit lens monad-logger text
          transformers twitter-conduit
        ];
@@ -89621,14 +91920,14 @@ self: {
        sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cereal directory filepath knob monad-loops
-         random-fu regex-base regex-pcre semigroups text utf8-string vector
+       libraryHaskellDepends = [
+         base bytestring cereal directory filepath knob random-fu semigroups
+         text utf8-string vector
        ];
+       executableHaskellDepends = [ monad-loops regex-base regex-pcre ];
        homepage = "https://github.com/mokus0/misfortune";
        description = "fortune-mod clone";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "missing-foreign" = callPackage
@@ -89637,7 +91936,7 @@ self: {
        pname = "missing-foreign";
        version = "0.1.1";
        sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Convenience functions for FFI work";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89648,8 +91947,10 @@ self: {
        pname = "missing-py2";
        version = "1.0.1";
        sha256 = "0daa310acml90r4f4qdjf3qns70gvx08mpjzw2h3v46vrwlacrmj";
-       buildDepends = [ anydbm base MissingH ];
-       testDepends = [ anydbm base Cabal directory HUnit MissingH ];
+       libraryHaskellDepends = [ anydbm base MissingH ];
+       testHaskellDepends = [
+         anydbm base Cabal directory HUnit MissingH
+       ];
        homepage = "https://github.com/domdere/missing-py2";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.gpl2;
@@ -89662,7 +91963,7 @@ self: {
        pname = "mix-arrows";
        version = "1.2";
        sha256 = "0m70l09bmr8b95d87rpz4vdircdar2rsvnamr2g07542wx024931";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89676,7 +91977,10 @@ self: {
        sha256 = "0vsldq2j2avj98fcz2lbydf4y23iwydr4jsvpbcvwlvqavgz1rkc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers simple-tabular ];
+       libraryHaskellDepends = [ array base containers simple-tabular ];
+       executableHaskellDepends = [
+         array base containers simple-tabular
+       ];
        jailbreak = true;
        homepage = "http://wiki.cs.pdx.edu/bartforge/oms";
        description = "Find optimal mixed strategies for two-player games";
@@ -89691,7 +91995,7 @@ self: {
        sha256 = "1qzfmf92sx5vq5jxrqhln1a6y8kayrip36izf5m8hryymxd4dard";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath haskell98 ];
+       executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89707,7 +92011,7 @@ self: {
        sha256 = "1cmawm49i01xxvzgf67cin6s9hihfc3ihr6s5hn2makasfxbnryc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory extensible-exceptions mtl old-locale old-time
          pcre-light pretty readline
        ];
@@ -89724,7 +92028,8 @@ self: {
        sha256 = "04d0drqyaz075y6fs3rj6c2sp8ns1x4rfxqf1dbm2b31q09ycnl1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty ];
+       libraryHaskellDepends = [ base mtl parsec pretty ];
+       executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89736,7 +92041,7 @@ self: {
        pname = "mlist";
        version = "0.0.2";
        sha256 = "06mwmahyp781wigjva12kz7w75vjkkprl8k1yiqd1yd0162vp31k";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://haskell.org/haskellwiki/mlist";
        description = "Monadic List alternative to lazy I/O";
        license = stdenv.lib.licenses.bsd3;
@@ -89751,7 +92056,7 @@ self: {
        sha256 = "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Memory mapped files for POSIX and Windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89762,7 +92067,7 @@ self: {
        pname = "mmorph";
        version = "1.0.4";
        sha256 = "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89773,7 +92078,7 @@ self: {
        pname = "mmtl";
        version = "0.1";
        sha256 = "0bb19l52s56y2dwyskvjwdal7387ii2dg9cc1l6f341y3695nj7l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89785,7 +92090,7 @@ self: {
        pname = "mmtl-base";
        version = "15321.1";
        sha256 = "13hdaxpb9zds3yc2l3pl60h26541yvswprdc43swn05hzf6p01nq";
-       buildDepends = [ base mmtl ];
+       libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89799,7 +92104,7 @@ self: {
        pname = "moan";
        version = "0.2.0.2";
        sha256 = "0fb0z3v4a8kblwx4xjs7xdkczpvcyz9la7071kz7q6cjl6w49i30";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dawg regex-tdfa regex-tdfa-text
          tagset-positional text zlib
        ];
@@ -89818,10 +92123,10 @@ self: {
        pname = "mockery";
        version = "0.3.0";
        sha256 = "1k9ywdamdl1c8nvp4yrjmqpbis1nqj9p9cim5rh72n9w5h3qaa6x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath logging-facade temporary
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath hspec logging-facade temporary
        ];
        description = "Support functions for automated testing";
@@ -89836,7 +92141,7 @@ self: {
        pname = "modbus-tcp";
        version = "0.1";
        sha256 = "1j0gkc6vrvydz0vcdm8bpiarl75zqh4k5z18s4903b6mqwpscslr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bytestring cereal network
        ];
        jailbreak = true;
@@ -89853,8 +92158,8 @@ self: {
        pname = "modelicaparser";
        version = "0.1.0.0";
        sha256 = "0ifsgdqi3376z7xspjlx62hh3dah3dskqrar3s63pmw1cf9b6qfl";
-       buildDepends = [ base containers parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
          ansi-terminal base containers filepath parsec QuickCheck
        ];
        jailbreak = true;
@@ -89873,7 +92178,10 @@ self: {
        sha256 = "0xm9vj78clawys9ascgm2fl8kqg5zmdfbkkb42d1d1h5z72cc55p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath haskell98 mtl utf8-string
+       ];
+       executableHaskellDepends = [
          base directory filepath haskell98 mtl utf8-string
        ];
        description = "Haskell source splitter driven by special comments";
@@ -89887,8 +92195,8 @@ self: {
        pname = "modular-arithmetic";
        version = "1.2.1.1";
        sha256 = "005pbkrszgkbm0qx9hzn1f72l9z07qhqypmcw72fi5i5hppr45av";
-       buildDepends = [ base ];
-       testDepends = [ base doctest Glob ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest Glob ];
        jailbreak = true;
        homepage = "https://github.com/TikhonJelvis/modular-arithmetic";
        description = "A type for integers modulo some constant";
@@ -89904,7 +92212,7 @@ self: {
        pname = "modular-prelude";
        version = "0.3.0.0";
        sha256 = "0hlmxm9xfnf55qz1nrljm0s4bhpa6x973h3qi2b7bl8pil423rkf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude bytestring containers data-default hashable
          system-filepath text transformers unordered-containers vector
        ];
@@ -89921,7 +92229,7 @@ self: {
        pname = "modular-prelude-classy";
        version = "0.1.0.0";
        sha256 = "1izinrgd9a6sm57isg8jgs4wjidczwqcxl6vg5h4gy5zz9dg8xnx";
-       buildDepends = [ base classy-prelude modular-prelude ];
+       libraryHaskellDepends = [ base classy-prelude modular-prelude ];
        jailbreak = true;
        homepage = "https://github.com/DanBurton/modular-prelude#readme";
        description = "Reifying ClassyPrelude a la ModularPrelude";
@@ -89942,13 +92250,16 @@ self: {
        sha256 = "1lj2jhlpn1ywq60q4ph9fbmjn6rjd8wqkj2lrdgscagcvryh9ad2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         applicative-extras base bytestring Cabal cmdargs containers
-         data-default directory filepath haskeline haskell-src-exts HUnit
-         lens lifted-base monad-control mtl pretty process pureMD5 set-extra
-         syb system-fileio temporary transformers-base
+       libraryHaskellDepends = [
+         applicative-extras base bytestring Cabal containers data-default
+         directory filepath haskell-src-exts HUnit lifted-base monad-control
+         mtl pretty process pureMD5 set-extra syb system-fileio temporary
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base Cabal cmdargs containers directory haskeline lens
+         monad-control mtl set-extra transformers-base
+       ];
+       testHaskellDepends = [
          base containers filepath haskell-src-exts HUnit process
        ];
        homepage = "https://github.com/seereason/module-management";
@@ -89965,7 +92276,7 @@ self: {
        pname = "modulespection";
        version = "0.1.2.2";
        sha256 = "00172s9v4823q4f8mvln2v3m7zcri8vp2b7b8j1ank0sb9lbyjlf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions filepath ghc ghc-paths template-haskell temporary
          transformers
        ];
@@ -89986,7 +92297,7 @@ self: {
        sha256 = "1dxvfd8f7zx43zm9h5dd71ci768khhmh8660h3abazqhm7ws367c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          atto-lisp base data-default directory haskell-src language-c mtl
          nats pandoc-types parsec prettify process semigroups text
        ];
@@ -90003,7 +92314,9 @@ self: {
        pname = "moe";
        version = "2015.5.4";
        sha256 = "0yiyr8n0bw5wcc8jyrah2kf9jnj3x4h5kl3qprysx8ffhc6dx3r9";
-       buildDepends = [ air base bytestring data-default dlist mtl text ];
+       libraryHaskellDepends = [
+         air base bytestring data-default dlist mtl text
+       ];
        homepage = "https://github.com/nfjinjing/moe";
        description = "html with style";
        license = stdenv.lib.licenses.bsd3;
@@ -90021,7 +92334,7 @@ self: {
        sha256 = "1f09sf41kbza3mci2yps0b38xi2j5gakjqx9hmi7lfzga4dkqgg0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base binary bytestring containers cryptohash
          hslogger HsOpenSSL lens mtl network optparse-applicative random
          safe text transformers unix unordered-containers
@@ -90043,7 +92356,7 @@ self: {
        sha256 = "1na585nc16s3giq88kr5i8wlqc03i29blqsgqp40da6dyqiihqwf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor directory
          explicit-exception filepath html HTTP network old-locale old-time
          parsec process transformers unix utility-ht
@@ -90063,7 +92376,7 @@ self: {
        pname = "monad-abort-fd";
        version = "0.4";
        sha256 = "01ny9pq66cma3wai48mhzijk465h7ssrj253npyy2myxnj0y93zr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default monad-control mtl transformers transformers-abort
          transformers-base
        ];
@@ -90079,7 +92392,7 @@ self: {
        pname = "monad-atom";
        version = "0.4.1";
        sha256 = "16dnp6wz0s56gm58k6m5cv5c47hb2vz1m4a3pqvrg3j97y344c3q";
-       buildDepends = [ base containers ghc-prim mtl ];
+       libraryHaskellDepends = [ base containers ghc-prim mtl ];
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
@@ -90092,7 +92405,7 @@ self: {
        pname = "monad-atom-simple";
        version = "0.0.2";
        sha256 = "1k4rcrdjjs52p9mnsbwp0gmb2inivhcqw044l56dbc080yxrk32j";
-       buildDepends = [ base containers ghc-prim mtl ];
+       libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90104,7 +92417,7 @@ self: {
        pname = "monad-bool";
        version = "0.2.0";
        sha256 = "1f3n2wbd3lbsp2snsf9x4h09apw62hayhzjibakp6mqw6174444h";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "This package has been removed";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90119,11 +92432,11 @@ self: {
        pname = "monad-classes";
        version = "0.3.1.1";
        sha256 = "1n0ry7lq0vh9siaqxfdfavg67a99zmws5nvr1hjq8k212v36v40c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim mmorph monad-control peano reflection transformers
          transformers-base transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit data-lens-light ghc-prim mmorph tasty tasty-hunit
          transformers
        ];
@@ -90138,7 +92451,7 @@ self: {
        pname = "monad-codec";
        version = "0.2.0";
        sha256 = "0jim6hk891jby2gch6f1k4262jm8fl9jgl808dj204ylz8w1475l";
-       buildDepends = [ base binary containers data-lens mtl ];
+       libraryHaskellDepends = [ base binary containers data-lens mtl ];
        homepage = "https://github.com/kawu/monad-codec";
        description = "Monadic conversion between complex data structures and unique integers";
        license = stdenv.lib.licenses.bsd3;
@@ -90152,7 +92465,7 @@ self: {
        pname = "monad-control";
        version = "1.0.0.4";
        sha256 = "07pn1p4m80wdd7gw62s4yny8rbvm60ka1q8qx5y1plznd8sbg179";
-       buildDepends = [
+       libraryHaskellDepends = [
          base stm transformers transformers-base transformers-compat
        ];
        homepage = "https://github.com/basvandijk/monad-control";
@@ -90168,7 +92481,7 @@ self: {
        pname = "monad-coroutine";
        version = "0.9.0.1";
        sha256 = "10b98w0xr7hbnawfz93qqkbcpvklgkpljxmv9drr40bd9bv33wij";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-parallel transformers transformers-compat
        ];
        homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
@@ -90184,7 +92497,7 @@ self: {
        pname = "monad-exception";
        version = "0.1";
        sha256 = "1mh19mxi6mlkvd083vjjdmdimdnk6n5yaj7v7xxgqycl5sazqkh8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control mtl-evil-instances transformers
          transformers-base
        ];
@@ -90202,7 +92515,7 @@ self: {
        pname = "monad-extras";
        version = "0.5.11";
        sha256 = "0rq44dk1fvfqkhng2yczyyz7jh6d6m0kjy58k02ady28f7j2r5vn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mmorph monad-control stm transformers transformers-base
        ];
        homepage = "http://github.com/jwiegley/monad-extras";
@@ -90216,7 +92529,7 @@ self: {
        pname = "monad-fork";
        version = "0.1";
        sha256 = "15xwavq4yc3xfif4isjh9m0q9h1bh7pmv2i3rh99sndmd34cdpwc";
-       buildDepends = [ base monad-control ];
+       libraryHaskellDepends = [ base monad-control ];
        jailbreak = true;
        description = "Type class for monads which support a fork operation";
        license = stdenv.lib.licenses.publicDomain;
@@ -90228,7 +92541,7 @@ self: {
        pname = "monad-gen";
        version = "0.3.0.1";
        sha256 = "0rc4r6sg29sjgh9xsk7q80h0lixhyxs60bszj5dnn8yf7w18b15y";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        description = "A simple monad for generating fresh integers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -90239,7 +92552,7 @@ self: {
        pname = "monad-interleave";
        version = "0.1";
        sha256 = "09hpl7ah5ivsrx4xlk96d129n1j4wpx7kj6l95zwadyaz7rj9fp7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/patperry/monad-interleave";
        description = "Monads with an unsaveInterleaveIO-like operation";
        license = stdenv.lib.licenses.bsd3;
@@ -90254,7 +92567,7 @@ self: {
        pname = "monad-journal";
        version = "0.7.1";
        sha256 = "1bfj9yy7hkixii31fbxdydjwx9ln6snm40w6l5vph2skcrms9bvr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base either monad-control mtl transformers transformers-base
        ];
        homepage = "http://github.com/phaazon/monad-journal";
@@ -90270,7 +92583,7 @@ self: {
        pname = "monad-levels";
        version = "0.1.0.1";
        sha256 = "1v3i12h4c788yz93a2c9nxcczrhz8nwpq0057q7b1nad74g70lan";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints transformers transformers-compat
        ];
        jailbreak = true;
@@ -90291,7 +92604,7 @@ self: {
        pname = "monad-logger";
        version = "0.3.13.2";
        sha256 = "1cp2npa5mzn3yss1di151ikw7hx4slc99cvx8gipdwp1696kqf61";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring conduit conduit-extra exceptions
          fast-logger lifted-base monad-control monad-loops mtl resourcet stm
          stm-chans template-haskell text transformers transformers-base
@@ -90309,7 +92622,9 @@ self: {
        pname = "monad-logger-json";
        version = "0.1.0.0";
        sha256 = "1ap98487lwgvgrrxkjskga86ckbv6rhn2n6pzp403343xx51r1qh";
-       buildDepends = [ aeson base monad-logger template-haskell text ];
+       libraryHaskellDepends = [
+         aeson base monad-logger template-haskell text
+       ];
        homepage = "http://github.com/fpco/monad-logger-json";
        description = "JSON-friendly Logging APIs";
        license = stdenv.lib.licenses.mit;
@@ -90323,7 +92638,7 @@ self: {
        pname = "monad-logger-syslog";
        version = "0.1.1.1";
        sha256 = "0hdm495knrdrl76xlsdp0sk6n0v6qnl9b6r6x9ac6s1p7j1w66vf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring fast-logger hsyslog monad-logger text transformers
        ];
        homepage = "https://github.com/fpco/monad-logger-syslog";
@@ -90337,8 +92652,8 @@ self: {
        pname = "monad-loops";
        version = "0.4.3";
        sha256 = "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/mokus0/monad-loops";
        description = "Monadic loops";
        license = stdenv.lib.licenses.publicDomain;
@@ -90350,7 +92665,7 @@ self: {
        pname = "monad-loops-stm";
        version = "0.4";
        sha256 = "0y7j2xpr1s7ggwm3vvpb5mlagsnxhq9qpncapibhk2pbf2d5r7as";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/mokus0/monad-loops-stm";
        description = "Monadic loops for STM";
        license = stdenv.lib.licenses.publicDomain;
@@ -90363,11 +92678,11 @@ self: {
      mkDerivation {
        pname = "monad-lrs";
        version = "0.0.2.1";
-       revision = "1";
        sha256 = "01i8hz50r3lf8r3rasl96blr6br3p1x6hvckhbi8aw61x507jmcg";
+       revision = "1";
        editedCabalFile = "dd714797826911e564a0e418307530fa99a8ba9ea91400517be2bb78b4e695c1";
-       buildDepends = [ base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -90386,10 +92701,10 @@ self: {
        pname = "monad-memo";
        version = "0.4.1";
        sha256 = "07gid18rsja7gvk2ccsbwvpz223x59mdk9x9w36bz18cy2pw802c";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl primitive transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers mtl primitive QuickCheck random
          test-framework test-framework-quickcheck2 transformers vector
        ];
@@ -90405,7 +92720,7 @@ self: {
        pname = "monad-mersenne-random";
        version = "0.1";
        sha256 = "03kbqbgv4npzfzn90jk4p17y8kb62sslby6q36819qkif1j76lq6";
-       buildDepends = [ base mersenne-random-pure64 ];
+       libraryHaskellDepends = [ base mersenne-random-pure64 ];
        homepage = "http://code.haskell.org/~dons/code/monad-mersenne-random";
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
@@ -90418,7 +92733,7 @@ self: {
        pname = "monad-open";
        version = "0.1.0.0";
        sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx";
-       buildDepends = [ base exceptions mtl transformers ];
+       libraryHaskellDepends = [ base exceptions mtl transformers ];
        jailbreak = true;
        description = "Open recursion for when you need it";
        license = stdenv.lib.licenses.mit;
@@ -90430,7 +92745,7 @@ self: {
        pname = "monad-ox";
        version = "0.3.0";
        sha256 = "1x65jvh816a296y2ds8vysfzl83am4pwwrnap4zdg0prpcxfpwl8";
-       buildDepends = [ base containers mtl text vector ];
+       libraryHaskellDepends = [ base containers mtl text vector ];
        homepage = "https://github.com/kawu/monad-ox";
        description = "Monad for observation extraction";
        license = stdenv.lib.licenses.bsd3;
@@ -90446,11 +92761,11 @@ self: {
        pname = "monad-par";
        version = "0.3.4.7";
        sha256 = "12n27hs274nrfkpa6hx0gdkrc76wxzliqf53x6689idl363sdf13";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque abstract-par array base containers deepseq
          monad-par-extras mtl mwc-random parallel
        ];
-       testDepends = [
+       testHaskellDepends = [
          abstract-deque abstract-par array base containers deepseq HUnit
          monad-par-extras mtl mwc-random QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
@@ -90469,7 +92784,7 @@ self: {
        pname = "monad-par-extras";
        version = "0.3.3";
        sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-par base cereal deepseq mtl random transformers
        ];
        homepage = "https://github.com/simonmar/monad-par";
@@ -90484,7 +92799,9 @@ self: {
        pname = "monad-parallel";
        version = "0.7.1.4";
        sha256 = "01sadhl3kv7gsx1m90fb76n2xh7b9awjc9071gzn0ab26d67a98b";
-       buildDepends = [ base parallel transformers transformers-compat ];
+       libraryHaskellDepends = [
+         base parallel transformers transformers-compat
+       ];
        homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
        description = "Parallel execution of monadic computations";
        license = stdenv.lib.licenses.bsd3;
@@ -90498,7 +92815,7 @@ self: {
        pname = "monad-parallel-progressbar";
        version = "0.1.0.1";
        sha256 = "1pqi2alyvsflwy5ygp4cl5g90jg50ix61plqxvsldpdkzncmmk84";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-parallel monadIO terminal-progress-bar
        ];
        homepage = "https://github.com/mnacamura/monad-parallel-progressbar";
@@ -90512,7 +92829,7 @@ self: {
        pname = "monad-param";
        version = "0.0.4";
        sha256 = "08rm902kclapqh1iafjrsqspf0szhbx5jaqv6hh9p5zbg8ipdkhc";
-       buildDepends = [ base mtl stm ];
+       libraryHaskellDepends = [ base mtl stm ];
        homepage = "http://hackage.haskell.org/package/monad-param";
        description = "Parameterized monads";
        license = stdenv.lib.licenses.bsd3;
@@ -90524,11 +92841,12 @@ self: {
        pname = "monad-peel";
        version = "0.2";
        sha256 = "1cg6j2qhh14ryn4766dwx57g50qalzcv79rx9ysdgkskkjs6fiix";
-       buildDepends = [ base extensible-exceptions transformers ];
+       libraryHaskellDepends = [
+         base extensible-exceptions transformers
+       ];
        homepage = "http://andersk.mit.edu/haskell/monad-peel/";
        description = "Lift control operations like exception catching through monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-primitive" = callPackage
@@ -90537,7 +92855,7 @@ self: {
        pname = "monad-primitive";
        version = "0.1";
        sha256 = "1vi6g65hdyq5vq78mfag0qljxgzb6vq83m82x3cpgjl7dr9k5h1x";
-       buildDepends = [ base primitive transformers ];
+       libraryHaskellDepends = [ base primitive transformers ];
        homepage = "http://bitbucket.org/Shimuuar/monad-primitive";
        description = "Type class for monad transformers stack with pirimitive base monad";
        license = stdenv.lib.licenses.bsd3;
@@ -90548,10 +92866,10 @@ self: {
      mkDerivation {
        pname = "monad-products";
        version = "4.0.0.1";
-       revision = "1";
        sha256 = "017cxiavxfw0f08sr0d6m3avla1lplmdj51rxpf1103ripq20r53";
+       revision = "1";
        editedCabalFile = "fb4d07af0ad3081f3f2a252c99b777fafa6b3ece61ca81642f8a889ef370710e";
-       buildDepends = [ base semigroupoids ];
+       libraryHaskellDepends = [ base semigroupoids ];
        homepage = "http://github.com/ekmett/monad-products";
        description = "Monad products";
        license = stdenv.lib.licenses.bsd3;
@@ -90563,7 +92881,7 @@ self: {
        pname = "monad-ran";
        version = "0.1.0";
        sha256 = "04y9s2b4hz2f8khr0q62xy0f6l2v896s7x03i3s18i14bwscqlax";
-       buildDepends = [ base ghc-prim mtl ];
+       libraryHaskellDepends = [ base ghc-prim mtl ];
        jailbreak = true;
        description = "Fast monads and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -90576,7 +92894,7 @@ self: {
        pname = "monad-resumption";
        version = "0.1.1.5";
        sha256 = "08h750qbvzvlw5hyp1d44rkhiqlhgnsfy8sya2ya7p62l80w96sf";
-       buildDepends = [ base mmorph mtl transformers ];
+       libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/igraves/resumption_monads";
        description = "Resumption and reactive resumption monads for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -90588,7 +92906,7 @@ self: {
        pname = "monad-skeleton";
        version = "0.1.2.1";
        sha256 = "0sg1yj4cp7ac26ydwhpc05j9bs3scaj25b9sb0xr1gw1qasnyi76";
-       buildDepends = [ base containers ghc-prim ];
+       libraryHaskellDepends = [ base containers ghc-prim ];
        homepage = "https://github.com/fumieval/monad-skeleton";
        description = "An undead monad";
        license = stdenv.lib.licenses.bsd3;
@@ -90600,7 +92918,7 @@ self: {
        pname = "monad-st";
        version = "0.2.4";
        sha256 = "1j67s07p5lsr81cjl0ch5d1q7zarmpak5kmnwckhavihg3l5m3bi";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/monad-st";
        description = "Provides a MonadST class";
        license = stdenv.lib.licenses.bsd3;
@@ -90614,7 +92932,7 @@ self: {
        pname = "monad-state";
        version = "0.2.0.3";
        sha256 = "1dh1dw7n39rb85wk4zq0hw2g9x81zyha033awv81l6xl8pjdxqxv";
-       buildDepends = [
+       libraryHaskellDepends = [
          AbortT-transformers base fclabels monads-tf transformers
        ];
        homepage = "https://github.com/bairyn/monad-state";
@@ -90628,8 +92946,8 @@ self: {
        pname = "monad-statevar";
        version = "0.1";
        sha256 = "08sr29qr02kfqja51ciqcpsf95wp3bypx64f4cwgpwh23xapr1fx";
-       buildDepends = [ base transformers ];
-       testDepends = [ base stm ];
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base stm ];
        homepage = "http://github.com/joeyadams/hs-monad-statevar";
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
        license = stdenv.lib.licenses.bsd3;
@@ -90642,7 +92960,9 @@ self: {
        pname = "monad-stlike-io";
        version = "0.2.2";
        sha256 = "1lizwf31d8ha0xq644cfcn91l8sz8i4ldy12ig4ajfghxj2x4ad5";
-       buildDepends = [ base bytestring containers deepseq monads-tf ];
+       libraryHaskellDepends = [
+         base bytestring containers deepseq monads-tf
+       ];
        homepage = "http://github.com/taruti/monad-stlike-io";
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
@@ -90655,7 +92975,7 @@ self: {
        pname = "monad-stlike-stm";
        version = "0.1.1";
        sha256 = "007rsq9x0dq8xmiimgqb0v8k15xizx63qmc76b1b8a66nfsd9w56";
-       buildDepends = [ base monad-stlike-io stm ];
+       libraryHaskellDepends = [ base monad-stlike-io stm ];
        homepage = "http://github.com/taruti/monad-stlike-stm";
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
@@ -90668,7 +92988,7 @@ self: {
        pname = "monad-stm";
        version = "0.1.0.2";
        sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        description = "MonadSTM class analogous to MonadIO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90679,7 +92999,7 @@ self: {
        pname = "monad-supply";
        version = "0.6";
        sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Stateful supply monad";
        license = "unknown";
      }) {};
@@ -90690,7 +93010,7 @@ self: {
        pname = "monad-task";
        version = "0.1.0";
        sha256 = "01w3wqmsfl9w96kfpdiwfyghm2zjn70x78l436bzxfrcm1d3ayi8";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/ninegua/monad-task";
        description = "A monad transformer that turns event processing into co-routine programming";
@@ -90703,7 +93023,7 @@ self: {
        pname = "monad-time";
        version = "0.1";
        sha256 = "1g3dqfwwmqwdpr3dcixxyw5akbdicx53i6d2s8921l2zbkm0hfnj";
-       buildDepends = [ base mtl time ];
+       libraryHaskellDepends = [ base mtl time ];
        homepage = "https://github.com/scrive/monad-time";
        description = "Type class for monads which carry the notion of the current time";
        license = stdenv.lib.licenses.bsd3;
@@ -90715,7 +93035,7 @@ self: {
        pname = "monad-tx";
        version = "0.0.1";
        sha256 = "0jv3pcmbm3bph42hhr4i0l3dchapixf5j5gd7ybs9j3bbk3yydk9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90726,10 +93046,10 @@ self: {
      mkDerivation {
        pname = "monad-unify";
        version = "0.2.2";
-       revision = "1";
        sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp";
+       revision = "1";
        editedCabalFile = "7d585b29bfa558cf59d169421d1ec3363b6ef56b88cf6a9a082192d609676ce2";
-       buildDepends = [ base mtl unordered-containers ];
+       libraryHaskellDepends = [ base mtl unordered-containers ];
        jailbreak = true;
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
@@ -90745,7 +93065,7 @@ self: {
        pname = "monad-unlift";
        version = "0.1.1.0";
        sha256 = "1x86xpgirp97rda1y22129xf3fbkyb442jndpjsb9j1k4lplh7y2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints exceptions monad-control mtl mutable-containers
          resourcet stm transformers transformers-base
        ];
@@ -90760,7 +93080,7 @@ self: {
        pname = "monad-wrap";
        version = "0.1";
        sha256 = "1hmigg0cbrsdvf6s0z2wn3s81q12qg3c30jjlsrw4jdfwv1qn13f";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Wrap functions such as catch around different monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90771,7 +93091,7 @@ self: {
        pname = "monadIO";
        version = "0.10.1.4";
        sha256 = "08158j978h69knbnzxkzv856sjhhw24h5lh7d8hx2lyhzbpnfarl";
-       buildDepends = [ base mtl stm ];
+       libraryHaskellDepends = [ base mtl stm ];
        description = "Overloading of concurrency variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90782,7 +93102,7 @@ self: {
        pname = "monadLib";
        version = "3.7.3";
        sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://wiki.github.com/yav/monadlib";
        description = "A collection of monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -90794,7 +93114,7 @@ self: {
        pname = "monadLib-compose";
        version = "0.2";
        sha256 = "14byhdcby094qpgmkblysnplz5r88xnfk7rnfddihzz4jgjzlvy1";
-       buildDepends = [ base monadLib ];
+       libraryHaskellDepends = [ base monadLib ];
        jailbreak = true;
        homepage = "http://github.com/aristidb/monadLib-compose";
        description = "Arrow-like monad composition for monadLib";
@@ -90807,7 +93127,7 @@ self: {
        pname = "monadacme";
        version = "0.0.2";
        sha256 = "1qam6k3gax2kf9zbf0q2mbsknkmx8y73i9qshbylj8wrpf896y97";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The Acme and AcmeT monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90819,7 +93139,7 @@ self: {
        pname = "monadbi";
        version = "0.1";
        sha256 = "0r5hja34nalhvlc4x2rmhk9j1rsd363ilfjkd7y7cv4l8yzvifq7";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/ajnsit/monadbi";
        description = "Extract underlying monads from monad transformers";
        license = "GPL";
@@ -90833,7 +93153,7 @@ self: {
        pname = "monadcryptorandom";
        version = "0.6.1";
        sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-api mtl tagged transformers
        ];
        homepage = "https://github.com/TomMD/monadcryptorandom";
@@ -90847,7 +93167,7 @@ self: {
        pname = "monadfibre";
        version = "0.1.2.1";
        sha256 = "0vj84g5y0k903pz4lk12sa6l6c0f26dc42x62f1mqny8457r3ds6";
-       buildDepends = [ base monadbi ];
+       libraryHaskellDepends = [ base monadbi ];
        homepage = "https://github.com/ajnsit/monadfibre";
        description = "Monadic functions which provide Choice and Parallelism";
        license = "GPL";
@@ -90859,7 +93179,7 @@ self: {
        pname = "monadic-arrays";
        version = "0.2.1.4";
        sha256 = "1vlqh0mqfkg1f47dhl5lw49b7xawlbyjmq7xpmmf16q3idxnkahh";
-       buildDepends = [ array base stm transformers ];
+       libraryHaskellDepends = [ array base stm transformers ];
        homepage = "http://github.com/ekmett/monadic-arrays/";
        description = "Boxed and unboxed arrays for monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -90871,7 +93191,9 @@ self: {
        pname = "monadiccp";
        version = "0.7.6";
        sha256 = "083ppr53ac85r5ybndngsfwxgalj63giz32aa7wpcm629b9g4lxc";
-       buildDepends = [ base containers mtl parsec pretty random ];
+       libraryHaskellDepends = [
+         base containers mtl parsec pretty random
+       ];
        homepage = "http://users.ugent.be/~tschrijv/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -90886,8 +93208,8 @@ self: {
        pname = "monadiccp-gecode";
        version = "0.1.2";
        sha256 = "1ylyzklcb37khrq8a11fzlyd0sa1nrhpd7cv470m23v7l1hc1wg0";
-       buildDepends = [ base containers monadiccp mtl ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base containers monadiccp mtl ];
+       librarySystemDepends = [
          gecodeint gecodekernel gecodesearch gecodeset gecodesupport
        ];
        homepage = "http://users.ugent.be/~tschrijv/MCP/";
@@ -90903,7 +93225,7 @@ self: {
        pname = "monadio-unwrappable";
        version = "0.3";
        sha256 = "18hbi4vxj9lfcla11b17sb88ysskxavq00zmrjx62cpyzkp85yxh";
-       buildDepends = [ base monads-tf transformers ];
+       libraryHaskellDepends = [ base monads-tf transformers ];
        description = "Reversibly allow monad transformer stacks to run in IO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90914,7 +93236,7 @@ self: {
        pname = "monadlist";
        version = "0.0.2";
        sha256 = "1zpxqp5zhcpk4358xqrapvkcfyazpdsdlrw3g14518y2kwnfifq6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Monadic versions of list functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90925,7 +93247,7 @@ self: {
        pname = "monadloc";
        version = "0.7.1";
        sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj";
-       buildDepends = [ base template-haskell transformers ];
+       libraryHaskellDepends = [ base template-haskell transformers ];
        homepage = "http://github.com/pepeiborra/monadloc";
        description = "A class for monads which can keep a monadic call trace";
        license = stdenv.lib.licenses.publicDomain;
@@ -90941,7 +93263,7 @@ self: {
        sha256 = "0ch25kcz63xhinwd6mjqbhm282hfh280s3z910wnvdp3krgx0mpc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base filepath haskell-src-exts monadloc pretty syb
        ];
        jailbreak = true;
@@ -90956,7 +93278,7 @@ self: {
        pname = "monadplus";
        version = "1.4.2";
        sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90967,7 +93289,7 @@ self: {
        pname = "monads-fd";
        version = "0.2.0.0";
        sha256 = "1iqr5p3va5sxmpvydwqz2src54j5njcyrzn9p5apc60nv7yv6x4c";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -90979,7 +93301,7 @@ self: {
        pname = "monads-tf";
        version = "0.1.0.2";
        sha256 = "0z07z2lfm3l93fx0qhfd98j76d1rksi5llq67l5v09pm8da4jvyb";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Monad classes, using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90990,7 +93312,7 @@ self: {
        pname = "monadtransform";
        version = "0.0.2";
        sha256 = "0i586zh6247jfmkw2x27j0aq47yz1c71irj9iwrlx1zrmvzak1yv";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/tonymorris/monadtransform";
        description = "A type-class for transforming monads (homomorphism) in a transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -91005,11 +93327,13 @@ self: {
        pname = "monarch";
        version = "0.10.0.0";
        sha256 = "1a47hhlmllrm3k4ssr8rr3bgq1w7i6jpx07nyf0k8k9x5sgi1siv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers lifted-base monad-control mtl
          network pool-conduit stm transformers transformers-base
        ];
-       testDepends = [ base bytestring doctest hspec transformers ];
+       testHaskellDepends = [
+         base bytestring doctest hspec transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/notogawa/monarch";
        description = "Monadic interface for TokyoTyrant";
@@ -91027,12 +93351,12 @@ self: {
        pname = "mongoDB";
        version = "2.0.5";
        sha256 = "09ysw5sp7x8pyfsjj1qgfq3wm8l0cpxkv9g9x117iss04bfk0p3h";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bson bytestring containers cryptohash hashtables
          lifted-base monad-control mtl network parsec random random-shuffle
          text transformers-base
        ];
-       testDepends = [ base hspec mtl old-locale time ];
+       testHaskellDepends = [ base hspec mtl old-locale time ];
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = "unknown";
@@ -91046,11 +93370,11 @@ self: {
        pname = "mongodb-queue";
        version = "0.4.0.1";
        sha256 = "1y3c5ydf7595ai3h6iapc0dmls348vv1jmy4g8n5wfmwzy4li22s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default lifted-base monad-control mongoDB network text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-default hspec lifted-base monad-control mongoDB network
          text transformers
        ];
@@ -91070,7 +93394,7 @@ self: {
        pname = "mongrel2-handler";
        version = "0.3.2";
        sha256 = "1bv9i2b0pb50r7l7l43h26ng5rcs1iyymwndcwxji8dnmbnr4jdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring
          case-insensitive containers http-types text zeromq-haskell
        ];
@@ -91088,7 +93412,7 @@ self: {
        sha256 = "06p9xj5y3xl4hcl57afqz4m4yc2vaah8i6f4smmhwmkzslg7svbs";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath hinotify process ];
+       executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -91099,7 +93423,7 @@ self: {
        pname = "mono-foldable";
        version = "0.1.0.2";
        sha256 = "1qnbw9pd06czwyj2xcsjdigg7bj8d23p3ljnnkgd3d0r67qxxlxm";
-       buildDepends = [ base bytestring text vector ];
+       libraryHaskellDepends = [ base bytestring text vector ];
        jailbreak = true;
        homepage = "http://github.com/JohnLato/mono-foldable";
        description = "Folds for monomorphic containers";
@@ -91117,12 +93441,12 @@ self: {
        pname = "mono-traversable";
        version = "0.9.2.1";
        sha256 = "1vs2nl3c0gdhaxxh013ri3l9n13yl9nawiynpsyq6zp495xq5hrl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
          vector vector-algorithms vector-instances
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers foldl hspec HUnit QuickCheck semigroups
          text transformers unordered-containers vector
        ];
@@ -91137,7 +93461,7 @@ self: {
        pname = "monoid-extras";
        version = "0.4.0.1";
        sha256 = "0jcyjqmk4s64j05qisvibmy87m5xi5n837wsivq7lml8lfyrj7yf";
-       buildDepends = [ base groups semigroupoids semigroups ];
+       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91148,7 +93472,7 @@ self: {
        pname = "monoid-owns";
        version = "2010.5.29";
        sha256 = "1n05f95yhn6jp7rdnlx686k1lsls4iilxdxnp41ds4afsypaclfk";
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/nfjinjing/monoid-owns";
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -91161,7 +93485,7 @@ self: {
        pname = "monoid-record";
        version = "0.1";
        sha256 = "14xs1nvf0ngx4jvinkhzq3ainhs159zx0396z88y21vvc8kw42i5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Support for modifying record fields of monoidal type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91172,7 +93496,7 @@ self: {
        pname = "monoid-statistics";
        version = "0.3.1";
        sha256 = "0gfdjmx457r580lc40vpg8fkzd8n971b5vam96v6kzssg2cznqy3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/Shimuuar/monoid-statistics";
        description = "Monoids for calculation of statistics of sample";
        license = stdenv.lib.licenses.bsd3;
@@ -91186,8 +93510,10 @@ self: {
        pname = "monoid-subclasses";
        version = "0.4.1.2";
        sha256 = "0j9an1zq3dg02jz8skqkch01kg2ha59zja2729v8lpwxsd4sbi9x";
-       buildDepends = [ base bytestring containers primes text vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers primes text vector
+       ];
+       testHaskellDepends = [
          base bytestring containers primes QuickCheck quickcheck-instances
          tasty tasty-quickcheck text vector
        ];
@@ -91202,7 +93528,7 @@ self: {
        pname = "monoid-transformer";
        version = "0.0.3";
        sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Monoid counterparts to some ubiquitous monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91215,7 +93541,7 @@ self: {
        pname = "monoidal-containers";
        version = "0.1.2.2";
        sha256 = "06yam4ljp4lm2rjaccykg8zx4hnmn0ly3fs24xjm4q45ldz7gwyb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hashable lens newtype unordered-containers
        ];
        homepage = "http://github.com/bgamari/monoidal-containers";
@@ -91229,7 +93555,9 @@ self: {
        pname = "monoidplus";
        version = "0.1.0.1";
        sha256 = "1klgwv3sd9zmqpj157rypln51kcwml9b1fyaxnip0a1525h6c2s9";
-       buildDepends = [ base contravariant semigroups transformers ];
+       libraryHaskellDepends = [
+         base contravariant semigroups transformers
+       ];
        jailbreak = true;
        description = "Extra classes/functions about monoids";
        license = stdenv.lib.licenses.publicDomain;
@@ -91244,7 +93572,7 @@ self: {
        pname = "monoids";
        version = "0.3.2";
        sha256 = "0yn15q0569mdm20wdbwydbb1vdzfdh1ismhwplwbvi2989h78kca";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers fingertree parallel text
        ];
        jailbreak = true;
@@ -91260,11 +93588,10 @@ self: {
        pname = "monomorphic";
        version = "0.0.3.3";
        sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/konn/monomorphic";
        description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "montage" = callPackage
@@ -91277,7 +93604,7 @@ self: {
        pname = "montage";
        version = "0.1.1";
        sha256 = "1yx2aagfxjgs9jwipbwa05aiqkm1xgxd0gwnc4qj6mwz9913zsl7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers ListLike old-locale pool-conduit
          protocol-buffers protocol-buffers-descriptor riak-bump safe
          stats-web stm system-uuid text time unordered-containers
@@ -91301,7 +93628,7 @@ self: {
        pname = "montage-client";
        version = "0.1.1";
        sha256 = "18bgaw0i7zllabq8ys6p6qd8qga3xgxsfmgn88g4dijh6v6zf7pf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers ListLike mtl old-locale
          pool-conduit protocol-buffers protocol-buffers-descriptor riak-bump
          safe stats-web stm system-uuid text text-format time
@@ -91323,8 +93650,10 @@ self: {
        pname = "monte-carlo";
        version = "0.6.1";
        sha256 = "1zk8wyf9bzarnvsxh9a6diyssb78sfq1pl729gq113j0vibs8f0x";
-       buildDepends = [ base gsl-random primitive transformers vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base gsl-random primitive transformers vector
+       ];
+       testHaskellDepends = [
          base gsl-random ieee754 primitive QuickCheck random test-framework
          test-framework-quickcheck2 transformers vector
        ];
@@ -91344,11 +93673,11 @@ self: {
        pname = "moo";
        version = "1.0";
        sha256 = "02ah9v6h4ansd8kz76jnrx0yra9nz6ql92p5rm01pxri1gc7kn6w";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base gray-code mersenne-random-pure64 monad-mersenne-random
          mtl random random-shuffle time
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers gray-code HUnit mersenne-random-pure64
          monad-mersenne-random mtl random random-shuffle time
        ];
@@ -91366,14 +93695,13 @@ self: {
        pname = "moonshine";
        version = "2.0.0.0";
        sha256 = "1b8b7h9nk5nzk9q5ysg57q1rain36bxhvx4l7qwidsx30rdfs6qs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring canteven-config ekg ekg-core hslogger snap
          text time transformers yaml
        ];
        homepage = "https://github.com/SumAll/moonshine";
        description = "A web service framework for Haskell, similar in purpose to dropwizard";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morfette" = callPackage
@@ -91387,7 +93715,7 @@ self: {
        sha256 = "149jp0s5nsa02zivlp868qqvvam59wwf6nkq79ynlqjsa4lanvay";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          pretty QuickCheck text utf8-string vector
        ];
@@ -91406,8 +93734,10 @@ self: {
        pname = "morfeusz";
        version = "0.4.2";
        sha256 = "1lzl5ks7px1xibfa6y0wnfv2mk2w39hscrrynqn7a3gjnca00sx0";
-       buildDepends = [ base bytestring containers directory mtl text ];
-       extraLibraries = [ morfeusz ];
+       libraryHaskellDepends = [
+         base bytestring containers directory mtl text
+       ];
+       librarySystemDepends = [ morfeusz ];
        homepage = "https://github.com/kawu/morfeusz";
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
@@ -91426,12 +93756,13 @@ self: {
        sha256 = "15zvk50qpp3ywkwqgpm4phdcspfszzwipxcf07lnxpk98i7ybc4g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers deepseq http-client http-client-tls
-         lens-family-core managed optparse-applicative pipes system-fileio
-         system-filepath text text-format transformers
+         lens-family-core managed pipes system-fileio system-filepath text
+         text-format transformers
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base optparse-applicative text ];
        jailbreak = true;
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
@@ -91446,7 +93777,7 @@ self: {
        pname = "mosaico-lib";
        version = "0.1.1.0";
        sha256 = "1qcr3l1a422fh5226443dc8p6hvrr9wbhri6mk2pcw7zyfd5xr0b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols colour diagrams-cairo diagrams-core
          diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm
          stm-chans transformers
@@ -91464,7 +93795,7 @@ self: {
        pname = "mount";
        version = "0.2.1";
        sha256 = "0rdlnz0xk6mil79a8ygfrwgdychsn6h1gbv6qn2nybzaw1zjf4z3";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91479,12 +93810,12 @@ self: {
      mkDerivation {
        pname = "mp";
        version = "0.2.2";
-       revision = "1";
        sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir";
+       revision = "1";
        editedCabalFile = "8c578611352448e5aea9a082fb0696e7bb890397214631a009351925db2f88b1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring ConfigFile daemons directory filepath glib
          gstreamer hgettext MissingH mtl network random setlocale text unix
          unordered-containers utf8-string vty vty-ui
@@ -91503,7 +93834,9 @@ self: {
        sha256 = "0kwjnbrmlp9a5wz3mgf76nd2ar32d3n1f4jmbfpsggcm7jdp1rmv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary-strict bytestring haskell98 mtl ];
+       executableHaskellDepends = [
+         base binary-strict bytestring haskell98 mtl
+       ];
        homepage = "http://www.bjrn.se/mp3dec";
        description = "MP3 decoder for teaching";
        license = "unknown";
@@ -91518,7 +93851,9 @@ self: {
        sha256 = "02p6g8wgmmzxl3dnrvbj1msg972c40s300rfykqsg1g5wiqbllf2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory network powermate unix ];
+       executableHaskellDepends = [
+         base directory network powermate unix
+       ];
        homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "MPD/PowerMate executable";
        license = stdenv.lib.licenses.bsd3;
@@ -91531,7 +93866,9 @@ self: {
        pname = "mpppc";
        version = "0.1.3";
        sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi";
-       buildDepends = [ ansi-terminal base bytestring split text ];
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring split text
+       ];
        jailbreak = true;
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
@@ -91546,7 +93883,7 @@ self: {
        pname = "mpretty";
        version = "0.1.0.0";
        sha256 = "0q4fi7jmdf3bvcqk6fc7194h59sjwf76ld8niwqczc30v8lyjq2n";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base containers data-lens-fd data-lens-template mtl
          orders text transformers
        ];
@@ -91566,7 +93903,7 @@ self: {
        sha256 = "1b5vzhbn5jnpxc0bzbhdak51qhzv5hif0300jsrbi5ffyvcjqkss";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskell98 mtl parsec pretty transformers unbound
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
@@ -91583,7 +93920,7 @@ self: {
        pname = "mps";
        version = "2010.11.28";
        sha256 = "1xhflvgwrjzj7qb69dn149lh32c7q9161zrzfs07ncs233y0w4lg";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath monoid-owns
          old-locale old-time parallel parsec regexpr template-haskell time
          utf8-string
@@ -91604,7 +93941,7 @@ self: {
        sha256 = "1nmc03s8h3khmvajyhwaniczq0r4wrinq2sjjp1c6gyc2nggxzyx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath gtk mtl process template-haskell unix
        ];
        jailbreak = true;
@@ -91621,10 +93958,10 @@ self: {
      mkDerivation {
        pname = "mqtt-hs";
        version = "0.2.0";
-       revision = "1";
        sha256 = "0jvzr6qbmdxl11j8fwnbasgqgdfm395lm2gh2va9zfpk5xpx0mjg";
+       revision = "1";
        editedCabalFile = "aa0a2e9ea99cfbed4646ac02625b66361f8175ae2d70efc041dc517119706439";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring monad-loops mtl network singletons text
        ];
        jailbreak = true;
@@ -91643,11 +93980,11 @@ self: {
        pname = "ms";
        version = "0.2.1";
        sha256 = "0h70dkgzybbjm48ay9xqbvydf13a6q1zy99ln8kx4qlfdi4gsrnp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base contravariant edit-distance lens profunctors semigroupoids
          semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest profunctors tasty tasty-quickcheck vector
        ];
        homepage = "https://github.com/relrod/ms";
@@ -91665,11 +94002,11 @@ self: {
        pname = "msgpack";
        version = "1.0.0";
        sha256 = "0kk6nqn290sh0l0hhglccs0cqgk0fb3xdjzqz19yw9wb8aw01xh8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder bytestring containers data-binary-ieee754
          deepseq hashable mtl text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
        homepage = "http://msgpack.org/";
@@ -91686,11 +94023,11 @@ self: {
        pname = "msgpack-aeson";
        version = "0.1.0.0";
        sha256 = "1ygnki55cj6951y75snc4gnv4vsjp9pgwqg3jp7cy9bcss3msq3j";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring deepseq msgpack scientific text
          unordered-containers vector
        ];
-       testDepends = [ aeson base msgpack tasty tasty-hunit ];
+       testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
        homepage = "http://msgpack.org/";
        description = "Aeson adapter for MessagePack";
        license = stdenv.lib.licenses.bsd3;
@@ -91707,11 +94044,12 @@ self: {
        sha256 = "0z28qikcfvfkj9xr87g13jlm2blqfxj3rfrg7hm2hfgv3qz4gkfz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-builder bytestring cmdargs containers directory filepath
-         msgpack peggy shakespeare-text template-haskell text
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers directory filepath msgpack
+         peggy shakespeare-text template-haskell text
        ];
-       testDepends = [ base hspec ];
+       executableHaskellDepends = [ base cmdargs directory peggy ];
+       testHaskellDepends = [ base hspec ];
        jailbreak = true;
        homepage = "http://msgpack.org/";
        description = "An IDL Compiler for MessagePack";
@@ -91728,11 +94066,11 @@ self: {
        pname = "msgpack-rpc";
        version = "1.0.0";
        sha256 = "00m5hpj5cd521j3jzsaw49asbpxvka0x1zi2qs26si82wxgnpjkn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          exceptions monad-control msgpack mtl network random text
        ];
-       testDepends = [ async base mtl network tasty tasty-hunit ];
+       testHaskellDepends = [ async base mtl network tasty tasty-hunit ];
        homepage = "http://msgpack.org/";
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -91746,7 +94084,7 @@ self: {
        sha256 = "1lq1a13h74dkhmh6mkg9mzksvzc2mjb8ynsbs9856z7079ifsdw4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring hid split ];
+       executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91757,10 +94095,9 @@ self: {
        pname = "mstate";
        version = "0.2.7";
        sha256 = "05rcpfang0biy16aglf6da44zp9zqy2x0zdsfl75mv1drkky6225";
-       buildDepends = [ base monad-peel mtl stm ];
+       libraryHaskellDepends = [ base monad-peel mtl stm ];
        description = "MState: A consistent State monad for concurrent applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "msu" = callPackage
@@ -91773,7 +94110,7 @@ self: {
        sha256 = "0bqzzk7y3dj60r02xn3cjlq955jzsrvcbq63pvav0w952bvxvx5c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath mtl parsec process xdg-basedir
        ];
        homepage = "http://github.com/pbrisbin/msu";
@@ -91792,12 +94129,12 @@ self: {
        pname = "mtgoxapi";
        version = "0.5.0.2";
        sha256 = "1iyn2mq0fql952phmbs8578awrv5l6q9iqkmsaby2jp48mnwizji";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring curl either errors hashable HTTP ixset network SHA text
          time transformers unordered-containers vector watchdog
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring curl errors hashable HTTP HUnit ixset network QuickCheck
          SHA test-framework test-framework-hunit test-framework-quickcheck2
@@ -91815,7 +94152,7 @@ self: {
        pname = "mtl";
        version = "2.1.3.1";
        sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
@@ -91828,7 +94165,7 @@ self: {
        pname = "mtl";
        version = "2.2.1";
        sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -91840,7 +94177,7 @@ self: {
        pname = "mtl-c";
        version = "0.1";
        sha256 = "0n91jh07v87j2rbilyrip3inixb9a95i2j61g5hz42kiq5wj71gb";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/fumieval/mtl-c";
        description = "Very strict CPS'd transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -91851,10 +94188,10 @@ self: {
      mkDerivation {
        pname = "mtl-compat";
        version = "0.2.1.3";
-       revision = "1";
        sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34";
+       revision = "1";
        editedCabalFile = "b4d1feef302a6fe59e77e822e61261eeaec449a6b56560ea8429bb1bc7dbccc6";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/haskell-compat/mtl-compat";
        description = "Backported Control.Monad.Except module from mtl";
        license = stdenv.lib.licenses.bsd3;
@@ -91868,7 +94205,7 @@ self: {
        pname = "mtl-evil-instances";
        version = "0.1";
        sha256 = "1z10p0dmvjyadjc46nkzyqicfk0097ff2ni3fiypw9z5knsxhym4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control mtl transformers transformers-base
        ];
        jailbreak = true;
@@ -91882,7 +94219,7 @@ self: {
        pname = "mtl-prelude";
        version = "1.0.3";
        sha256 = "1qr0bwcg9rlj53gbnji969s86qh8laaiibkfy2msziqnp011108x";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
@@ -91894,7 +94231,7 @@ self: {
        pname = "mtl-prelude";
        version = "2.0.2";
        sha256 = "1j42pdkiiqjkdmidgmgpfbwh2i8dwsc40labw4pm86qzsi0r8m2v";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
@@ -91906,7 +94243,7 @@ self: {
        pname = "mtl-tf";
        version = "0.1";
        sha256 = "0qfmswdkj95bh6wkic8hh002wsxqlrylw45k6w9iyzv4saqnl22f";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Monad transformer library using type families";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91918,7 +94255,7 @@ self: {
        pname = "mtl-unleashed";
        version = "0.2.2";
        sha256 = "0ih03zznq8mf8c76ic43j3vana6127bh6hxfz549g5kv9h54y83h";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/seereason/mtl-unleashed";
        description = "MTL classes without the functional dependency";
        license = stdenv.lib.licenses.bsd3;
@@ -91930,7 +94267,7 @@ self: {
        pname = "mtlparse";
        version = "0.1.4.0";
        sha256 = "1fl5rvmgk37bqgjzs3c2wh80pfhr0i4yakxbsaryg7piws7j6ygc";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/";
        description = "parse library using mtl package";
        license = "LGPL";
@@ -91942,7 +94279,7 @@ self: {
        pname = "mtlx";
        version = "0.1.6";
        sha256 = "0s0cniqn1fb7rq14w3wjh7mkzkxpndj1h1wrgssxds6cs3vkk4dn";
-       buildDepends = [ base mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91954,8 +94291,8 @@ self: {
        pname = "mtp";
        version = "0.1.1.1";
        sha256 = "164q7p81c5an4w3pqpfk94rgn0banfs2yp7fhbbckdyb2qymsbww";
-       buildDepends = [ base filepath unix ];
-       extraLibraries = [ mtp ];
+       libraryHaskellDepends = [ base filepath unix ];
+       librarySystemDepends = [ mtp ];
        jailbreak = true;
        description = "Bindings to libmtp";
        license = "LGPL";
@@ -91968,7 +94305,7 @@ self: {
        pname = "mtree";
        version = "0.1";
        sha256 = "1l4kjrmr5v8pkhf48w0ym6dlrsvaf21p3x5sykq1rxwp821cqglv";
-       buildDepends = [ base bifunctors ];
+       libraryHaskellDepends = [ base bifunctors ];
        description = "Tree with Meta and Content parameters";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -91979,7 +94316,7 @@ self: {
        pname = "mucipher";
        version = "0.6.0";
        sha256 = "0bmdri4bni9whjgz4mxvkk9jbxkscci38l06gk2n5xiwyg1hwg0y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library to produce simple ciphers for use with lambdabot";
        license = "GPL";
      }) {};
@@ -91995,7 +94332,7 @@ self: {
        sha256 = "1bfsgsl09aajxa8ajps63zj348ccr8pswppj0dar5k8mr6nr6n3q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring cryptohash directory github-types
          http-conduit http-types process random snap-core snap-server stm
          text transformers
@@ -92013,7 +94350,7 @@ self: {
        pname = "muesli";
        version = "0.1.1.0";
        sha256 = "0cysqy3g9zgvbzj9gnwlpqk63inkm26dvhhqx8qlzp1lan6f125w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers directory filepath hashable mtl
          psqueues time
        ];
@@ -92030,19 +94367,19 @@ self: {
      mkDerivation {
        pname = "mueval";
        version = "0.9.1.1.2";
-       revision = "1";
        sha256 = "1h8a0lfbpgx9pjsmb0yld4n12z2nia5kkikjq1qqzk4m8rsknk70";
+       revision = "1";
        editedCabalFile = "5c6cf1e221928e15536f1dfa46942293acf7b470a442c619ef66529b78c59596";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers directory extensible-exceptions filepath hint
          mtl process QuickCheck show simple-reflect unix
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/gwern/mueval";
        description = "Safely evaluate pure Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multext-east-msd" = callPackage
@@ -92051,7 +94388,7 @@ self: {
        pname = "multext-east-msd";
        version = "0.1.0.4";
        sha256 = "1if1ip22y7w59lkyshn4ic4p46zrfs4kcdzzjai9l8xbscavgdl6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/jsnajder/multex-east-msd";
        description = "MULTEXT-East morphosyntactic descriptors";
@@ -92060,7 +94397,7 @@ self: {
 
   "multiarg" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
-     , tasty-th, utf8-string
+     , tasty-th
      }:
      mkDerivation {
        pname = "multiarg";
@@ -92068,8 +94405,10 @@ self: {
        sha256 = "18lq0q76a4vx5r28wrxwa3cb2gdx6hv8vylkky07dqccqgxdg5ss";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base utf8-string ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck tasty-th
+       ];
        homepage = "https://github.com/massysett/multiarg";
        description = "Command lines for options that take multiple arguments";
        license = stdenv.lib.licenses.bsd3;
@@ -92086,7 +94425,12 @@ self: {
        sha256 = "0w47ffx8f8hw2a35kxjwi16l9bfgc0k2ac7r844123anmgv2wcfm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base containers haskell-src-exts HaXml hxt hxt-xpath mtl
+         parsec pointless-haskell pointless-lenses pointless-rewrite pretty
+         process syb
+       ];
+       executableHaskellDepends = [
          array base containers haskell-src-exts HaXml hxt hxt-xpath mtl
          parsec pointless-haskell pointless-lenses pointless-rewrite pretty
          process syb
@@ -92107,9 +94451,13 @@ self: {
        sha256 = "09yjr7whddn60kyn25hzjjls1m5xi87nqzbkrb6vp4hlvmzm0b1g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base base58-bytestring base64-bytestring byteable
-         bytestring cryptohash hex io-streams optparse-applicative
+       libraryHaskellDepends = [
+         attoparsec base base58-bytestring base64-bytestring bytestring
+         cryptohash hex io-streams
+       ];
+       executableHaskellDepends = [
+         base base58-bytestring base64-bytestring byteable bytestring
+         cryptohash hex io-streams optparse-applicative
        ];
        jailbreak = true;
        homepage = "https://github.com/LukeHoersten/multihash";
@@ -92123,7 +94471,7 @@ self: {
        pname = "multimap";
        version = "1.2.1";
        sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://hub.darcs.net/scravy/multimap";
        description = "A multimap";
        license = stdenv.lib.licenses.mit;
@@ -92135,7 +94483,7 @@ self: {
        pname = "multipart";
        version = "0.1.2";
        sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5";
-       buildDepends = [ base bytestring parsec ];
+       libraryHaskellDepends = [ base bytestring parsec ];
        homepage = "http://www.github.com/silkapp/multipart";
        description = "HTTP multipart split out of the cgi package";
        license = stdenv.lib.licenses.bsd3;
@@ -92149,8 +94497,8 @@ self: {
        pname = "multipart-names";
        version = "0.0.1";
        sha256 = "17cw9lg1qi3rm38yh13n6gkb0grld4gc003hz49vdz8bx4gzfqxc";
-       buildDepends = [ base case-insensitive lens parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base case-insensitive lens parsec ];
+       testHaskellDepends = [
          base HUnit lens test-framework test-framework-hunit
        ];
        homepage = "http://github.com/nedervold/multipart-names";
@@ -92166,7 +94514,7 @@ self: {
        pname = "multipass";
        version = "0.1.0.2";
        sha256 = "0zs5sw9m5r8g9p29knrihqsvihwihr1ca28vb0283k5jik18aifm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers ghc-prim hashable keys math-functions
          newtype unordered-containers
        ];
@@ -92183,7 +94531,7 @@ self: {
        pname = "multiplate";
        version = "0.0.2";
        sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Multiplate";
        description = "Lightweight generic library for mutually recursive data types";
@@ -92196,7 +94544,7 @@ self: {
        pname = "multiplate-simplified";
        version = "0.0.0.2";
        sha256 = "0xzjl3nsm6wgbqd6rjn0bf9jhiw6l6ql5gj5m8xqccv8363i5v2r";
-       buildDepends = [ base multiplate transformers ];
+       libraryHaskellDepends = [ base multiplate transformers ];
        jailbreak = true;
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
@@ -92211,7 +94559,9 @@ self: {
        sha256 = "1y0v06qnpna8sa0aw24i4s29yc49m3a7d8yrl6xiv1jrgycjcafc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers fez-conf mtl process ];
+       executableHaskellDepends = [
+         base containers fez-conf mtl process
+       ];
        homepage = "http://ui3.info/d/proj/multiplicity.html";
        description = "Wrapper program for duplicity, adding config files";
        license = stdenv.lib.licenses.bsd3;
@@ -92223,7 +94573,7 @@ self: {
        pname = "multirec";
        version = "0.7.5";
        sha256 = "164a0rbka606d7d0l2p11j0zry0dlwkymig10wrkvckj7mh5yydz";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
        description = "Generic programming for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -92237,7 +94587,7 @@ self: {
        pname = "multirec-alt-deriver";
        version = "0.1.3";
        sha256 = "0hrzrzmgj1y784dvwiz20y842m4kk9rd9vhbwz8cazafs8gindfc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl multirec syb template-haskell th-expand-syns
        ];
        jailbreak = true;
@@ -92252,7 +94602,7 @@ self: {
        pname = "multirec-binary";
        version = "0.0.1";
        sha256 = "1cj1rfjqxwc06vr5w12fqbcpjb0fjsphf8vp40sp2naizpvvnmzs";
-       buildDepends = [ base binary multirec ];
+       libraryHaskellDepends = [ base binary multirec ];
        jailbreak = true;
        description = "Generic Data.Binary instances using MultiRec.";
        license = stdenv.lib.licenses.bsd3;
@@ -92265,7 +94615,7 @@ self: {
        pname = "multiset";
        version = "0.3.0";
        sha256 = "0wpc2v55q6gwn70nlk2x5xd4dk9a8aw2ivl1gr0xhdp1dnn5dhcb";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "The Data.MultiSet container type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92275,10 +94625,10 @@ self: {
      mkDerivation {
        pname = "multiset-comb";
        version = "0.2.4";
-       revision = "1";
        sha256 = "0j7vxm67aws7dzlmdkvx2aja888jp22qdzz8hgmhvbpcr4p7lz99";
+       revision = "1";
        editedCabalFile = "b6ecbed315e0578b665644b8a73ed1e348968e5a93bb1d491fb5a6faf79d7545";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        description = "Combinatorial algorithms over multisets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92289,7 +94639,7 @@ self: {
        pname = "multisetrewrite";
        version = "0.6";
        sha256 = "1chgdikgp70rkzw2k3wy7i276j5vb435vq26yl37lkh0im1bg5ay";
-       buildDepends = [ base haskell98 stm ];
+       libraryHaskellDepends = [ base haskell98 stm ];
        homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html";
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
        license = stdenv.lib.licenses.bsd3;
@@ -92304,8 +94654,8 @@ self: {
        sha256 = "0s8x0gb332724sd3vcp5yimxpbf85kvg327lg3bb77jvy6cfdzvj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl tagged transformers ];
-       testDepends = [ base hspec transformers ];
+       libraryHaskellDepends = [ base mtl tagged transformers ];
+       testHaskellDepends = [ base hspec transformers ];
        homepage = "https://github.com/lspitzner/multistate";
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
@@ -92322,7 +94672,7 @@ self: {
        sha256 = "0s11xvhawwrcr31f0khp0q6fimwjps12n992z35ldnh0kk3dmk9z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html ConfigFile directory Glob happstack-server
          HStringTemplate markdown MissingH process text
        ];
@@ -92340,7 +94690,7 @@ self: {
        pname = "murder";
        version = "1.3.4";
        sha256 = "0pr77j3br8knk26iknsa6hy076bx2bb6jgii3v6aqhv40ykcrv15";
-       buildDepends = [
+       libraryHaskellDepends = [
          AspectAG base containers HList ListLike template-haskell TTTAS
          uu-parsinglib uulib
        ];
@@ -92357,7 +94707,7 @@ self: {
        pname = "murmur-hash";
        version = "0.1.0.8";
        sha256 = "01isk1gy1x75zksdmddcpp7mnx69wb96g1xv8gl3anvx9bfg9fbc";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/nominolo/murmur-hash";
        description = "MurmurHash2 implementation for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -92372,8 +94722,8 @@ self: {
        pname = "murmur3";
        version = "1.0.0";
        sha256 = "1rdnfy37dmmrqpapdv9h22ki94mxrz1xdk5ibcj833q35868kjmq";
-       buildDepends = [ base binary bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       testHaskellDepends = [
          base base16-bytestring bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -92388,7 +94738,7 @@ self: {
        pname = "murmurhash3";
        version = "1.0";
        sha256 = "1hz6rf1qrzgixx19bn9hnp07jfb61wnrjq5bgqnd3px569afwdb2";
-       buildDepends = [ haskell2010 ];
+       libraryHaskellDepends = [ haskell2010 ];
        homepage = "https://github.com/niswegmann/murmurhash3";
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
@@ -92401,7 +94751,7 @@ self: {
        pname = "music-articulation";
        version = "1.9.0";
        sha256 = "0cxbhk25kn3hpkmb6h0brcf03yyi6kaz3i3l3lv2rzgfxv14a2pg";
-       buildDepends = [ average base semigroups ];
+       libraryHaskellDepends = [ average base semigroups ];
        description = "Abstract representation of musical articulation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92412,7 +94762,7 @@ self: {
        pname = "music-diatonic";
        version = "0.1.1";
        sha256 = "19sflj0b5qslclqjwyacgc2pdplwr3mimmhf8ka7bbs70r557wbs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Implementation of basic western musical theory objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92424,7 +94774,9 @@ self: {
        pname = "music-dynamics";
        version = "1.9.0";
        sha256 = "12a11qrdy4p0bczpg2zp8yqw4wdmgfhq5z9ffajlsib2xcs6y8s4";
-       buildDepends = [ average base music-dynamics-literal semigroups ];
+       libraryHaskellDepends = [
+         average base music-dynamics-literal semigroups
+       ];
        description = "Abstract representation of musical dynamics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92435,7 +94787,7 @@ self: {
        pname = "music-dynamics-literal";
        version = "1.9.0";
        sha256 = "19bql45aqjfkhvpkfbvfcsc8p1mzg93n966r1yv5rwps6s2x86d5";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded dynamics literals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92448,7 +94800,7 @@ self: {
        pname = "music-graphics";
        version = "1.8.1";
        sha256 = "1764qmb8pafddsclr5gl5ibqpi9wvwa96idn6iqx8d3jbpqc4fam";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-svg bytestring lens music-pitch music-preludes
          music-score process
        ];
@@ -92468,7 +94820,7 @@ self: {
        pname = "music-parts";
        version = "1.9.0";
        sha256 = "1kiz968kcwcyczxg5gl40c7bwgkn86l7qi0ak8p68bm4rmsw9id4";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions aeson base bytestring cassava containers data-default
          lens monadplus music-dynamics music-pitch roman-numerals semigroups
          vector-space vector-space-points
@@ -92487,13 +94839,12 @@ self: {
        pname = "music-pitch";
        version = "1.9.0";
        sha256 = "1w5b62il0n8147a3sdvx9ndykfp56nf0kabwpw8khd29cmpff0bz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers data-interval lens music-pitch-literal nats
          positive semigroups type-unary vector-space vector-space-points
        ];
        description = "Musical pitch representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-pitch-literal" = callPackage
@@ -92502,7 +94853,7 @@ self: {
        pname = "music-pitch-literal";
        version = "1.9.0";
        sha256 = "0vsvw7c29qvi69z9gy2zzq9bpajmjd5vs1kll7jw0qbsh28jsqql";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded pitch literals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92521,14 +94872,15 @@ self: {
        sha256 = "1fqw3rz0zrwa5a0l639b0bd6qxiq4zmqcrf0vkrgh03n65r2901q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async average base containers filepath lens lilypond monadplus
          music-articulation music-dynamics music-dynamics-literal
          music-parts music-pitch music-pitch-literal music-score musicxml2
          optparse-applicative process semigroups split temporary unix
          vector-space vector-space-points
        ];
-       testDepends = [ base process tasty tasty-golden ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92546,7 +94898,7 @@ self: {
        pname = "music-score";
        version = "1.9.0";
        sha256 = "10cysii04njrjd0qx14fwsjn91ycvfxcs3kvwnb8j24v3svcha10";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions aeson average base base-orphans bifunctors colour
          comonad containers contravariant distributive HCodecs lens lilypond
          monadplus mtl music-dynamics-literal music-pitch-literal musicxml2
@@ -92569,7 +94921,7 @@ self: {
        pname = "music-sibelius";
        version = "1.9.0";
        sha256 = "1yahz8z81ggcg303i2syzf6bsxq8dmzzzqs3fj89r5kq766275kz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring lens monadplus music-articulation
          music-dynamics music-parts music-pitch music-pitch-literal
          music-preludes music-score semigroups unordered-containers
@@ -92588,7 +94940,7 @@ self: {
        pname = "music-suite";
        version = "1.9.0";
        sha256 = "1nss12cad2vjq2whz5kxsr1r63iwc4pnza0nnf2h2zai3gxzsnn6";
-       buildDepends = [
+       libraryHaskellDepends = [
          abcnotation lilypond music-articulation music-dynamics
          music-dynamics-literal music-parts music-pitch music-pitch-literal
          music-preludes music-score musicxml2
@@ -92608,7 +94960,7 @@ self: {
        sha256 = "0pv6mwdrk2kz3lr8r3jkc368zch46w4rn5dmqbjqm0ykfw1n3bqf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory fgl process shelly split text unix
        ];
        description = "Utility for developing the Music Suite";
@@ -92630,12 +94982,15 @@ self: {
        sha256 = "10salrdl4vfdy3x26564i8kdv6lx8py697v5n8q9ywqsd05dcrv2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson amqp base blaze-builder errors ghc-prim heist HTTP mime-mail
-         mtl network network-metrics optparse-applicative postgresql-simple
-         text time transformers xmlhtml
+       libraryHaskellDepends = [
+         aeson amqp base ghc-prim mime-mail optparse-applicative text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson amqp base blaze-builder errors heist HTTP mime-mail mtl
+         network network-metrics optparse-applicative postgresql-simple text
+         time transformers xmlhtml
+       ];
+       testHaskellDepends = [
          aeson amqp base blaze-builder bytestring configurator errors
          ghc-prim heist HTTP HUnit mime-mail mtl postgresql-simple
          smallcheck stm test-framework test-framework-hunit
@@ -92656,7 +95011,9 @@ self: {
        pname = "musicxml";
        version = "0.1.2";
        sha256 = "0sn8gzymf6xpdksd7v2xyb4y2iks2l09hyw0rch109lgrnsy5gp8";
-       buildDepends = [ base containers directory HaXml old-time pretty ];
+       libraryHaskellDepends = [
+         base containers directory HaXml old-time pretty
+       ];
        jailbreak = true;
        homepage = "https://troglodita.di.uminho.pt/svn/musica/work/MusicXML";
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
@@ -92673,7 +95030,7 @@ self: {
        pname = "musicxml2";
        version = "1.9.0";
        sha256 = "07axlifkqf0dcqnxfb62x829ygc2y7didsh60x081zw429853fy8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default music-dynamics-literal music-pitch-literal nats
          reverse-apply semigroups type-unary xml
        ];
@@ -92692,7 +95049,11 @@ self: {
        sha256 = "0mkj5ngcblm949wkxiq2qck3zak93r5zipppwgis59yg01cp79v2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring directory parsec pretty-show scientific text
+         transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [
          aeson base bytestring directory optparse-applicative parsec
          pretty-show scientific text transformers unordered-containers
          vector
@@ -92713,7 +95074,7 @@ self: {
        sha256 = "1m15q6dy3hbbf5q302gw3y2znxf2mfz9pwbdyawg8bqiw81zahis";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder bytestring filepath haskell-src parsec text
          transformers utf8-string
        ];
@@ -92731,10 +95092,10 @@ self: {
        pname = "mutable-containers";
        version = "0.3.0";
        sha256 = "1xsz214z5z1qrl5xy5gyq97bsh8b1li3kaz7cp6zm955bz43rv6c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim mono-traversable primitive vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec primitive QuickCheck vector
        ];
        homepage = "https://github.com/fpco/mutable-containers";
@@ -92750,7 +95111,7 @@ self: {
        pname = "mutable-iter";
        version = "0.6.1";
        sha256 = "08fqfkzb6b0pzzffkfcwigcm0s4hgadh7jl4pg6smjcyfjz9572f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base iteratee MonadCatchIO-transformers transformers vector
        ];
        jailbreak = true;
@@ -92770,7 +95131,7 @@ self: {
        sha256 = "0nd1c4l2z7bflnghz7bbbahpfl2jj9mygpygxc7028axrrxj09af";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath hslogger hslogger-template mtl network-dbus
          process
        ];
@@ -92788,7 +95149,7 @@ self: {
        pname = "mvc";
        version = "1.1.0";
        sha256 = "115cg7xlkk0zj3qdhwm35397vbp1s28h3j0ipw2a9i9ap16d7x1i";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
        ];
@@ -92802,7 +95163,7 @@ self: {
        pname = "mvc-updates";
        version = "1.2.0";
        sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6";
-       buildDepends = [ async base foldl mvc ];
+       libraryHaskellDepends = [ async base foldl mvc ];
        jailbreak = true;
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
@@ -92818,7 +95179,7 @@ self: {
        pname = "mvclient";
        version = "0.4";
        sha256 = "12ckzfb6wwa3865isxnzw7xmwh9f43ali0ab5mal6brs33zz0z53";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols binary bytestring containers
          control-event Crypto data-binary-ieee754 hexpat http-enumerator
          maccatcher mtl network parsec time uuid
@@ -92838,8 +95199,8 @@ self: {
        pname = "mwc-random";
        version = "0.13.3.2";
        sha256 = "01jqmq52knlwskgyx7940c81dmgdivrj0sbi2h6l0ccbxiaf7c9c";
-       buildDepends = [ base primitive time vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base primitive time vector ];
+       testHaskellDepends = [
          base HUnit QuickCheck statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -92856,12 +95217,11 @@ self: {
        pname = "mwc-random-monad";
        version = "0.7.3.1";
        sha256 = "0h4ljwwhqg4yy513lqk2ix0m9q2hmk276hgfrc6n3ja6wqbpkwyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-primitive mwc-random primitive transformers vector
        ];
        description = "Monadic interface for mwc-random";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "myTestlll" = callPackage
@@ -92873,15 +95233,17 @@ self: {
      mkDerivation {
        pname = "myTestlll";
        version = "1.0.0";
-       revision = "4";
        sha256 = "1rd3pxc20xwb3j0q9ckygy59mks8p38vzmi4wfg8zp1dq92jmhy0";
+       revision = "4";
        editedCabalFile = "e554b67c3f8efd73e028328341e3b535dc4898b3d476524a40c236c4c2871e43";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base bytestring CCA containers deepseq ghc-prim
          HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm
          syb template-haskell UISF
        ];
-       testDepends = [ ansi-terminal base Cabal Euterpea QuickCheck ];
+       testHaskellDepends = [
+         ansi-terminal base Cabal Euterpea QuickCheck
+       ];
        jailbreak = true;
        homepage = "http://haskell.cs.yale.edu/";
        description = "None";
@@ -92895,7 +95257,9 @@ self: {
        pname = "mybitcoin-sci";
        version = "0.3";
        sha256 = "1iy84z13i98wbkman7yp2y2821yzf3xxpcy10rh9bdskjijvgjnq";
-       buildDepends = [ base cgi curl directory mtl process split ];
+       libraryHaskellDepends = [
+         base cgi curl directory mtl process split
+       ];
        description = "Binding to mybitcoin.com's Shopping Cart Interface.";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -92911,14 +95275,16 @@ self: {
        sha256 = "0sn3ic3h94ff57igs61l2cq82y6xxz87qflm8dykwwy721swq1qn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers inline-c lens-family lens-family-th
          scientific template-haskell text vector websockets
        ];
-       testDepends = [ base tasty tasty-hunit ];
+       executableHaskellDepends = [ aeson base lens-family websockets ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "http://github.com/adinapoli/myo";
        description = "Haskell binding to the Myo armband";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysnapsession" = callPackage
@@ -92929,7 +95295,7 @@ self: {
        pname = "mysnapsession";
        version = "0.4.1";
        sha256 = "0871nq9nhpslni5kfldwiswhvpk1aajj7ikyiy9ikmcq16fb1z9m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal clientsession containers mtl random
          regex-posix snap snap-core time
        ];
@@ -92949,7 +95315,7 @@ self: {
        sha256 = "0lxzn8fn97f1j3fx97f46m16y25w7m1w84l59r75xisr662gc9lz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring clientsession heist mtl mysnapsession snap
          snap-core snap-server text time
        ];
@@ -92960,19 +95326,17 @@ self: {
      }) {};
 
   "mysql" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mysql, openssl, zlib
-     }:
+    ({ mkDerivation, base, bytestring, containers, mysql }:
      mkDerivation {
        pname = "mysql";
        version = "0.1.1.8";
        sha256 = "115xz4khg4klrgjvv9dy83pv197b4y1zgw6fbpv8j88yr3qjmw4h";
-       buildDepends = [ base bytestring containers ];
-       buildTools = [ mysql ];
-       extraLibraries = [ openssl zlib ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ mysql ];
        homepage = "https://github.com/bos/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-     }) { mysql = null;  inherit (pkgs) openssl;  inherit (pkgs) zlib;};
+     }) { mysql = null;};
 
   "mysql-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, mysql
@@ -92981,10 +95345,10 @@ self: {
      mkDerivation {
        pname = "mysql-effect";
        version = "0.2.0.3";
-       revision = "1";
        sha256 = "11fpsh4w2zlqdqhk5snb276pcbx4p9g1igs94fympa9asfr2rxm3";
+       revision = "1";
        editedCabalFile = "d4474591079b806b8e26d102824d46c7e4c239afb3479ea8d1e8cbd39f015718";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-effects mysql mysql-simple
        ];
        jailbreak = true;
@@ -93002,7 +95366,7 @@ self: {
        pname = "mysql-simple";
        version = "0.2.2.5";
        sha256 = "132igmgrgkpc0g9063d593ha3iv40k5dd017nlb07sz0qs9hi8w6";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder blaze-textual
          bytestring mysql old-locale pcre-light text time
        ];
@@ -93019,7 +95383,7 @@ self: {
        pname = "mysql-simple-quasi";
        version = "1.0.0.2";
        sha256 = "1ggqqjn83rx23qk7lzrcgj1arjhmhi85xfl7d2pz27rrjx2ywpn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta mysql-simple template-haskell
        ];
        description = "Quasi-quoter for use with mysql-simple";
@@ -93035,7 +95399,7 @@ self: {
        pname = "mysql-simple-typed";
        version = "0.1.1.2";
        sha256 = "19wnvmrb523n8xl5cp9kypcqcrs0xs8pwdk771y1bdin5ds9j095";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mysql mysql-simple template-haskell typedquery utf8-string
        ];
        homepage = "https://github.com/tolysz/mysql-simple-typed";
@@ -93050,7 +95414,7 @@ self: {
        pname = "mzv";
        version = "0.1.0.2";
        sha256 = "044x87jzyqsg5npp3s0mncgcl0gv26h6hzhc7bbgjja95x16ma2l";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/ifigueroap/mzv";
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
@@ -93066,7 +95430,8 @@ self: {
        sha256 = "189ybl8fb70cf24zhnjcmgrgkshrf2ziacklg9ixgvnbdp3abb7m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HSH mtl process ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base HSH mtl process ];
        description = "Utility to call iwconfig";
        license = "unknown";
      }) {};
@@ -93079,10 +95444,10 @@ self: {
        pname = "nagios-check";
        version = "0.3.1";
        sha256 = "17ww3n2y6cmjc3n05cra43csk60sm5s07q2mn3zq1sjiiq2cw82c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors exceptions mtl nagios-perfdata text
        ];
-       testDepends = [ base hspec QuickCheck text ];
+       testHaskellDepends = [ base hspec QuickCheck text ];
        homepage = "https://github.com/fractalcat/haskell-nagios-check";
        description = "Package for writing monitoring plugins";
        license = stdenv.lib.licenses.mit;
@@ -93096,10 +95461,10 @@ self: {
        pname = "nagios-perfdata";
        version = "0.2.2";
        sha256 = "159m45fvxgdabh7n24bkmg2901y3792afcrccqna1in3ha9vxd22";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers mtl
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec HUnit MissingH transformers
        ];
        homepage = "https://github.com/anchor/nagios-perfdata";
@@ -93118,11 +95483,12 @@ self: {
        sha256 = "1rk6sphxn93kmayjs0y386g1llhgbw8jpwhfkhlrbv9c395gxkrh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers lens nagios-check
          optparse-applicative text transformers unordered-containers wreq
        ];
-       testDepends = [
+       executableHaskellDepends = [ base nagios-check text ];
+       testHaskellDepends = [
          base bytestring hspec HUnit nagios-check text transformers
        ];
        homepage = "https://github.com/fractalcat/nagios-plugin-ekg";
@@ -93139,7 +95505,7 @@ self: {
        pname = "named-formlet";
        version = "0.2";
        sha256 = "0wpjxn03cnxnn5x1706byl9d1129g9p1vkl1a1v9qw0afgzlj8y7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers mtl text transformers
        ];
        description = "A simple formlet library with named formlets";
@@ -93152,7 +95518,7 @@ self: {
        pname = "named-lock";
        version = "0.1";
        sha256 = "1db12f2q395yk6pwz5gnb2q0kf4s868z8d1vvwa7vngnfc1h924i";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/named-lock";
        description = "A named lock that is created on demand";
@@ -93166,7 +95532,7 @@ self: {
        pname = "named-records";
        version = "0.5";
        sha256 = "0ykcmmnns63zjfd00kd9941c33l19n9c5b5xkin4n7r9v0qvirwr";
-       buildDepends = [ base binary names template-haskell ];
+       libraryHaskellDepends = [ base binary names template-haskell ];
        description = "Flexible records with named fields";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93179,8 +95545,10 @@ self: {
        pname = "namelist";
        version = "0.1.0";
        sha256 = "0sfiqd1dh3frzwnqz4fjh0wg8m55cprqw8ywvcaszrp5gq3mj74s";
-       buildDepends = [ base case-insensitive data-default-class parsec ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base case-insensitive data-default-class parsec
+       ];
+       testHaskellDepends = [
          base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/philopon/namelist-hs";
@@ -93194,7 +95562,7 @@ self: {
        pname = "names";
        version = "0.3.1";
        sha256 = "0sjjp90zfrkjavj8fqyscnvc9d72mkvv8f7ajd47jba92mhwzr5g";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Type level names";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93205,7 +95573,7 @@ self: {
        pname = "names-th";
        version = "0.1.0.1";
        sha256 = "1bqbh6751lmiiwvdvry796lzzbjkk8x1lhylkh61l6ycdib2qxjq";
-       buildDepends = [ base containers template-haskell ];
+       libraryHaskellDepends = [ base containers template-haskell ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Manipulate name strings for TH";
        license = stdenv.lib.licenses.bsd3;
@@ -93217,7 +95585,7 @@ self: {
        pname = "nano-cryptr";
        version = "0.1.1.3";
        sha256 = "1pqwzl8l48c4q83jhjj11jd3kwwa0ail2c6kv3k38kig9yvj7ff8";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/chowells79/nano-cryptr";
        description = "A threadsafe binding to glibc's crypt_r function";
        license = stdenv.lib.licenses.bsd3;
@@ -93230,8 +95598,8 @@ self: {
        pname = "nano-hmac";
        version = "0.2.0";
        sha256 = "0rrwa1c3mval1jm4siqyx1vk14ibifya62hni13cimcdafj35fnq";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ openssl ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ openssl ];
        homepage = "http://www.jasani.org/search/label/nano-hmac";
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
@@ -93244,8 +95612,8 @@ self: {
        pname = "nano-md5";
        version = "0.1.2";
        sha256 = "18db3y76w0kv2m7h3lrqxcag4lc7519b2j80113g6hhm1wxkpabk";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ openssl ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ openssl ];
        homepage = "http://code.haskell.org/~dons/code/nano-md5";
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
@@ -93262,7 +95630,7 @@ self: {
        sha256 = "034mwssj296xn7j123sqvfl9rv1bwnj1v5sw5l34481dk5zsi9sm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base BNFC-meta cmdargs containers mtl parsec pretty transformers
        ];
        jailbreak = true;
@@ -93277,8 +95645,8 @@ self: {
        pname = "nanocurses";
        version = "1.5.2";
        sha256 = "04kgf3vvjdx6d1fmfzp0xy5x42zlg0ij59ayi1zhz8hkwsfn5g1m";
-       buildDepends = [ base bytestring unix ];
-       extraLibraries = [ ncurses ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ ncurses ];
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
@@ -93291,8 +95659,8 @@ self: {
        pname = "nanomsg";
        version = "0.1.1";
        sha256 = "06jb8s3jxjiz7r6dn8xx33xqd76f2r5q1mshsz41z4q0khf4wdp3";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ nanomsg ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ nanomsg ];
        jailbreak = true;
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
@@ -93306,12 +95674,12 @@ self: {
        pname = "nanomsg-haskell";
        version = "0.2.2";
        sha256 = "1p4d0qdyqfg4qidcdcddjnyw4x2q8551ka6bsryz9b6dpj6kywch";
-       buildDepends = [ base binary bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       librarySystemDepends = [ nanomsg ];
+       testHaskellDepends = [
          base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       extraLibraries = [ nanomsg ];
        homepage = "https://github.com/ivarnymoen/nanomsg-haskell";
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
@@ -93324,7 +95692,7 @@ self: {
        pname = "nanoparsec";
        version = "0.1.1";
        sha256 = "00ghdzkzshk24g7v42hq7zq0dxsq8vjpkslj41dxdnx0zizwbn3m";
-       buildDepends = [ base bytestring ListLike ];
+       libraryHaskellDepends = [ base bytestring ListLike ];
        jailbreak = true;
        description = "An implementation of attoparsec-like parser around list-like";
        license = stdenv.lib.licenses.bsd3;
@@ -93336,8 +95704,8 @@ self: {
        pname = "nanospec";
        version = "0.2.1";
        sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv";
-       buildDepends = [ base ];
-       testDepends = [ base hspec silently ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec silently ];
        description = "A lightweight implementation of a subset of Hspec's API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93348,7 +95716,7 @@ self: {
        pname = "narc";
        version = "0.1.3";
        sha256 = "1ng1rzj1lf6h9g3pk8gsz05bnck72rp5j62iwn82vlcw8pyk0fsc";
-       buildDepends = [ base HDBC HUnit mtl QuickCheck random ];
+       libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
        homepage = "http://ezrakilty.net/projects/narc";
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -93361,7 +95729,7 @@ self: {
        pname = "nat";
        version = "0.3";
        sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Lazy binary natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93374,7 +95742,7 @@ self: {
        pname = "nationstates";
        version = "0.2.0.0";
        sha256 = "07rs7c5pvq6x8icg5pzk613vazcnnl3rfrcsf3zw6i8gaxh0dq48";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clock containers http-client http-client-tls
          http-types multiset transformers xml
        ];
@@ -93402,11 +95770,11 @@ self: {
        pname = "nats-queue";
        version = "0.1.2.0";
        sha256 = "0gqgqf87dzja0yhfpazqbdpvia1jisarhnph9bxvb3mfl4is9sgf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bytestring containers dequeue network network-uri
          random text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers dequeue hspec network network-uri
          random text
        ];
@@ -93423,7 +95791,7 @@ self: {
        pname = "natural-number";
        version = "1.0";
        sha256 = "1n8qgjbi4c50pwynlya4bjxd6lpwj00257drqk04mlrr3nw3gp5x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base type-equality type-level-natural-number
          type-level-natural-number-induction
        ];
@@ -93439,7 +95807,7 @@ self: {
        pname = "natural-numbers";
        version = "0.1.2.0";
        sha256 = "0cj9lnnlvry425bkixqv9fh5b9xhy7dmwcqsxprj6lamccvxspwn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/natural-numbers";
        description = "Natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -93451,7 +95819,7 @@ self: {
        pname = "natural-sort";
        version = "0.1.2";
        sha256 = "0l3bkbqzrlpdhzazqqlx71ah0m13ypa0981qvw3sn9q8d0sbfwkv";
-       buildDepends = [ base bytestring parsec text ];
+       libraryHaskellDepends = [ base bytestring parsec text ];
        homepage = "https://john-millikin.com/software/natural-sort/";
        description = "User-friendly text collation";
        license = stdenv.lib.licenses.bsd3;
@@ -93465,8 +95833,8 @@ self: {
        pname = "natural-transformation";
        version = "0.2";
        sha256 = "1fxgbjf74kdag42hscplc5sn63z0idz2z2yykk1jz4zp71wa0wdp";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
        ];
        homepage = "https://github.com/ku-fpg/natural-transformation";
@@ -93480,7 +95848,7 @@ self: {
        pname = "naturalcomp";
        version = "0.0.3";
        sha256 = "1l594lkd3yb52lhh0raygvk3jlzwkcc2pmcqjmg02dmd6j6mw42x";
-       buildDepends = [ base text utf8-string ];
+       libraryHaskellDepends = [ base text utf8-string ];
        homepage = "not yet available";
        description = "Natural-order string comparison";
        license = stdenv.lib.licenses.bsd3;
@@ -93492,7 +95860,7 @@ self: {
        pname = "naturals";
        version = "0.2.0.2";
        sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "frigidcode.com";
        description = "Constructors and related functions for natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -93507,8 +95875,8 @@ self: {
        pname = "nbt";
        version = "0.5.1";
        sha256 = "08184rn4mwxd2m2fnqvja23jpkzlkvb8d2vn8i4rqcil136wb6q0";
-       buildDepends = [ array base bytestring cereal text ];
-       testDepends = [
+       libraryHaskellDepends = [ array base bytestring cereal text ];
+       testHaskellDepends = [
          array base bytestring cereal HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text zlib
        ];
@@ -93528,7 +95896,7 @@ self: {
        sha256 = "0w5nddirsib9vz96dpan9bgdg1mag9gaz7w7ix51l44ls9r8yn3m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array attoparsec base bytestring containers gtk hflags lens pipes
          stm unix
        ];
@@ -93545,10 +95913,9 @@ self: {
        pname = "ncurses";
        version = "0.2.11";
        sha256 = "08jr224i37jxrprka9c276sid6mw001m8r2krd6g8jscshwd5nzk";
-       buildDepends = [ base containers text transformers ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ ncurses ];
-       patchPhase = "find . -type f -exec sed -i -e 's|ncursesw/||' {} \\;";
+       libraryHaskellDepends = [ base containers text transformers ];
+       librarySystemDepends = [ ncurses ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://john-millikin.com/software/haskell-ncurses/";
        description = "Modernised bindings to GNU ncurses";
        license = stdenv.lib.licenses.gpl3;
@@ -93560,7 +95927,9 @@ self: {
        pname = "ndjson-conduit";
        version = "0.1.0.2";
        sha256 = "0fxxnbccasyhxd5yykzkvrj09zci8is7yqfjw0wg11n1p00hzahj";
-       buildDepends = [ aeson attoparsec base bytestring conduit ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit
+       ];
        homepage = "https://github.com/srijs/haskell-ndjson-conduit";
        description = "Conduit-based parsing and serialization for newline delimited JSON";
        license = stdenv.lib.licenses.mit;
@@ -93574,7 +95943,8 @@ self: {
        sha256 = "0lh5clnlfkzd5d9zmm9r92wpzrp8g7x6ndml7wajr882s53dv6jk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath parsec ];
+       libraryHaskellDepends = [ base filepath parsec ];
+       executableHaskellDepends = [ base filepath parsec ];
        homepage = "https://github.com/ajg/neat";
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
@@ -93588,8 +95958,10 @@ self: {
        pname = "neat-interpolation";
        version = "0.2.2.1";
        sha256 = "00xkhc25s675pcg5s3fiq3l57zsslc0vps44gmwwas4gnz27wdfy";
-       buildDepends = [ base base-prelude parsec template-haskell ];
-       testDepends = [ base-prelude HTF ];
+       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";
@@ -93604,7 +95976,7 @@ self: {
        pname = "needle";
        version = "0.1.0.1";
        sha256 = "1p7hmja7mvdbd10jv7bzr5b9i18l9nghdcvvxpn9xvfm8ycz7yg2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-meta mtl parsec parsec-extra
          template-haskell text vector
        ];
@@ -93623,7 +95995,7 @@ self: {
        pname = "neet";
        version = "0.4.0.0";
        sha256 = "1x0l6cpjc9pjirjndh47asmva8jx5wc6gq8vab1ik2090ph0w1v5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal containers graphviz MonadRandom multimap parallel
          random transformers
        ];
@@ -93643,7 +96015,7 @@ self: {
        sha256 = "00zll88gk44l22lqxv47v4j5ipfapy5599ld8fcsvhk57nfcm2r0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring cereal directory GLFW-b GLURaw OpenGLRaw
          random
        ];
@@ -93661,7 +96033,7 @@ self: {
        sha256 = "0cg4x4b2x81d3mbk8nhwqib3pr154hd0snh160bfbm3b31yfr19k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers directory extra filepath GoogleChart json
          old-time process time
        ];
@@ -93676,7 +96048,7 @@ self: {
        pname = "neither";
        version = "0.3.1.1";
        sha256 = "192l840yb1pprfjjq7ax5xaraagl1pbmsidkg1yibp6r4azd61yf";
-       buildDepends = [ base failure transformers ];
+       libraryHaskellDepends = [ base failure transformers ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/neither";
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
@@ -93691,7 +96063,7 @@ self: {
        pname = "nemesis";
        version = "2015.5.4";
        sha256 = "149fx29818cf9rxp1gp64w5l288l4whij7im5rfms3rlgj95w6ji";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-th base containers directory dlist Glob mtl process time
        ];
        homepage = "http://github.com/nfjinjing/nemesis";
@@ -93707,14 +96079,13 @@ self: {
        pname = "nemesis-titan";
        version = "2014.5.19";
        sha256 = "183m6wz52lrf5kfwxz11ad7v5zazv4gcf1c2rcylh2ys6zda4xmd";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-th base bytestring directory filepath hspec HStringTemplate
          nemesis random uuid
        ];
        homepage = "http://github.com/nfjinjing/nemesis-titan";
        description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nerf" = callPackage
@@ -93729,11 +96100,12 @@ self: {
        sha256 = "18rkjgk2r6784mjbdd2lydv9yac252xvj18m78bbaplnac1504ak";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cmdargs containers crf-chain1 data-named
-         dawg directory filepath IntervalMap monad-ox mtl network polimorf
-         polysoup sgd tagsoup temporary text text-binary tokenize vector
+         dawg IntervalMap monad-ox mtl network polimorf polysoup sgd tagsoup
+         text text-binary tokenize vector
        ];
+       executableHaskellDepends = [ directory filepath temporary ];
        jailbreak = true;
        homepage = "https://github.com/kawu/nerf";
        description = "Nerf, the named entity recognition tool based on linear-chain CRFs";
@@ -93749,8 +96121,10 @@ self: {
        pname = "nero";
        version = "0.3.1";
        sha256 = "1nmikqdxih91xhppn72a4xsrszj4050xl9winjsm62k5wdm9ld50";
-       buildDepends = [ base bifunctors bytestring containers lens text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bifunctors bytestring containers lens text
+       ];
+       testHaskellDepends = [
          base bytestring doctest Glob lens tasty tasty-hunit text
        ];
        homepage = "https://github.com/plutonbrb/nero";
@@ -93767,7 +96141,7 @@ self: {
        pname = "nero-wai";
        version = "0.3";
        sha256 = "1jz2was51lfqiq1krrjljy7yl2z49nlj72x9dspc748dznizb8aw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types lens nero text wai wai-extra
        ];
        homepage = "https://github.com/plutonbrb/nero-wai";
@@ -93782,7 +96156,7 @@ self: {
        pname = "nero-warp";
        version = "0.3";
        sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s";
-       buildDepends = [ base nero nero-wai warp ];
+       libraryHaskellDepends = [ base nero nero-wai warp ];
        homepage = "https://github.com/plutonbrb/nero-warp";
        description = "Run Nero server applications with Warp";
        license = stdenv.lib.licenses.bsd3;
@@ -93800,13 +96174,13 @@ self: {
        pname = "nested-routes";
        version = "3.2.0";
        sha256 = "02mj54a797h9ywa0985xw8pspl953xgn813r6mz2apx0mk6gp1xg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-html bytestring clay composition
          constraints containers http-media http-types lucid mtl poly-arity
          pred-trie regex-compat semigroups shakespeare text transformers wai
          wai-extra wai-util witherable
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base blaze-html bytestring composition constraints
          containers hspec hspec-wai http-media http-types lucid mtl
          poly-arity pred-trie regex-compat semigroups shakespeare text
@@ -93822,8 +96196,8 @@ self: {
        pname = "nested-sets";
        version = "0.0.1.1";
        sha256 = "0a3ppsl6x9yh2pvx7fyir1khdg99wlx9d9zjflamv3gcck3d8p4i";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hspec ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers hspec ];
        description = "Nested set model implementation";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -93836,8 +96210,8 @@ self: {
        pname = "nestedmap";
        version = "0.1.0.3";
        sha256 = "1his95sqzyr5xb7iihz62vp9y32smf5wy4ck81yrxdvkn6zvhajl";
-       buildDepends = [ base base-unicode-symbols containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base base-unicode-symbols containers ];
+       testHaskellDepends = [
          base base-unicode-symbols containers data-ordlist hspec QuickCheck
        ];
        jailbreak = true;
@@ -93853,7 +96227,7 @@ self: {
        pname = "net-concurrent";
        version = "0.1.0";
        sha256 = "0ar5y38nqgh10y23yxjcz0vlvdj2hcp2b2kq0srmbh17iw8d8906";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers ghc-binary hslogger monad-loops network
        ];
        jailbreak = true;
@@ -93869,7 +96243,7 @@ self: {
        pname = "netclock";
        version = "0.6";
        sha256 = "0vskyczfhv9bszl2hnr6j9cvhkfampja5s41kh6i9wk8j9kpf9p8";
-       buildDepends = [ base bytestring hosc network ];
+       libraryHaskellDepends = [ base bytestring hosc network ];
        homepage = "http://netclock.slab.org/";
        description = "Netclock protocol";
        license = stdenv.lib.licenses.gpl3;
@@ -93886,12 +96260,12 @@ self: {
        pname = "netcore";
        version = "1.0.0";
        sha256 = "0biqhmfvszwmmnpgja6qk3k2s5ynx4l659zq9awrxr0637dc19a5";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bimap binary binary-strict bytestring
          containers fgl HList hslogger mtl multiset network parsec process
          random syb
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-wl-pprint base bimap binary binary-strict bytestring
          containers fgl HList hslogger HUnit mtl multiset network parsec
          process QuickCheck random syb test-framework test-framework-hunit
@@ -93914,9 +96288,10 @@ self: {
        sha256 = "006ca49rhh09lz8did0sil2f0xp1ggk69d4dqb2kx12drijp1jgj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring contstuff enumerator HTF random text time
+       libraryHaskellDepends = [
+         base bytestring contstuff enumerator text time
        ];
+       executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93930,10 +96305,10 @@ self: {
        pname = "netlink";
        version = "0.1";
        sha256 = "0w2iyxmmk53k8gg0i8g3339dkdlpjgj39ar0kmsrzhxa6nakclwn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers monad-loops unix
        ];
-       buildTools = [ c2hs ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "http://netlink-hs.googlecode.com/";
        description = "Netlink communication for Haskell";
@@ -93946,7 +96321,7 @@ self: {
        pname = "netlist";
        version = "0.3.1";
        sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67";
-       buildDepends = [ base binary containers syb ];
+       libraryHaskellDepends = [ base binary containers syb ];
        description = "Netlist AST";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93957,7 +96332,7 @@ self: {
        pname = "netlist-to-vhdl";
        version = "0.3.2";
        sha256 = "107pkkihj62qjkfwrnhwfscpph5r76lx6r3s0m3b0dbsf1jy2a61";
-       buildDepends = [ base netlist pretty ];
+       libraryHaskellDepends = [ base netlist pretty ];
        description = "Convert a Netlist AST to VHDL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93971,11 +96346,11 @@ self: {
        pname = "netpbm";
        version = "1.0.1";
        sha256 = "02gj7m7gmislrkpk0mn5qb66z77zqy2k3py5c965bcjm086pk3fc";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring storable-record
          unordered-containers vector vector-th-unbox
        ];
-       testDepends = [ base bytestring hspec HUnit vector ];
+       testHaskellDepends = [ base bytestring hspec HUnit vector ];
        homepage = "https://github.com/nh2/haskell-netpbm";
        description = "Loading PBM, PGM, PPM image files";
        license = stdenv.lib.licenses.mit;
@@ -93988,11 +96363,11 @@ self: {
      mkDerivation {
        pname = "netrc";
        version = "0.2.0.0";
-       revision = "1";
        sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
+       revision = "1";
        editedCabalFile = "55e4e8785866fa2145f9b4de21522d4092a7c486845062915704b2917b8c4fbd";
-       buildDepends = [ base bytestring deepseq parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq parsec ];
+       testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
        ];
        homepage = "https://github.com/hvr/netrc";
@@ -94008,7 +96383,7 @@ self: {
        pname = "netspec";
        version = "0.2.0.0";
        sha256 = "0qmca5pf6r0zam86a8wghs3ylsmvd4cxk9g3nlv2gc3vl3fb8caq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bytestring mtl network template-haskell text
          transformers
        ];
@@ -94025,7 +96400,9 @@ self: {
        pname = "netstring-enumerator";
        version = "0.1.1";
        sha256 = "1n1g8d8507i0k4i93wb4i6yh7j7l3r0d9dfgxwl02hsk1svk5hkm";
-       buildDepends = [ base bytestring enumerator transformers ];
+       libraryHaskellDepends = [
+         base bytestring enumerator transformers
+       ];
        jailbreak = true;
        homepage = "https://john-millikin.com/software/netstring-enumerator/";
        description = "Enumerator-based netstring parsing";
@@ -94034,28 +96411,27 @@ self: {
 
   "nettle" = callPackage
     ({ mkDerivation, array, base, byteable, bytestring
-     , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle
-     , QuickCheck, securemem, tagged, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
+     , crypto-cipher-tests, crypto-cipher-types, HUnit, QuickCheck
+     , securemem, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "nettle";
        version = "0.1.1";
        sha256 = "1l9515ks41b9rkcxv91d391lwl87k2ipl3j5qfjcdz1qaxrnjkyr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring crypto-cipher-tests crypto-cipher-types HUnit
          QuickCheck tagged test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       pkgconfigDepends = [ nettle ];
        homepage = "https://github.com/stbuehler/haskell-nettle";
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) nettle;};
+     }) {};
 
   "nettle-frp" = callPackage
     ({ mkDerivation, base, bimap, binary, bytestring, containers, mtl
@@ -94065,7 +96441,7 @@ self: {
        pname = "nettle-frp";
        version = "0.1.1";
        sha256 = "0jkb9a3vci91gx1rj81jbanhf0xw7n4xk69a5nhy7b55vclv8lcr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bimap binary bytestring containers mtl nettle-openflow network
          network-data random time
        ];
@@ -94083,7 +96459,7 @@ self: {
        pname = "nettle-netkit";
        version = "0.2.0";
        sha256 = "152i4mdmqfrbvzq4nfzl8vy2n3jczbn18wd2mjxng1130l86cylp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl nettle-openflow unix
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
@@ -94099,7 +96475,7 @@ self: {
        pname = "nettle-openflow";
        version = "0.2.0";
        sha256 = "1jc9dpsz8s6ivmkmddxy7i8kyiqf93x8rhnxly357nxlgmsn5dgk";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bimap binary binary-strict bytestring containers HList
          mtl network parsec syb
        ];
@@ -94118,10 +96494,11 @@ self: {
        sha256 = "1izl4iarcc6z2j0d6gkcygpp63asajikn1p44p8ixwzx96xx578r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq parallel profunctors random semigroups time
          transformers
        ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/ertes/netwire";
        description = "Functional reactive programming library";
@@ -94134,7 +96511,7 @@ self: {
        pname = "netwire-input";
        version = "0.0.4";
        sha256 = "1f0dczgnc1fibq5ypdzi1hgsahmbfmv783bliwh5x4j4vm81k0h6";
-       buildDepends = [ base netwire ];
+       libraryHaskellDepends = [ base netwire ];
        homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
        license = stdenv.lib.licenses.mit;
@@ -94149,7 +96526,9 @@ self: {
        sha256 = "163jd8bb0msy9r51s8qb6ypk25lax46kkbzq9wh2s4kvzribmdlg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers GLFW-b mtl netwire-input stm ];
+       libraryHaskellDepends = [
+         base containers GLFW-b mtl netwire-input stm
+       ];
        homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
        description = "GLFW instance of netwire-input";
        license = stdenv.lib.licenses.mit;
@@ -94163,8 +96542,8 @@ self: {
        pname = "network";
        version = "2.6.2.1";
        sha256 = "1yhvpd4wigz165jvyvw9zslx7lgqdj63jh3zv5s74b5ykdfa3zd3";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit
        ];
        homepage = "https://github.com/haskell/network";
@@ -94182,8 +96561,9 @@ self: {
        sha256 = "0pz6x11naxzby14jxrm31j2jdd6gwqspbrx1hv5204rbf7lifib1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal criterion ];
-       testDepends = [
+       libraryHaskellDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal criterion ];
+       testHaskellDepends = [
          base Cabal QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -94202,11 +96582,11 @@ self: {
        pname = "network-anonymous-i2p";
        version = "0.10.0";
        sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring exceptions mtl network
          network-attoparsec network-simple text transformers uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring exceptions hspec hspec-attoparsec
          hspec-expectations mtl network network-simple transformers uuid
        ];
@@ -94228,12 +96608,14 @@ self: {
        sha256 = "1zssb8npwnzj8mra8pkvshni7h36wqhddva9rrwbq480492sck1w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base32string bytestring exceptions hexstring
-         network network-attoparsec network-simple socks splice text
-         transformers
+         network network-attoparsec network-simple socks text transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base exceptions network network-simple splice
+       ];
+       testHaskellDepends = [
          attoparsec base base32string bytestring exceptions hspec
          hspec-attoparsec hspec-expectations network network-simple socks
          text transformers
@@ -94252,7 +96634,7 @@ self: {
        pname = "network-api-support";
        version = "0.2.0";
        sha256 = "01ambd53cf2n4y3c1j62wav3jz09s5vml87gkg69bl6h1g63zls1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
        ];
@@ -94271,11 +96653,11 @@ self: {
        pname = "network-attoparsec";
        version = "0.12.2";
        sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring enclosed-exceptions exceptions
          lifted-base monad-control mtl network transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring exceptions hspec mtl network
          network-simple transformers
        ];
@@ -94295,7 +96677,11 @@ self: {
        sha256 = "0gw04wh24j4vpyvx0wy0bdhh3dkwdxrg2laq7vsvwlpzwgcny99h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring cookie HTTP http-client http-types
+         network text time unordered-containers vector
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bytestring cookie HTTP http-client http-types
          network QuickCheck text time unordered-containers vector
        ];
@@ -94315,10 +96701,13 @@ self: {
        sha256 = "0faa3clz80158m9cy4mblnszla6k9hbf8bdwp5cam05dwmvsdcyw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ aeson base bytestring shelly text yaml ];
+       executableHaskellDepends = [
          aeson base bytestring optparse-applicative shelly text yaml
        ];
-       testDepends = [ base cabal-test-bin hspec hspec-server process ];
+       testHaskellDepends = [
+         base cabal-test-bin hspec hspec-server process
+       ];
        description = "Linux NetworkNameSpace Builder";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94330,7 +96719,7 @@ self: {
        pname = "network-bytestring";
        version = "0.1.3.4";
        sha256 = "19m10mj9nqsa7s0syv9dyhqkhvmf2h7yna8n7bq0xkdp8m9l0g96";
-       buildDepends = [ base bytestring network unix ];
+       libraryHaskellDepends = [ base bytestring network unix ];
        jailbreak = true;
        homepage = "http://github.com/tibbe/network-bytestring";
        description = "Fast, memory-efficient, low-level networking";
@@ -94344,7 +96733,9 @@ self: {
        pname = "network-carbon";
        version = "1.0.5";
        sha256 = "0kb3gz8545dgi93ys9pk240vap7zjnl2npn1xryng2ijl7ssn9li";
-       buildDepends = [ base bytestring network text time vector ];
+       libraryHaskellDepends = [
+         base bytestring network text time vector
+       ];
        homepage = "http://github.com/ocharles/network-carbon";
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
@@ -94356,7 +96747,7 @@ self: {
        pname = "network-conduit";
        version = "1.1.0";
        sha256 = "06amxl8rg4zfnmgc1iyq5mxy9qihcqddqgqkbfvaf25mwr43992p";
-       buildDepends = [ base conduit ];
+       libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Stream socket data using conduits. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -94371,12 +96762,12 @@ self: {
        pname = "network-conduit-tls";
        version = "1.2.0.1";
        sha256 = "17d267sg74snq626kk8n9yy9njspjzivwjg60l69879z4nsvp200";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra connection cprng-aes
          data-default monad-control network streaming-commons tls
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra connection HUnit mtl
        ];
        homepage = "https://github.com/snoyberg/conduit";
@@ -94392,7 +96783,7 @@ self: {
        pname = "network-connection";
        version = "0.1.1";
        sha256 = "0v3dwq5vxmgknsiq2nddfj3gvvvaxdlfsnk0bxrqw9zzzdkpi0q1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers network network-bytestring stm
        ];
        homepage = "http://darcs.imperialviolet.org/network-connection";
@@ -94407,7 +96798,7 @@ self: {
        pname = "network-data";
        version = "0.5.3";
        sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz";
-       buildDepends = [ base bytestring cereal pretty ];
+       libraryHaskellDepends = [ base bytestring cereal pretty ];
        description = "Library for network data structures and their serialization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94420,7 +96811,7 @@ self: {
        pname = "network-dbus";
        version = "0.0";
        sha256 = "024h0gfgn7hmfh90y74nf03kpvj5mg74a54lgb6clvxxfp8j64w9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers mtl network parsec unix
          utf8-string
        ];
@@ -94438,7 +96829,7 @@ self: {
        pname = "network-dns";
        version = "1.0.0.1";
        sha256 = "0gg1g1gnbi6dzw5anz3dam2gh09q948d3k7q84agkswa64c0azn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers data-textual hashable
          network-ip parsers tagged text-latin1 text-printer
        ];
@@ -94455,7 +96846,9 @@ self: {
        pname = "network-enumerator";
        version = "0.1.5";
        sha256 = "11hwgdw03a39k3akjy5qlg9zsb7z8qiikvdmcqr2dhj6ykmfwsvk";
-       buildDepends = [ base bytestring enumerator network transformers ];
+       libraryHaskellDepends = [
+         base bytestring enumerator network transformers
+       ];
        homepage = "https://john-millikin.com/software/network-enumerator/";
        description = "Enumerators for network sockets";
        license = stdenv.lib.licenses.mit;
@@ -94467,7 +96860,7 @@ self: {
        pname = "network-fancy";
        version = "0.2.3";
        sha256 = "1b4hbwqbir3qw3hs1mxdqdz0lnagyqrp5r383b6cm7yvjy3q3if5";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/taruti/network-fancy";
        description = "Networking support with a cleaner API";
        license = stdenv.lib.licenses.bsd3;
@@ -94479,7 +96872,7 @@ self: {
        pname = "network-house";
        version = "0.1.0.1";
        sha256 = "0s9ysp28nd29q2g62w7ch5h7l2kxdjfqqbz4h70vg8py3zs5gfqn";
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
        homepage = "https://github.com/nh2/network-house";
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
        license = stdenv.lib.licenses.gpl2;
@@ -94492,7 +96885,7 @@ self: {
        pname = "network-info";
        version = "0.2.0.7";
        sha256 = "0pa0051ji3sr8ax8z1gfgj8x0wvvr20i1zkxs28hq4hdsv1y4dpg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jystic/network-info";
        description = "Access the local computer's basic network configuration";
        license = stdenv.lib.licenses.bsd3;
@@ -94504,7 +96897,7 @@ self: {
        pname = "network-interfacerequest";
        version = "0.0.1";
        sha256 = "0qa5rbbcw9axg7mj4kjj027hfsclnw85cj8nmi6jvrzq2yhhk56c";
-       buildDepends = [ base bytestring ioctl network ];
+       libraryHaskellDepends = [ base bytestring ioctl network ];
        jailbreak = true;
        description = "Haskell bindings for the ifreq structure";
        license = stdenv.lib.licenses.bsd3;
@@ -94519,11 +96912,11 @@ self: {
        pname = "network-ip";
        version = "0.2.1.1";
        sha256 = "0abc07pi39drsldhk4znlq1j6cv0vxm7y8yyg2z4qanb3sy990iy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cereal data-default-class data-dword data-endian
          data-textual hashable parsers text-printer type-hint
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-dword data-textual parsers tasty tasty-quickcheck
          text-printer
        ];
@@ -94540,7 +96933,7 @@ self: {
        pname = "network-metrics";
        version = "0.4";
        sha256 = "0dvrjf84pdm42pxwc7fm4gvswc5nzmdsq7cr7ab8jyzvjqb8684c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-default network random time
        ];
        homepage = "http://github.com/brendanhay/network-metrics";
@@ -94558,7 +96951,7 @@ self: {
        pname = "network-minihttp";
        version = "0.2";
        sha256 = "104jfksb0xagd8am3h390avqqr3k7qgxcd0znppz4hr0p9d681f5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-strict bytestring containers filepath HsOpenSSL
          mtl network network-bytestring network-connection network-dns
          old-locale stm tagsoup time unix
@@ -94575,7 +96968,7 @@ self: {
        pname = "network-msg";
        version = "0.5";
        sha256 = "0ykphm5xljxml4ifx2v2f7f51kny170k552sy5l4f5paciv47a1g";
-       buildDepends = [ base binary bytestring network unix ];
+       libraryHaskellDepends = [ base binary bytestring network unix ];
        description = "Recvmsg and sendmsg bindings";
        license = "unknown";
      }) {};
@@ -94586,7 +96979,7 @@ self: {
        pname = "network-multicast";
        version = "0.0.11";
        sha256 = "0fgscv9crk2lx99rh234ipgl5psbrjili95inxj23drvwmsj3135";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        description = "Simple multicast library";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -94599,7 +96992,7 @@ self: {
        pname = "network-netpacket";
        version = "0.0.1";
        sha256 = "12q3bqy57lj46m3l44zdk3sqkhbnqfd5cjp3qy1m5m5wxfdnmx56";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring foreign-storable-asymmetric ioctl network
          network-interfacerequest
        ];
@@ -94616,7 +97009,7 @@ self: {
        pname = "network-pgi";
        version = "0.0.1";
        sha256 = "0s0rk3q1nlic2ibcpr0px0kb8gwp2hbnra5109l71q3dr713n2yw";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring enumerator tnet
        ];
        description = "Library for writing PGI applications";
@@ -94631,7 +97024,7 @@ self: {
        pname = "network-protocol-xmpp";
        version = "0.4.8";
        sha256 = "07hy8byhaakjwfidrvkjp07jn25aw21g8wcs93ni3njj0kh2jxza";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring gnuidn gnutls gsasl libxml-sax monads-tf network
          text transformers xml-types
        ];
@@ -94649,7 +97042,7 @@ self: {
        pname = "network-rpca";
        version = "0.0.1";
        sha256 = "1dhy4n0502rx66pansmgmjv8avwwbhvf23afhb98zqksqlkavdir";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary binary-strict bytestring codec-libevent
          containers control-timeout network network-bytestring stm
        ];
@@ -94666,7 +97059,8 @@ self: {
        sha256 = "0iijgw07b5g3rcd4va98pb4hdkk912c67y2d1lkz03bfyq75b6xk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network unix ];
+       libraryHaskellDepends = [ base network unix ];
+       executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94682,14 +97076,16 @@ self: {
        sha256 = "1js0p0i27fj8rjnq54pcq97bgvhdx7jpwj1ghqmdwpvhn8ds07p4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring network
+       ];
+       executableHaskellDepends = [
          base base64-bytestring bytestring network network-simple
        ];
        jailbreak = true;
        homepage = "https://github.com/angerman/network-service";
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-simple" = callPackage
@@ -94700,7 +97096,9 @@ self: {
        pname = "network-simple";
        version = "0.4.0.4";
        sha256 = "0qa3ax29ci7m01af0d2rvnx9m24q1d9zw727bzhc88k2g6k2xzah";
-       buildDepends = [ base bytestring exceptions network transformers ];
+       libraryHaskellDepends = [
+         base bytestring exceptions network transformers
+       ];
        homepage = "https://github.com/k0001/network-simple";
        description = "Simple network sockets usage patterns";
        license = stdenv.lib.licenses.bsd3;
@@ -94714,7 +97112,7 @@ self: {
        pname = "network-simple-sockaddr";
        version = "0.2";
        sha256 = "0c7jjdpzvbpg29njr1w0kn26m3pxa8q1z3sh7bfh933spnvqm52x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory exceptions network transformers
        ];
        homepage = "https://github.com/jdnavarro/network-simple-sockaddr";
@@ -94730,7 +97128,7 @@ self: {
        pname = "network-simple-tls";
        version = "0.2.1";
        sha256 = "0hbpxbs357bxifksbqrlrdkwkkfaydxcf9wdla6kafaymhrxhc0k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring certificate cprng-aes exceptions network
          network-simple tls tls-extra transformers
        ];
@@ -94747,7 +97145,7 @@ self: {
        pname = "network-socket-options";
        version = "0.2.0.1";
        sha256 = "00qf22nwzsv8229gb7yqaaafiz573xl4v78mn1zf9ajvwzvwb63r";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        homepage = "https://github.com/joeyadams/haskell-network-socket-options";
        description = "Type-safe, portable alternative to getSocketOption/setSocketOption";
        license = stdenv.lib.licenses.bsd3;
@@ -94761,7 +97159,7 @@ self: {
        pname = "network-stream";
        version = "0.1.0";
        sha256 = "1y7c2m8yrkb67iqqv6sjbxxmhlnv0s6k82lv9f6wk4mhckcsc5n1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal enumerator network stm text
          transformers
        ];
@@ -94782,7 +97180,7 @@ self: {
        sha256 = "1l5m9f08aizrxxkv2dspv8swf558cch6vx4gyzs6qs6826v9q32b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bayes-stack bimap bytestring cereal containers deepseq
          directory filepath logfloat mwc-random optparse-applicative
          random-fu statistics stm text transformers vector
@@ -94802,7 +97200,7 @@ self: {
        pname = "network-transport";
        version = "0.4.2.0";
        sha256 = "0arwy5csrm33217rmnip6b0x61b6am1db6mj5phfysj0pz30viqf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq hashable transformers
        ];
        homepage = "http://haskell-distributed.github.com";
@@ -94819,15 +97217,15 @@ self: {
      mkDerivation {
        pname = "network-transport-amqp";
        version = "0.1.0.0";
-       revision = "2";
        sha256 = "1165xl5g8m423y4nvzwpihzrv6nc9y2dyr6dm4sqp6n1bw4dqqdq";
+       revision = "2";
        editedCabalFile = "724410b5035d55d170110908838d023a675306faf5fc056ed2a8d68beeb112d4";
-       buildDepends = [
+       libraryHaskellDepends = [
          amqp async base bytestring cereal containers exceptions lens-family
          lens-family-th network-transport stm stm-chans string-conv text
          uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          amqp base network-transport network-transport-tests tasty
          tasty-hunit
        ];
@@ -94845,10 +97243,12 @@ self: {
        pname = "network-transport-inmemory";
        version = "0.5.0";
        sha256 = "1znc4xk6arzi6vr8pfv2vyvak377jpxzzq82r17kz4csdrbnbfw6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor network-transport stm
        ];
-       testDepends = [ base network-transport network-transport-tests ];
+       testHaskellDepends = [
+         base network-transport network-transport-tests
+       ];
        homepage = "http://haskell-distributed.github.com";
        description = "In-memory instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
@@ -94862,10 +97262,10 @@ self: {
        pname = "network-transport-tcp";
        version = "0.4.2";
        sha256 = "0wh3d37cfmqbxa0x9c56miki7m9mpg0xv5rrn8fh562lfvcn89ls";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor network network-transport
        ];
-       testDepends = [
+       testHaskellDepends = [
          base network network-transport network-transport-tests
        ];
        homepage = "http://haskell-distributed.github.com";
@@ -94881,7 +97281,7 @@ self: {
        pname = "network-transport-tests";
        version = "0.2.2.0";
        sha256 = "0914sj3884sp5sxbm460x5frvl0ipn8v1jpkskhc9ajjx4v0s106";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring containers mtl network-transport
          random
        ];
@@ -94903,12 +97303,15 @@ self: {
        sha256 = "0bfznyxf893k0yf4cm53bmmcpyrs7llpf6fd077rccn37x1kj0ih";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base binary bytestring containers criterion data-accessor
-         distributed-process exceptions network-transport random semigroups
-         stm stm-chans transformers zeromq4-haskell
+       libraryHaskellDepends = [
+         async base binary bytestring containers data-accessor exceptions
+         network-transport random semigroups stm stm-chans transformers
+         zeromq4-haskell
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary bytestring criterion distributed-process
+       ];
+       testHaskellDepends = [
          base bytestring containers distributed-process-tests network
          network-transport network-transport-tests stm stm-chans tasty
          tasty-hunit test-framework zeromq4-haskell
@@ -94917,7 +97320,6 @@ self: {
        homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-uri" = callPackage
@@ -94928,8 +97330,8 @@ self: {
        pname = "network-uri";
        version = "2.6.0.3";
        sha256 = "1pwbqb2rk4rnvllvdch42p5368xcvpkanp7bxckdhxya8zzwvhhg";
-       buildDepends = [ base deepseq parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq parsec ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -94944,8 +97346,8 @@ self: {
        pname = "network-uri-static";
        version = "0.1.0.0";
        sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9";
-       buildDepends = [ base network-uri template-haskell ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base network-uri template-haskell ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/snakamura/network-uri-static";
        description = "A small utility to declare type-safe static URIs";
        license = stdenv.lib.licenses.mit;
@@ -94957,7 +97359,7 @@ self: {
        pname = "network-wai-router";
        version = "0.3.0.1";
        sha256 = "1fnqc1vbahy6zy632s9kam8bv7108bhmynyh2iwkqb7ybkkj37i9";
-       buildDepends = [ base wai ];
+       libraryHaskellDepends = [ base wai ];
        description = "A routing library for wai";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -94970,7 +97372,7 @@ self: {
        sha256 = "053qrlm2bd14mlcvlh64awsqsgn355nkr13k9h4dnfabafymkkbm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell98 network webserver ];
+       libraryHaskellDepends = [ base haskell98 network webserver ];
        jailbreak = true;
        homepage = "http://github.com/michaelmelanson/network-websocket";
        description = "WebSocket library";
@@ -94986,7 +97388,7 @@ self: {
        pname = "networked-game";
        version = "0.1.0.1";
        sha256 = "12sy97cgqrsmqywh0cznp8wbsw8z2yahlfalsjy32qarcz44banz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers network time transformers
        ];
        jailbreak = true;
@@ -95002,7 +97404,7 @@ self: {
        sha256 = "1paxqr8rm8lbp0896qsd7v76c0kahkk6fngpcdzswbrqpyqhwjwc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory old-time ];
+       executableHaskellDepends = [ base directory old-time ];
        homepage = "http://www.b7j0c.org/content/haskell-newports.html";
        description = "List ports newer than N days on a FreeBSD system";
        license = stdenv.lib.licenses.bsd3;
@@ -95019,7 +97421,10 @@ self: {
        sha256 = "1c65s4nwxzlmix0549chhvm5wj4rvxq92y5kfzd9h11jc4hxl7xs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers fixedprec random superdoc time ];
+       libraryHaskellDepends = [
+         base containers fixedprec random superdoc
+       ];
+       executableHaskellDepends = [ base random superdoc time ];
        jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/newsynth/";
        description = "Exact and approximate synthesis of quantum circuits";
@@ -95039,10 +97444,14 @@ self: {
        sha256 = "0amhpvqqy8pan3vihjvpkd25jz3m4syavw4l15cvqny8mhrxbvpj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cmdargs containers directory filemanip
-         filepath HUnit mtl process QuickCheck safe test-framework
-         test-framework-hunit test-framework-quickcheck2 text Unixutils uuid
+         filepath mtl process safe text Unixutils
+       ];
+       executableHaskellDepends = [
+         base cmdargs containers directory filepath HUnit mtl process
+         QuickCheck safe test-framework test-framework-hunit
+         test-framework-quickcheck2 Unixutils uuid
        ];
        jailbreak = true;
        description = "A trivially simple app to create things from simple templates";
@@ -95056,7 +97465,7 @@ self: {
        pname = "newtype";
        version = "0.2";
        sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A typeclass and set of functions for working with newtypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95069,7 +97478,7 @@ self: {
        pname = "newtype-deriving";
        version = "0.1.2";
        sha256 = "15ajk0vbh4habil8339naajy7l086cryqw52ifv1agjyn9kmlixa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude monad-control template-haskell transformers
          transformers-base
        ];
@@ -95084,8 +97493,8 @@ self: {
        pname = "newtype-generics";
        version = "0.4.1";
        sha256 = "1qjzcmx5yj85cvdgglyg9f9ff7k9gvnyrb85n6bjzyh10q9n7vd5";
-       buildDepends = [ base ];
-       testDepends = [ base hspec HUnit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95098,7 +97507,7 @@ self: {
        pname = "newtype-th";
        version = "0.3.3";
        sha256 = "1slgphymjxzbxxgsilfijkhiwapfy2gkhkby2dxqj107v4s0788k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta newtype syb template-haskell
        ];
        jailbreak = true;
@@ -95114,7 +97523,7 @@ self: {
        pname = "newtyper";
        version = "0.1";
        sha256 = "1s1mzy1m3wpawv1ci85dl02105v550l1fdi5rxi5gqnxb0jrg4fs";
-       buildDepends = [ base Kleislify newtype ];
+       libraryHaskellDepends = [ base Kleislify newtype ];
        homepage = "https://github.com/techtangents/Newtyper";
        description = "Extra functions for the Control.Newtype typeclass";
        license = stdenv.lib.licenses.bsd3;
@@ -95126,7 +97535,7 @@ self: {
        pname = "nextstep-plist";
        version = "0.0.1";
        sha256 = "0wld4nc6hcv642km60vvjyclsfwnpfavq59mqm8fm3a73al4csyw";
-       buildDepends = [ base parsec pretty QuickCheck ];
+       libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95137,7 +97546,7 @@ self: {
        pname = "nf";
        version = "1.0.1.0";
        sha256 = "1yrw6skp2n8fd874481bfalli8lcglakhdggdsj8dm036wpm935a";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/ezyang/nf";
        description = "NF data type to statically enforce normal form";
        license = stdenv.lib.licenses.bsd3;
@@ -95153,9 +97562,10 @@ self: {
        sha256 = "0z26mpk1q7hnx4vkcyfwy6pbm7nm76ydm04z3vk598q2ifq5vmpd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base machines mtl parseargs resourcet sqlite-simple text
+       libraryHaskellDepends = [
+         attoparsec base machines mtl resourcet sqlite-simple text
        ];
+       executableHaskellDepends = [ base parseargs ];
        jailbreak = true;
        homepage = "http://github.com/YoEight/ngrams-loader";
        description = "Ngrams loader based on http://www.ngrams.info format";
@@ -95171,10 +97581,10 @@ self: {
        pname = "nibblestring";
        version = "0.0.3";
        sha256 = "0ijcv7ph09mmllly09jgigwiq64m05c7qkq2riki3mbza2skxbrr";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base16-bytestring bytestring containers HUnit test-framework
          test-framework-hunit
        ];
@@ -95191,7 +97601,7 @@ self: {
        sha256 = "0qpm18md4jmfznfxqbi9aqvlqrgmiab7b477s11hwcb6y00kyfwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base nicify-lib ];
+       executableHaskellDepends = [ base nicify-lib ];
        description = "Pretty print the standard output of default `Show` instances";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95202,7 +97612,7 @@ self: {
        pname = "nicify-lib";
        version = "1.0.1";
        sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx";
-       buildDepends = [ base parsec transformers ];
+       libraryHaskellDepends = [ base parsec transformers ];
        description = "Pretty print the standard output of default `Show` instances";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95218,11 +97628,11 @@ self: {
        sha256 = "01qbmkr9h78iwyrgdijqyf06xl8wk2z9nn4v8dc5pb1gknlbp8wh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring case-insensitive containers dns http-client
-         http-types iso639 lens lens-aeson random setlocale text wai warp
-         wreq xml-conduit
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-types iso639 lens lens-aeson random text wai wreq xml-conduit
        ];
+       executableHaskellDepends = [ base dns iso639 setlocale text warp ];
        jailbreak = true;
        homepage = "https://github.com/dahlia/nicovideo-translator";
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
@@ -95240,7 +97650,7 @@ self: {
        sha256 = "1w7cvkh36p7i9n62rvfh6nlr8z16hds06fbr1lpvbc84ymci75v0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath GoogleChart haskell98 haxr hs-twitter
          HStringTemplate HTTP hxt json network old-locale old-time
          regex-compat regex-posix syb time
@@ -95257,7 +97667,7 @@ self: {
        pname = "nimber";
        version = "0.1.3";
        sha256 = "0350fmddnfp09051i89fl5ibrxqy36cx5560l00cjssx2gs2dh8w";
-       buildDepends = [ arithmoi base ];
+       libraryHaskellDepends = [ arithmoi base ];
        homepage = "http://andersk.mit.edu/haskell/nimber/";
        description = "Finite nimber arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -95269,7 +97679,7 @@ self: {
        pname = "nitro";
        version = "0.2.2.5";
        sha256 = "17aqzk1kq670fwawia0qjmd8ld1b0h8zh0w8j8x4y48hlzyb75xb";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://haskell.gonitro.io";
        description = "Haskell bindings for Nitro";
@@ -95290,12 +97700,17 @@ self: {
        sha256 = "0pl00kiirpmhzsyr96gzkjrzps69vycpabrjjdq31ngckwqvjib1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring classy-prelude containers data-default
+         directory error-list filepath hnix MissingH mtl network-uri parsec
+         shelly system-filepath text text-render unordered-containers
+       ];
+       executableHaskellDepends = [
          aeson base bytestring classy-prelude containers data-default
          directory docopt error-list filepath hnix MissingH mtl network-uri
          parsec shelly system-filepath text text-render unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring classy-prelude containers data-default
          directory error-list filepath github hnix hspec hspec-expectations
          http-client-streams io-streams MissingH mtl network-uri parsec
@@ -95303,7 +97718,6 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nixos-types" = callPackage
@@ -95328,7 +97742,7 @@ self: {
        sha256 = "1i9q0xyfqi3cv29k8yflrg34hgblxfyj2dqr1zjg20jpymsfi06l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-named filepath polysoup tar text
          zlib
        ];
@@ -95344,7 +97758,7 @@ self: {
        pname = "nlp-scores";
        version = "0.7.0";
        sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m";
-       buildDepends = [ base containers strict ];
+       libraryHaskellDepends = [ base containers strict ];
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Scoring functions commonly used for evaluation in NLP and IR";
        license = stdenv.lib.licenses.bsd3;
@@ -95358,7 +97772,9 @@ self: {
        sha256 = "02jisx8slzzljv77d931b169hxq6i6ajg5ly9a37g13q9h75gd2c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers nlp-scores split text ];
+       executableHaskellDepends = [
+         base containers nlp-scores split text
+       ];
        jailbreak = true;
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "NLP scoring command-line programs";
@@ -95373,9 +97789,10 @@ self: {
        sha256 = "028p25pb2cqlvrydy87y26rinvypbq0lnphd59k3zaxvxxikqwf1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base vector ];
-       extraLibraries = [ g nm-glib ];
-       pkgconfigDepends = [ glib libnm-glib ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ g nm-glib ];
+       libraryPkgconfigDepends = [ glib libnm-glib ];
+       executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95388,7 +97805,7 @@ self: {
        pname = "nme";
        version = "0.2";
        sha256 = "14qzc4af1pm1myjdfs7z4b1jxxj0gz9c4cl9qgpm06hjzvjjf8wm";
-       buildDepends = [ base bytestring utf8-string ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
        homepage = "https://github.com/singpolyma/NME-Haskell";
        description = "Bindings to the Nyctergatis Markup Engine";
        license = "unknown";
@@ -95403,7 +97820,7 @@ self: {
        pname = "nntp";
        version = "0.0.4";
        sha256 = "1yg91zai4krxx7yqzskss19jjgh4nvc2vqzddvpwsdm07lri8g35";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring monad-loops mtl network old-locale parsec time
        ];
        description = "Library to connect to an NNTP Server";
@@ -95417,8 +97834,8 @@ self: {
        pname = "no-role-annots";
        version = "1.1";
        sha256 = "1kk9ii5w40di3azlqzbz4vkvwdz8apca0lh4jn94nvr3hns6l5s7";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/goldfirere/no-role-annots";
        description = "Role annotations without -XRoleAnnotations";
        license = stdenv.lib.licenses.bsd3;
@@ -95432,7 +97849,7 @@ self: {
        sha256 = "04n056gsxv61igdvdysqkxbsz1a5bvkzfnsbrz03ixjgaqg2whfl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers regex-compat ];
+       executableHaskellDepends = [ array base containers regex-compat ];
        homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib";
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
@@ -95449,11 +97866,14 @@ self: {
        sha256 = "0h9aq4f8n1acmzhdq185y0adl35cf7avms6zvgsyf9lkx2msja0q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup blaze-svg bytestring containers cryptohash
          network parsec
        ];
-       testDepends = [ base HTF HUnit parsec QuickCheck string-qq ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HTF HUnit parsec QuickCheck string-qq
+       ];
        jailbreak = true;
        homepage = "http://github.com/brow/noise";
        description = "A friendly language for graphic design";
@@ -95467,7 +97887,7 @@ self: {
        pname = "non-empty";
        version = "0.2.1";
        sha256 = "1p0jp44xlc77da5g5fq78vvgfv8r9z4m0axm36qbliv609rnp5g3";
-       buildDepends = [ base containers QuickCheck utility-ht ];
+       libraryHaskellDepends = [ base containers QuickCheck utility-ht ];
        homepage = "http://code.haskell.org/~thielema/non-empty/";
        description = "List-like structures with static restrictions on the number of elements";
        license = stdenv.lib.licenses.bsd3;
@@ -95479,8 +97899,8 @@ self: {
        pname = "non-negative";
        version = "0.1.1";
        sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7";
-       buildDepends = [ base QuickCheck utility-ht ];
-       testDepends = [ base QuickCheck utility-ht ];
+       libraryHaskellDepends = [ base QuickCheck utility-ht ];
+       testHaskellDepends = [ base QuickCheck utility-ht ];
        homepage = "http://code.haskell.org/~thielema/non-negative/";
        description = "Non-negative numbers";
        license = "GPL";
@@ -95494,7 +97914,7 @@ self: {
        pname = "nonce";
        version = "1.0.2";
        sha256 = "1l4w6bdrwa42r90n6xzwr8lz2fdrn3m763ls311pnygajr4ih10h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cprng-aes crypto-random text
          transformers
        ];
@@ -95509,7 +97929,7 @@ self: {
        pname = "nondeterminism";
        version = "1.0";
        sha256 = "0hxfqrm51svmr9lk1i8l5ib5bi5zlc92q6k3qwnvkqz8qgb4w8i0";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "A monad and monad transformer for nondeterministic computations";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95521,7 +97941,7 @@ self: {
        pname = "nonfree";
        version = "0.1.0.1";
        sha256 = "05jf3i9m58lwixd3mnj9ikgkrg1gdcxz7d8m5k5k5j3fdbbgbmqi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Free structures sans laws";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95532,7 +97952,7 @@ self: {
        pname = "nonlinear-optimization";
        version = "0.3.10";
        sha256 = "11dq7fvysdb0szkg58f2wmx2vg6sa9qfj9kfv7wv6fl3386dnp7f";
-       buildDepends = [ base primitive vector ];
+       libraryHaskellDepends = [ base primitive vector ];
        description = "Various iterative algorithms for optimization of nonlinear functions";
        license = "GPL";
      }) {};
@@ -95547,9 +97967,10 @@ self: {
        sha256 = "0k3iynppdvmm9asy1wddp8n3gmskh40dmcngqv8pgy5qx0bnx8jd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ad base csv nonlinear-optimization primitive reflection vector
+       libraryHaskellDepends = [
+         ad base nonlinear-optimization primitive reflection vector
        ];
+       executableHaskellDepends = [ base csv ];
        homepage = "https://github.com/msakai/nonlinear-optimization-ad";
        description = "Wrapper of nonlinear-optimization package for using with AD package";
        license = stdenv.lib.licenses.gpl3;
@@ -95563,7 +97984,8 @@ self: {
        sha256 = "08v5rz5skmaqxqj85l76kjxqmlhnf3vapgfdqd042cmh41zwznx0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
        homepage = "https://github.com/jessopher/noodle";
        description = "the noodle programming language";
        license = "unknown";
@@ -95576,7 +97998,7 @@ self: {
        pname = "normaldistribution";
        version = "1.1.0.3";
        sha256 = "1q7p0bx435amqb7r9qksix0mrbpnqsyfb44chjyz6xkgjj0s6yvd";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        homepage = "https://github.com/bjornbm/normaldistribution";
        description = "Minimum fuss normally distributed random values";
        license = stdenv.lib.licenses.bsd3;
@@ -95591,7 +98013,7 @@ self: {
        pname = "not-gloss";
        version = "0.7.5.0";
        sha256 = "1r0mycb3ilz2k89vab08c1diz18mp03b5sds4ixmxfb0zqaz68lb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
        ];
@@ -95609,7 +98031,7 @@ self: {
        sha256 = "0dszimvwb78ac1zfp25iy8lhnsq0grjs6zrsiyr1d80fj9kmg49y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers GLUT linear not-gloss spatial-math X11
        ];
        description = "examples for not-gloss";
@@ -95623,7 +98045,7 @@ self: {
        pname = "not-in-base";
        version = "0.1.1";
        sha256 = "1mm1j0l3h8qxpk0bis4g1f6zp5407rkq2z5ldyr036frbvfwqaj5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/finnsson/not-in-base";
        description = "Useful utility functions that only depend on base";
        license = "unknown";
@@ -95635,8 +98057,8 @@ self: {
        pname = "notcpp";
        version = "0.2.0.3";
        sha256 = "15aa96zdz60x9wc9k8ad5qkc4bs5rbgm9xvsykf3ppyys2z449ca";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95651,10 +98073,10 @@ self: {
        sha256 = "0znbsvbjj3995mn04zaxgv0q90qplwjkwhwjkmz1k5jxajxgwwzj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers filepath old-locale parseargs time
-       ];
-       extraLibraries = [ notmuch ];
+       libraryHaskellDepends = [ base containers filepath time ];
+       librarySystemDepends = [ notmuch ];
+       executableHaskellDepends = [ base old-locale parseargs ];
+       executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95678,7 +98100,7 @@ self: {
        sha256 = "1jjk3fhzhpf9wrgk980rgp55kji5zjzdl0xyi4wgz3xvn1k8hrhs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder blaze-html
          blaze-markup bytestring case-insensitive conduit containers
          data-default directory email-validate filepath hamlet hashable
@@ -95688,7 +98110,8 @@ self: {
          unordered-containers vector wai wai-extra warp xss-sanitize yaml
          yesod yesod-auth yesod-static
        ];
-       testDepends = [
+       executableHaskellDepends = [ base pwstore-fast text yesod ];
+       testHaskellDepends = [
          base hspec HUnit mime-mail text yesod yesod-core yesod-test
        ];
        jailbreak = true;
@@ -95707,10 +98130,10 @@ self: {
        pname = "notzero";
        version = "0.0.10";
        sha256 = "0g4l4b5f6m3da172k9n49zkcisbv88b3601zabb474l6a80zrz8p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/notzero";
@@ -95724,7 +98147,7 @@ self: {
        pname = "np-extras";
        version = "0.3.0.1";
        sha256 = "19mj868qpvaqmv8j83hcfyrspbg24bc2vdad3gp1wcrrpbj7ib0m";
-       buildDepends = [ base containers numeric-prelude primes ];
+       libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95737,7 +98160,7 @@ self: {
        pname = "np-linear";
        version = "0.3.0.2";
        sha256 = "00rmm36is8i6k1a0xyri61v09asc54fanlp5nai7k7vhp0wyfzz1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers numeric-prelude reflection tagged
        ];
        jailbreak = true;
@@ -95756,7 +98179,7 @@ self: {
        sha256 = "1zipawfk8l98bszi1yviv7ph96x1z715d3nlzs3w2mzahir57h3d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal array base bytestring colour containers HSH
          old-locale process split time unix
        ];
@@ -95772,8 +98195,10 @@ self: {
        pname = "nsis";
        version = "0.3";
        sha256 = "0w7mip0dxpzdfdxj8gdk58zfz5n4aasd60ql546hx3yv5r65dbq3";
-       buildDepends = [ base transformers uniplate ];
-       testDepends = [ base directory process transformers uniplate ];
+       libraryHaskellDepends = [ base transformers uniplate ];
+       testHaskellDepends = [
+         base directory process transformers uniplate
+       ];
        homepage = "https://github.com/ndmitchell/nsis#readme";
        description = "DSL for producing Windows Installer using NSIS";
        license = stdenv.lib.licenses.bsd3;
@@ -95787,8 +98212,12 @@ self: {
        sha256 = "0iq1658jfywni2yhk3aa1d4bnjjp8c9288bqfqxd8ayv87bvpirh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base opentheory-prime opentheory-primitive ];
-       testDepends = [ base opentheory-prime opentheory-primitive ];
+       executableHaskellDepends = [
+         base opentheory-prime opentheory-primitive
+       ];
+       testHaskellDepends = [
+         base opentheory-prime opentheory-primitive
+       ];
        description = "Computing the nth prime";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95799,7 +98228,7 @@ self: {
        pname = "nthable";
        version = "0.1";
        sha256 = "1qi1wq7wbnp3sv3c2v4185mnq80646vcsnqq16mqlshiy164wsly";
-       buildDepends = [ base type-level ];
+       libraryHaskellDepends = [ base type-level ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -95812,10 +98241,10 @@ self: {
        pname = "ntp-control";
        version = "0.1";
        sha256 = "14ns5lbvbdn0yrmfjp9rb4id19fxfd6dp68pgzm4lkh0xk0qnc4y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing cereal network old-locale time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring bytestring-lexing cereal network old-locale time
        ];
        description = "Client library for NTP control messaging";
@@ -95830,7 +98259,7 @@ self: {
        pname = "null-canvas";
        version = "0.2.7";
        sha256 = "1i6krgxlbdmv5md1p3n5mcw3sk24f5sk6y7yiznx8glxncxmfdll";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers filepath scotty split stm text transformers
          wai-extra warp
        ];
@@ -95847,7 +98276,7 @@ self: {
        pname = "number";
        version = "0.1.0.0";
        sha256 = "1cl9s5qf7i0kixwqg27znmx4rvnckggpghs3hls77mq22igskd8p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for real numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95858,7 +98287,7 @@ self: {
        pname = "numbering";
        version = "0.2.1";
        sha256 = "0hh4km2zbvs7rsb142f1rifqvwzajh0grgky2vyyyf48dk5plrlv";
-       buildDepends = [ base containers vector ];
+       libraryHaskellDepends = [ base containers vector ];
        homepage = "https://github.com/DanielSchuessler/numbering";
        description = "Combinators for creating bijections from some type to the natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -95872,8 +98301,8 @@ self: {
        pname = "numbers";
        version = "3000.2.0.1";
        sha256 = "10z1bi5qbc81z5xx2v1ylwcpmcfl1ci7lxrswkgi0dd1wi8havbk";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/jwiegley/numbers#readme";
@@ -95891,11 +98320,11 @@ self: {
        pname = "numerals";
        version = "0.4";
        sha256 = "1fkxlwf68bn353hs3622yqvlbndjnf263jbnh4q2rkj4xiirn4qm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols containers containers-unicode-symbols
          fingertree integer-gmp text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-unicode-symbols HUnit integer-gmp QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
@@ -95915,11 +98344,11 @@ self: {
        pname = "numerals-base";
        version = "0.3";
        sha256 = "0qp9xhsqvs22siyfwjzffqc1kbpsanbxks3pbjfdcmbcwlq7hpg8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols containers containers-unicode-symbols
          fingertree
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-unicode-symbols containers containers-unicode-symbols
          fingertree HUnit test-framework test-framework-hunit
        ];
@@ -95936,7 +98365,7 @@ self: {
        pname = "numeric-extras";
        version = "0.0.3";
        sha256 = "18jyjrk6iizz3sgkwgbh1rxf6zdf166bkgs7wia8b4z7f6261nzg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/numeric-extras";
        description = "Useful tools from the C standard library";
        license = stdenv.lib.licenses.bsd3;
@@ -95948,7 +98377,7 @@ self: {
        pname = "numeric-limits";
        version = "0.1.0.0";
        sha256 = "0lsi0my45lpd30vjbwdbzhisz8r3lryvg1c80qcmwipnxklnr5cb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Various floating point limit related constants";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95960,12 +98389,12 @@ self: {
      mkDerivation {
        pname = "numeric-prelude";
        version = "0.4.2";
-       revision = "1";
        sha256 = "1i6qavz3av3dbf70li7yqsh184bl618l1sm9s9ia15srrkzsj9sk";
+       revision = "1";
        editedCabalFile = "acbf128b14ff1177ed767ec9ebb89b1c3c0e998d5d031fdd0e4bc64ebc6bffe2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers deepseq non-negative parsec QuickCheck random
          storable-record utility-ht
        ];
@@ -95982,8 +98411,10 @@ self: {
        pname = "numeric-qq";
        version = "0.1.2";
        sha256 = "0zxiaiqzcg4z354wyvxl672ffswvhbqk6h6nvpgmydw84akpimcm";
-       buildDepends = [ base loch-th placeholders template-haskell ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [
+         base loch-th placeholders template-haskell
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/numeric-qq";
        description = "Quasi-quoters for numbers of different bases";
@@ -95996,10 +98427,10 @@ self: {
      mkDerivation {
        pname = "numeric-quest";
        version = "0.2.0.1";
-       revision = "1";
        sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga";
+       revision = "1";
        editedCabalFile = "aae9d00f380bf447af5575311f566cd6960aafb7eec8c30abbab09a2fcff092e";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest";
        description = "Math and quantum mechanics";
        license = "GPL";
@@ -96011,8 +98442,8 @@ self: {
        pname = "numeric-tools";
        version = "0.2.0.1";
        sha256 = "0frdsj90gqpa55ybjfkzfcda43bbwkqd2v26l6w35kyq1snqyhd3";
-       buildDepends = [ base ieee754 primitive vector ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base ieee754 primitive vector ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://bitbucket.org/Shimuuar/numeric-tools";
        description = "Collection of numerical tools for integration, differentiation etc";
        license = stdenv.lib.licenses.bsd3;
@@ -96024,7 +98455,7 @@ self: {
        pname = "numericpeano";
        version = "0.2.0.0";
        sha256 = "1f9ar8kdwzi8xarzb7mrq204v1n3n8kh0fbqv06l9677vv1pc19v";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ombocomp/numericpeano/";
        description = "Peano numbers with attendant bells and whistles";
        license = stdenv.lib.licenses.asl20;
@@ -96047,7 +98478,7 @@ self: {
        pname = "numtype";
        version = "1.1";
        sha256 = "1az10xcfl6qpyy9qnh8g2iqx53rxnjxzc1h8kl1gira6yv7g6857";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Type-level (low cardinality) integers";
        license = stdenv.lib.licenses.bsd3;
@@ -96059,7 +98490,7 @@ self: {
        pname = "numtype-dk";
        version = "0.5";
        sha256 = "0gd1a5hf0bw4vc56f1n7y143bsjkdc97pysv4q1gxpwrnj1sgbxd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/bjornbm/numtype-dk";
        description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
        license = stdenv.lib.licenses.bsd3;
@@ -96071,7 +98502,7 @@ self: {
        pname = "numtype-tf";
        version = "0.1.2";
        sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Type-level (low cardinality) integers, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -96092,7 +98523,7 @@ self: {
        sha256 = "0f551qr7dgn6p4slr0yyfw7v2c6j6w1haqzgc7n7phrgmnhvrhzp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cereal-conduit conduit conduit-extra
          containers data-default directory dyre filepath hslogger
          lifted-base messagepack monad-control mtl network
@@ -96100,7 +98531,8 @@ self: {
          template-haskell text time transformers transformers-base
          utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [ base data-default ];
+       testHaskellDepends = [
          base bytestring cereal cereal-conduit conduit conduit-extra
          containers data-default directory dyre filepath hslogger hspec
          hspec-discover HUnit lifted-base messagepack mtl network
@@ -96111,6 +98543,7 @@ self: {
        homepage = "https://github.com/saep/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nyan" = callPackage
@@ -96121,10 +98554,9 @@ self: {
        sha256 = "02bcyb6ibb6m84d2r6pp05vbv9jv09v1lp35n18mn2vkrgwls649";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl ncurses text ];
+       executableHaskellDepends = [ base bytestring mtl ncurses text ];
        description = "Bored? Nyan cat!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nymphaea" = callPackage
@@ -96137,7 +98569,7 @@ self: {
        sha256 = "1nlnz7mvdkhcqp4v1fyfb6r6v18xpxi0ddqqp84dsqg6ahdypc13";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers glade glib gtk mtl parsec random
        ];
        jailbreak = true;
@@ -96156,7 +98588,7 @@ self: {
        pname = "oauthenticated";
        version = "0.1.3.4";
        sha256 = "1l6qir6qnipq8295cljl66mhlws2rrqjvz9nsl7rq2ldqv711bbm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          case-insensitive crypto-random cryptohash either exceptions
          http-client http-types mtl network network-uri text time
@@ -96173,7 +98605,7 @@ self: {
        pname = "obdd";
        version = "0.3.2";
        sha256 = "0dck1jaw2smvnc1cdjmxjchsxsjw14h98y58lm5z0ccl3rfjr1hw";
-       buildDepends = [ array base containers mtl random ];
+       libraryHaskellDepends = [ array base containers mtl random ];
        homepage = "https://github.com/jwaldmann/haskell-obdd";
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
@@ -96190,10 +98622,14 @@ self: {
        sha256 = "0w8ygppqr1mjklc0545z2n503ap5xzxmjw2xsmb0i85nmh6f95hv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array AspectAG base containers ghc-prim HList language-c mtl murder
+       libraryHaskellDepends = [
+         array AspectAG base containers ghc-prim HList mtl murder
          template-haskell transformers uu-parsinglib uulib
        ];
+       executableHaskellDepends = [
+         AspectAG base containers HList language-c murder uu-parsinglib
+         uulib
+       ];
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "Oberon0 Compiler";
        license = "LGPL";
@@ -96210,7 +98646,7 @@ self: {
        pname = "obj";
        version = "0.1.2";
        sha256 = "0w9yyyd2i88lkhqlghnf7zkrx0sql5w8vwx67j9j1jr7d5zrad4z";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring checkers Codec-Image-DevIL containers
          directory filepath graphicsFormats haskell98 InfixApplicative
          OpenGL OpenGLCheck QuickCheck
@@ -96229,8 +98665,10 @@ self: {
        pname = "objectid";
        version = "0.1.0.2";
        sha256 = "1cr9hzrkj8a6ggym8d6gyy0rmric93x8xwdjqfal10bg5s6d6vgs";
-       buildDepends = [ base blaze-builder bytestring cereal cryptohash ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring cereal cryptohash
+       ];
+       testHaskellDepends = [
          base bytestring bytestring-arbitrary cereal QuickCheck tasty
          tasty-quickcheck
        ];
@@ -96250,7 +98688,7 @@ self: {
        pname = "objective";
        version = "1.0.5";
        sha256 = "07v1srbzd2sxwfwi1jrq63jycr46hwq4wh6wi7sgdpla5m28mhyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers either exceptions free hashable monad-skeleton
          monad-stm mtl profunctors stm template-haskell transformers
          transformers-compat unordered-containers void witherable
@@ -96266,7 +98704,7 @@ self: {
        pname = "observable-sharing";
        version = "0.2.1.2";
        sha256 = "0f2da4bxid9ap21p0l6vf8czg84ifnzq1ljj1h4qy95ydv2bc0za";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/atzeus/observable-sharing";
        description = "Simple observable sharing";
        license = stdenv.lib.licenses.bsd3;
@@ -96286,13 +98724,16 @@ self: {
        sha256 = "0say5682zqv4ss6q9v4p171vprdl6aa7aaack1y0526qq7gj05l2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base-compat base16-bytestring base64-bytestring
          bytestring containers cryptohash dotenv either errors ghc-prim
-         http-client http-types lens mtl optparse-applicative text time
-         transformers unordered-containers utf8-string wreq-sb xmlhtml yaml
+         http-client http-types lens mtl text time transformers
+         unordered-containers wreq-sb xmlhtml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base optparse-applicative text utf8-string yaml
+       ];
+       testHaskellDepends = [
          base base-compat dotenv hspec hspec-expectations text transformers
        ];
        jailbreak = true;
@@ -96311,7 +98752,10 @@ self: {
        sha256 = "1p1sf694a5zryvb2i38ygd7fby54pqi0v5r3b24wcpwj43dy57ca";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring containers hexpr mtl parsec symbol text
+       ];
+       executableHaskellDepends = [
          array base bytestring containers hexpr mtl parsec symbol text
        ];
        jailbreak = true;
@@ -96329,10 +98773,10 @@ self: {
        pname = "oculus";
        version = "0.1.0.2";
        sha256 = "04015wbh5j36gd66k7fn12nl92lq68d0c9dia8fz0pr8y3b7ims4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base either monads-tf transformers vect-floating
        ];
-       extraLibraries = [ libX11 libXinerama mesa ovr systemd ];
+       librarySystemDepends = [ libX11 libXinerama mesa ovr systemd ];
        jailbreak = true;
        homepage = "http://github.com/cpdurham/oculus";
        description = "Oculus Rift ffi providing head tracking data";
@@ -96350,8 +98794,10 @@ self: {
        pname = "oeis";
        version = "0.3.6";
        sha256 = "1q7ywczm2d5inrjqgz3j8vfk5sj2yixvwdkzlfs2whd0gadbcfa0";
-       buildDepends = [ base HTTP network network-uri ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base HTTP network network-uri ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96362,7 +98808,7 @@ self: {
        pname = "off-simple";
        version = "0.1";
        sha256 = "03sb2bmjw8v01908zkzmw8njsmqy5k2hcnv6ajbia7n8qawyhivj";
-       buildDepends = [ base parsec3 vector ];
+       libraryHaskellDepends = [ base parsec3 vector ];
        jailbreak = true;
        homepage = "https://github.com/acfoltzer/off-simple";
        description = "A parser for simplified-syntax OFF files";
@@ -96375,7 +98821,7 @@ self: {
        pname = "ofx";
        version = "0.4.0.2";
        sha256 = "0vhr2pydnfc0ma7w1qdn5p5yylzlj3n47fnm16mlbhlb5ydnjshg";
-       buildDepends = [ base parsec pretty time ];
+       libraryHaskellDepends = [ base parsec pretty time ];
        homepage = "http://www.github.com/massysett/ofx";
        description = "Parser for OFX data";
        license = stdenv.lib.licenses.bsd3;
@@ -96393,10 +98839,11 @@ self: {
        sha256 = "0nbk24ymkkjrapxa83qzhzl1m7zi3bxdc9jsjkbqvb7r9nz3jhyj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base data-lens hxt text-format-simple ];
+       executableHaskellDepends = [
          base cmdargs data-lens hxt hxt-curl pretty-show text-format-simple
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-lens hxt QuickCheck test-framework
          test-framework-quickcheck2 text-format-simple
        ];
@@ -96414,7 +98861,7 @@ self: {
        pname = "oi";
        version = "0.3.1";
        sha256 = "14q8map7r2cc8jcfhczyb16br553h2m9xf40qm34l6pb9l1bzn2p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad directory filepath parallel SafeSemaphore
        ];
        description = "Library for purely functional lazy interactions with the outer world";
@@ -96428,8 +98875,8 @@ self: {
        pname = "ois-input-manager";
        version = "0.1.0.1";
        sha256 = "1p34xybkf5079pq5hkildaz6skx06f6s3qg0k2i73jhh93q3ckiq";
-       buildDepends = [ base hogre ];
-       extraLibraries = [ OIS ];
+       libraryHaskellDepends = [ base hogre ];
+       librarySystemDepends = [ OIS ];
        jailbreak = true;
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
@@ -96442,7 +98889,7 @@ self: {
        pname = "old-locale";
        version = "1.0.0.7";
        sha256 = "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "locale library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96453,7 +98900,7 @@ self: {
        pname = "old-time";
        version = "1.1.0.3";
        sha256 = "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw";
-       buildDepends = [ base old-locale ];
+       libraryHaskellDepends = [ base old-locale ];
        description = "Time library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96464,7 +98911,8 @@ self: {
        pname = "old-version";
        version = "1.4.2";
        sha256 = "1sqga2fmrc702k2grv2kw32wg0yy8qy94cs1jl6112xk6lb79qb3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       jailbreak = true;
        description = "Basic versioning library";
        license = "unknown";
      }) {};
@@ -96477,19 +98925,22 @@ self: {
      mkDerivation {
        pname = "olwrapper";
        version = "0.4.1";
-       revision = "1";
        sha256 = "0cnkanaxsrsshk2y37sbvyyzc40k61r57zb0c3jarz583h3yzlai";
+       revision = "1";
        editedCabalFile = "44d11ed6751baf0383e968d36adca3c1ab49450cb0e147c1496feba468087e90";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring fay fay-jquery fay-text lens mtl snap snap-core
          snap-loader-dynamic snap-loader-static snap-server snaplet-fay text
        ];
+       executableHaskellDepends = [
+         base bytestring fay fay-jquery fay-text lens mtl snap snap-core
+         snap-loader-static snap-server snaplet-fay text
+       ];
        jailbreak = true;
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omaketex" = callPackage
@@ -96502,7 +98953,7 @@ self: {
        sha256 = "0kq2j8pndzn3fjdklyh22vcg8am48i29gx4jq2i74p4gmdryavn9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base optparse-applicative shakespeare-text shelly text
        ];
        jailbreak = true;
@@ -96522,7 +98973,7 @@ self: {
        sha256 = "0v11j2gz98g5ng9dsfbr7k3a2xhw2xqa1qi1q8ad53sx2yhjv0ly";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath pretty time
        ];
        homepage = "http://code.google.com/p/omega/";
@@ -96541,7 +98992,7 @@ self: {
        sha256 = "18xkwsinfjvd20249bm3z0qvsi51j776ifqa6vkrrl186pwa8im7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs conduit sandi transformers
        ];
        jailbreak = true;
@@ -96559,7 +99010,7 @@ self: {
        pname = "on-a-horse";
        version = "0.3";
        sha256 = "18nbvdbdg05fmymbvvhig6invr6ald0gdadl666m4axc8m9n6pvg";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base bytestring case-insensitive containers cookie
          http-types mtl random safe split text time transformers utf8-string
          wai wai-extra warp
@@ -96580,7 +99031,10 @@ self: {
        sha256 = "0pmkaw3w69nf928z263my7q0l2zi2v4yx5w49warbgv66h00wgkz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring GenericPretty network process random
+       ];
+       executableHaskellDepends = [
          base bytestring GenericPretty network process random
        ];
        homepage = "https://github.com/crackleware/on-demand-ssh-tunnel";
@@ -96594,7 +99048,9 @@ self: {
        pname = "one-liner";
        version = "0.5.1";
        sha256 = "0nb3cix82nvs06v5mv1xa6076j5cvwyx2jrn7dmyrpf67a76kfh0";
-       buildDepends = [ base contravariant ghc-prim transformers ];
+       libraryHaskellDepends = [
+         base contravariant ghc-prim transformers
+       ];
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
@@ -96609,8 +99065,10 @@ self: {
        pname = "one-time-password";
        version = "1.0.0.1";
        sha256 = "1kpwx8lpk764qva536v9x7xskjy94rj8xwwnhsqakps6r29c7qa0";
-       buildDepends = [ base byteable bytestring cereal cryptohash time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base byteable bytestring cereal cryptohash time
+       ];
+       testHaskellDepends = [
          base bytestring cryptohash tasty tasty-hunit time
        ];
        homepage = "https://github.com/s9gf4ult/one-time-password";
@@ -96624,7 +99082,7 @@ self: {
        pname = "oneOfN";
        version = "0.1.0.1";
        sha256 = "05gycp2zvq08bjl9dx1lm3cjr12i50k3cwq4al34y1rlp2r531lk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mokus0/oneOfN";
        description = "Anonymous coproduct type";
        license = stdenv.lib.licenses.publicDomain;
@@ -96636,7 +99094,7 @@ self: {
        pname = "oneormore";
        version = "0.1.0.3";
        sha256 = "1lz429abk7qqwfya3wa1m5pcyyldagcmmc0ghjfbl8byhkaax63p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/thinkpad20/oneormore";
        description = "A never-empty list type";
@@ -96652,7 +99110,7 @@ self: {
        sha256 = "17c9yy0fshxhpdfqb6hi23kvnvvckcdmlr2dffpgx4cg9znh62s1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec regex-compat ];
+       executableHaskellDepends = [ base parsec regex-compat ];
        description = "A grep-like tool for filtering on words or lines";
        license = "GPL";
      }) {};
@@ -96663,7 +99121,7 @@ self: {
        pname = "onu-course";
        version = "1";
        sha256 = "1d0yn5bj04ircxbi12rx80kds54zssmq4j9kqyk05nmv506x76k0";
-       buildDepends = [ base smallcheck ];
+       libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96675,7 +99133,7 @@ self: {
        pname = "oo-prototypes";
        version = "0.1.0.0";
        sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/yi-editor/oo-prototypes";
        description = "Support for OO-like prototypes";
        license = stdenv.lib.licenses.gpl2;
@@ -96691,13 +99149,13 @@ self: {
        pname = "opaleye";
        version = "0.4.0.0";
        sha256 = "1dzfxy5r2phqcnijvq74ardjg9p2mlkpidg95dd3v9qiz1ls71rk";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
          profunctors semigroups text time time-locale-compat transformers
          uuid void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers contravariant postgresql-simple product-profunctors
          profunctors QuickCheck semigroups time
        ];
@@ -96717,12 +99175,12 @@ self: {
        pname = "opaleye-sqlite";
        version = "0.0.1.0";
        sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring case-insensitive contravariant
          direct-sqlite pretty product-profunctors profunctors semigroups
          sqlite-simple text time time-locale-compat transformers uuid void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers contravariant product-profunctors profunctors
          QuickCheck semigroups sqlite-simple time
        ];
@@ -96739,7 +99197,8 @@ self: {
        sha256 = "093i475l9gyb5jyk2m6fdz1dw2jm545rlrbmwqz3vfdfy2ikcks3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
+       executableHaskellDepends = [ base ];
        description = "Open a web browser from Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96756,7 +99215,7 @@ self: {
        sha256 = "1k9d1r1z7q6lm8fha630rg2qfmwwnr9dv2ajvqwvrki2m6i9sczn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          HTTP mtl network old-time parsec pretty process syb texmath
          utf8-string xhtml xml zip-archive
@@ -96773,8 +99232,8 @@ self: {
        pname = "open-typerep";
        version = "0.3.1";
        sha256 = "1wx3rh7fzq5d4g45k4fjwv0yh5grcqpvzlf2ixkni20d9rhb0yzs";
-       buildDepends = [ base constraints mtl syntactic tagged ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base constraints mtl syntactic tagged ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
@@ -96788,7 +99247,8 @@ self: {
        sha256 = "1dkz7a5k86r74lnf891grn48q8agkmd81czfp1g4l4dnxslldsqw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/RobotGymnast/open-union";
        description = "Extensible, type-safe unions";
        license = stdenv.lib.licenses.mit;
@@ -96801,7 +99261,7 @@ self: {
        pname = "open-witness";
        version = "0.1.1";
        sha256 = "1i38lhy1wla0xqgcbyf06179r1hs6194wqd8gg26q491ddc0vp3l";
-       buildDepends = [ base mtl witness ];
+       libraryHaskellDepends = [ base mtl witness ];
        jailbreak = true;
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
@@ -96814,8 +99274,8 @@ self: {
        pname = "opencv-raw";
        version = "0.1.0.0";
        sha256 = "040hjkqd2zqkd8zbnfv8wmyzkfgckiv4njryilx1gpyp7c6qxpwn";
-       buildDepends = [ base bindings-DSL Cabal vector ];
-       pkgconfigDepends = [ opencv ];
+       libraryHaskellDepends = [ base bindings-DSL Cabal vector ];
+       libraryPkgconfigDepends = [ opencv ];
        jailbreak = true;
        homepage = "www.github.com/arjuncomar/opencv-raw.git";
        description = "Raw Haskell bindings to OpenCV >= 2.0";
@@ -96829,7 +99289,7 @@ self: {
        pname = "opendatatable";
        version = "0.0.0";
        sha256 = "1bv729ljw07arz9fzg0nqj6fkpwkxkjds073cz3zr9in0a5b1531";
-       buildDepends = [ base hxt template-haskell th-lift ];
+       libraryHaskellDepends = [ base hxt template-haskell th-lift ];
        jailbreak = true;
        homepage = "https://github.com/fabianbergmark/OpenDataTable";
        description = "A library for working with Open Data Tables";
@@ -96844,7 +99304,7 @@ self: {
        pname = "openexchangerates";
        version = "0.1.0.0";
        sha256 = "0ci1hfdcf0msn3j5l42z4pnn9sw77r0a4anlqsrnl2vrcpfs3j8l";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers currency errors HTTP network text
        ];
        homepage = "https://github.com/singpolyma/openexchangerates-haskell";
@@ -96861,7 +99321,7 @@ self: {
        pname = "openflow";
        version = "0.3.0";
        sha256 = "0dhg34s4imr1v6wlc567qg5929wa82my7jbhxm9hqq0882vb0sb2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bimap binary bytestring containers deepseq-generics
          hashable network
        ];
@@ -96869,6 +99329,7 @@ self: {
        homepage = "https://github.com/AndreasVoellmy/openflow";
        description = "OpenFlow";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opengles" = callPackage
@@ -96879,11 +99340,11 @@ self: {
        pname = "opengles";
        version = "0.7.0";
        sha256 = "0vzd1dfg772947h4wny1fsskgdfxk31q86n0p507vmd7pxz6m5dj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring distributive future-resource ghc-prim lens linear
          packer vector
        ];
-       extraLibraries = [ EGL GLESv2 ];
+       librarySystemDepends = [ EGL GLESv2 ];
        jailbreak = true;
        description = "OpenGL ES 2.0 and 3.0 with EGL 1.4";
        license = stdenv.lib.licenses.gpl3;
@@ -96900,7 +99361,7 @@ self: {
        sha256 = "0rhd2hz3ls9ifcrifxhd4qvd7axydnlk5gckxay55dp2lcfc4css";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HsOpenSSL HTTP monadLib network time xml
        ];
        homepage = "http://github.com/elliottt/hsopenid";
@@ -96918,8 +99379,10 @@ self: {
        pname = "openpgp";
        version = "0.6.1";
        sha256 = "03sdl0nzxnqbg8cnkglxkbz5xh5s57n6qgdjdnd82sdz139ia69s";
-       buildDepends = [ base binary bytestring bzlib utf8-string zlib ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring bzlib utf8-string zlib
+       ];
+       testHaskellDepends = [
          base binary bytestring bzlib HUnit QuickCheck quickcheck-instances
          test-framework test-framework-hunit test-framework-quickcheck2
          utf8-string zlib
@@ -96938,10 +99401,10 @@ self: {
        pname = "openpgp-Crypto";
        version = "0.5";
        sha256 = "0gsdzfg378j7s2kpryg43ajxcdk8s5szk0yq48qfvnlsbgrxz07r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring Crypto openpgp utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring Crypto HUnit openpgp QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          utf8-string
@@ -96961,10 +99424,10 @@ self: {
        pname = "openpgp-asciiarmor";
        version = "0.1";
        sha256 = "1xrv0n7n1n8izvxvqm8wmj6mkn5l6wcq18bxs9zd1q5riynmmm2w";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring cereal
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base base64-bytestring bytestring cereal HUnit
          test-framework test-framework-hunit
        ];
@@ -96984,11 +99447,11 @@ self: {
        pname = "openpgp-crypto-api";
        version = "0.6.3";
        sha256 = "18grb5jzf7n4670xww3ca2l05ck3lj2msynl57y5fjia8gfr8ijm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal crypto-api cryptocipher cryptohash
          openpgp tagged transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring cereal crypto-api cryptocipher cryptohash
          HUnit openpgp QuickCheck quickcheck-instances tagged test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
@@ -97009,7 +99472,7 @@ self: {
        pname = "opensoundcontrol-ht";
        version = "0.3";
        sha256 = "154bviaqkh9a02li6f2351764wgy0b0lh4a4s0wg8ql7ml0fykza";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hosc process random transformers utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
@@ -97027,11 +99490,12 @@ self: {
        sha256 = "0a7vfbw84p3iyggq92yhw2dcsmk1cycxaq3v1104i7ipr2kdm36a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base octohat text ];
+       executableHaskellDepends = [
          base directory dotenv filepath keyword-args octohat
          optparse-applicative parsec text unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec keyword-args octohat optparse-applicative parsec text
        ];
        homepage = "https://github.com/stackbuilders/openssh-github-keys";
@@ -97046,7 +99510,7 @@ self: {
        pname = "openssl-createkey";
        version = "0.1";
        sha256 = "1p59wlkirz4dwyhsnzzzbvy2cwfizn2zky5sxrsmnrzfkbpx1ig5";
-       buildDepends = [ base directory HsOpenSSL time unix ];
+       libraryHaskellDepends = [ base directory HsOpenSSL time unix ];
        description = "Create OpenSSL keypairs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97059,8 +99523,10 @@ self: {
        pname = "openssl-streams";
        version = "1.2.1.0";
        sha256 = "1jqrc9wxvw196vgcbhpazi9vldqs31jb6jxc529iy9k7vh4mk5m9";
-       buildDepends = [ base bytestring HsOpenSSL io-streams network ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL io-streams network
+       ];
+       testHaskellDepends = [
          base bytestring HsOpenSSL HUnit io-streams network test-framework
          test-framework-hunit
        ];
@@ -97074,8 +99540,8 @@ self: {
        pname = "opentheory";
        version = "1.200";
        sha256 = "0fdxrpsw3c4p1y80xfab0cl5zhkjcp9dlylgxywzq5kcpqv07ifh";
-       buildDepends = [ base opentheory-primitive QuickCheck ];
-       testDepends = [ base opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [ base opentheory-primitive QuickCheck ];
+       testHaskellDepends = [ base opentheory-primitive QuickCheck ];
        homepage = "http://opentheory.gilith.com/?pkg=base";
        description = "The standard theory library";
        license = stdenv.lib.licenses.mit;
@@ -97089,7 +99555,7 @@ self: {
        pname = "opentheory-bits";
        version = "1.66";
        sha256 = "1qjgrmi05ay4qss6w5ld4pmksb3lsscqpw0x2dcdkja1i5hfpwfj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-primitive opentheory-probability
          QuickCheck
        ];
@@ -97107,7 +99573,7 @@ self: {
        pname = "opentheory-byte";
        version = "1.126";
        sha256 = "0zlfik0irikrwk706fdjqb10z5jck3ldlsw269mfwlz6s1d5j2qz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-bits opentheory-primitive
          opentheory-probability QuickCheck
        ];
@@ -97127,7 +99593,11 @@ self: {
        sha256 = "0z0dg3bgck8yjn45a7i5ymx2gm9i5m9skmg0n1cg7p6hgdka9j9i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base opentheory opentheory-parser opentheory-primitive QuickCheck
+         random
+       ];
+       executableHaskellDepends = [
          base opentheory opentheory-parser opentheory-primitive QuickCheck
          random
        ];
@@ -97144,8 +99614,12 @@ self: {
        pname = "opentheory-divides";
        version = "1.63";
        sha256 = "1jax8103yhgmbwfzbpnis4nj6f90n3wizb2znvafd4pw2afs5mkv";
-       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
-       testDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
+       testHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
        homepage = "http://opentheory.gilith.com/?pkg=natural-divides";
        description = "The divides relation on natural numbers";
        license = stdenv.lib.licenses.mit;
@@ -97159,10 +99633,10 @@ self: {
        pname = "opentheory-fibonacci";
        version = "1.69";
        sha256 = "09rqz7fixh1k4ya1aci7v0wy0sz2m7j5cj66plcbvpv6p03yq1vv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-primitive opentheory-stream QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base opentheory opentheory-primitive opentheory-stream QuickCheck
        ];
        description = "Fibonacci numbers";
@@ -97176,8 +99650,12 @@ self: {
        pname = "opentheory-parser";
        version = "1.158";
        sha256 = "0325g7m5z64dg8sihmcgi9rmkms6r76hf1d7927v08dl5xh4dlhi";
-       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
-       testDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
+       testHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
        jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=parser";
        description = "Stream parsers";
@@ -97192,11 +99670,11 @@ self: {
        pname = "opentheory-prime";
        version = "1.82";
        sha256 = "1x6sir4abr34cghmhbyv5qfd847xbbxg88qaw1vs3sa5lhb5dm8s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-divides opentheory-primitive
          opentheory-stream QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base opentheory opentheory-divides opentheory-primitive
          opentheory-stream QuickCheck
        ];
@@ -97212,8 +99690,8 @@ self: {
        pname = "opentheory-primitive";
        version = "1.7";
        sha256 = "02lg02w4sds1489bfz4hwgnhd9l6a1l7r9pwjd3s16yj2hbmr6jn";
-       buildDepends = [ base QuickCheck random ];
-       testDepends = [ base QuickCheck random ];
+       libraryHaskellDepends = [ base QuickCheck random ];
+       testHaskellDepends = [ base QuickCheck random ];
        homepage = "http://www.gilith.com/research/opentheory/";
        description = "Haskell primitives used by OpenTheory packages";
        license = stdenv.lib.licenses.mit;
@@ -97226,7 +99704,9 @@ self: {
        pname = "opentheory-probability";
        version = "1.49";
        sha256 = "0dszjszjdabgafpvxiailpgzm7y96f4a8zhjfhin3m36f3lb0dmy";
-       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
        jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=probability";
        description = "Probability";
@@ -97240,7 +99720,9 @@ self: {
        pname = "opentheory-stream";
        version = "1.46";
        sha256 = "0p27hvxxxl6x6g97llls8kry5vlmpi5b02x9x96v24m4clxj55wa";
-       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
        homepage = "http://opentheory.gilith.com/?pkg=stream";
        description = "Infinite stream types";
        license = stdenv.lib.licenses.mit;
@@ -97255,11 +99737,11 @@ self: {
        pname = "opentheory-unicode";
        version = "1.140";
        sha256 = "1w916hc6qn8bf5z95b43aqm25mbivlg7b4q91g5s6gy3q1f4iqna";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-bits opentheory-byte opentheory-parser
          opentheory-primitive opentheory-probability QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base opentheory opentheory-bits opentheory-byte opentheory-parser
          opentheory-primitive opentheory-probability QuickCheck
        ];
@@ -97277,7 +99759,8 @@ self: {
        sha256 = "1aj3jhiyz4190b0qmyp684b8lbzrp8jn56s898892rvbp0hxa0pd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl random ];
+       libraryHaskellDepends = [ base mtl ];
+       executableHaskellDepends = [ random ];
        homepage = "http://haskell.org/haskellwiki/Operational";
        description = "Implementation of difficult monads made easy with operational semantics";
        license = stdenv.lib.licenses.bsd3;
@@ -97289,7 +99772,7 @@ self: {
        pname = "operational-class";
        version = "0.3.0.0";
        sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b";
-       buildDepends = [ base operational transformers ];
+       libraryHaskellDepends = [ base operational transformers ];
        homepage = "https://github.com/srijs/haskell-operational-class";
        description = "MonadProgram typeclass for the operational package";
        license = stdenv.lib.licenses.mit;
@@ -97301,7 +99784,7 @@ self: {
        pname = "opml";
        version = "0.4";
        sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x";
-       buildDepends = [ base directory xml ];
+       libraryHaskellDepends = [ base directory xml ];
        description = "Representing and handling OPML subscription information";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97319,14 +99802,14 @@ self: {
        pname = "opml-conduit";
        version = "0.3.0.0";
        sha256 = "00kknysgzv1cbrgx1sgb2qg99lr3715mhdx2wcjsi65msk67ngiz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base case-insensitive conduit conduit-parse containers data-default
          exceptions hashable hashable-time lens mono-traversable
          monoid-subclasses network-uri parsers QuickCheck
          quickcheck-instances semigroups text time timerep
          unordered-containers xml-conduit xml-conduit-parse xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-combinators conduit-parse containers
          data-default exceptions hlint lens mtl network-uri parsers
          resourcet tasty tasty-hunit tasty-quickcheck xml-conduit-parse
@@ -97334,7 +99817,6 @@ self: {
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -97347,7 +99829,7 @@ self: {
        sha256 = "0x53kvcpbd9fh00zs8wdkb3xsl8hf1bsqgl83ci17di1jyg3m4ch";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath ini network-uri optparse-applicative
          process text unordered-containers
        ];
@@ -97366,8 +99848,11 @@ self: {
        sha256 = "1863sh22yfy7i5ibqjsp3bzbaxjd7vwhy2j3r523qrcci0xs8n9b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cryptohash deepseq hex vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq vector ];
+       executableHaskellDepends = [
+         base bytestring cryptohash deepseq hex vector
+       ];
+       testHaskellDepends = [
          base bytestring bytestring-arbitrary deepseq QuickCheck vector
        ];
        jailbreak = true;
@@ -97384,10 +99869,10 @@ self: {
        pname = "optimization";
        version = "0.1.6";
        sha256 = "182dwjs24m60waqqhvq42l9hpshwzr07bbb87jjpmhfjrlxf4xly";
-       buildDepends = [
+       libraryHaskellDepends = [
          ad base distributive linear semigroupoids vector
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/optimization";
        description = "Numerical optimization";
@@ -97404,7 +99889,7 @@ self: {
        sha256 = "0642f9vv08qyqk3pjgin5k2sfv2ffhah9h9rc2xw6ahnygqbpbmf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers fgl flite graphviz haskell98 mtl parsec
          uniplate wl-pprint
        ];
@@ -97421,8 +99906,10 @@ self: {
        pname = "optional";
        version = "0.0.1";
        sha256 = "1i1nl81gg5fndf3vafirpmklikn4xpy791is6ff8j7pzys0qfj8g";
-       buildDepends = [ base ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/optional";
        description = "Using type-classes for optional function arguments";
        license = stdenv.lib.licenses.bsd3;
@@ -97434,7 +99921,7 @@ self: {
        pname = "optional-args";
        version = "1.0.0";
        sha256 = "0j49cp5y7gp9acvhw315lq92mgr35fwaw90vpxy0n9g541ls350z";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Optional function arguments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97447,8 +99934,8 @@ self: {
        pname = "options";
        version = "1.2.1.1";
        sha256 = "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8";
-       buildDepends = [ base containers monads-tf transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers monads-tf transformers ];
+       testHaskellDepends = [
          base chell chell-quickcheck containers monads-tf transformers
        ];
        homepage = "https://john-millikin.com/software/haskell-options/";
@@ -97462,8 +99949,8 @@ self: {
        pname = "options-time";
        version = "1.0.1";
        sha256 = "0rsmwalmnry71w23k6sg0a307xgb2s71j9s12zqqq380fw6c1bhm";
-       buildDepends = [ base options time ];
-       testDepends = [ base chell options time ];
+       libraryHaskellDepends = [ base options time ];
+       testHaskellDepends = [ base chell options time ];
        homepage = "https://john-millikin.com/software/haskell-options/";
        description = "Command-line option types for dates and times";
        license = stdenv.lib.licenses.mit;
@@ -97476,10 +99963,10 @@ self: {
      mkDerivation {
        pname = "optparse-applicative";
        version = "0.10.0";
-       revision = "1";
        sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb";
+       revision = "1";
        editedCabalFile = "20d6ce280b028a493a1920dcc22bb39bee10e9c788a58e03dcaeecba97afffb0";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
        jailbreak = true;
@@ -97496,7 +99983,7 @@ self: {
        pname = "optparse-applicative";
        version = "0.11.0.2";
        sha256 = "0ni52ii9555jngljvzxn1ngicr6i2w647ww3rzhdrmng04y95iii";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
        homepage = "https://github.com/pcapriotti/optparse-applicative";
@@ -97510,7 +99997,7 @@ self: {
        pname = "optparse-declarative";
        version = "0.3.0";
        sha256 = "1avy0g6jk34jbfp1xzqcyhb4j53knsbzx1pssl4b5f6nn981mbj8";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/tanakh/optparse-declarative";
        description = "Declarative command line option parser";
        license = stdenv.lib.licenses.mit;
@@ -97524,7 +100011,7 @@ self: {
        pname = "optparse-simple";
        version = "0.0.3";
        sha256 = "0zlcvxhx98k1akbv5fzsvwcrmb1rxsmmyaiwkhfrp5dxq6kg0is5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base either gitrev optparse-applicative template-haskell
          transformers
        ];
@@ -97541,7 +100028,10 @@ self: {
        sha256 = "0zl456v2mwa68k2lq7fx3ds6xr9vbrijq8q8ma5mm1kk9p9znr0x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base deepseq monadIO mtl process random stm ];
+       libraryHaskellDepends = [ base deepseq monadIO mtl process stm ];
+       executableHaskellDepends = [
+         base deepseq monadIO mtl process random stm
+       ];
        description = "Orchestration-style co-ordination EDSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97556,12 +100046,12 @@ self: {
        pname = "orchestrate";
        version = "0.2.0.2";
        sha256 = "09h9jqni25ysalw747xbf532m0gvy8najjwbn3jj7d3z50s0vf8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring case-insensitive data-default either errors
          http-client http-types lens mtl text transformers
          unordered-containers wreq
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring errors hspec lens QuickCheck smallcheck text
          wreq
        ];
@@ -97579,7 +100069,7 @@ self: {
        pname = "orchid";
        version = "0.0.8";
        sha256 = "1d3cfhhsv1qpiiin4cs9wxx2a6vwcj0iad746z7l1qzyxrhg4dkm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers encoding extensible-exceptions fclabels
          filestore hscolour mtl nano-md5 parsec process QuickCheck salvia
          salvia-extras stm time unix xml
@@ -97600,7 +100090,7 @@ self: {
        sha256 = "1gfjmakfx8244q1yqbgp2ji9bh45ll8ixvxbdd961my30j7gh29z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base extensible-exceptions mtl network orchid Pipe salvia
          salvia-extras stm
        ];
@@ -97616,7 +100106,7 @@ self: {
        pname = "ord-adhoc";
        version = "0.0.0.1";
        sha256 = "062wkfpww1ic3xiy26k22369azk5wjlpn5wm5xh1w75kc9crv263";
-       buildDepends = [ base void ];
+       libraryHaskellDepends = [ base void ];
        homepage = "https://github.com/fumieval/ord-adhoc/";
        description = "Creating Ord instances instantly";
        license = stdenv.lib.licenses.bsd3;
@@ -97630,8 +100120,8 @@ self: {
        pname = "order-maintenance";
        version = "0.0.1.0";
        sha256 = "01j8caxlmzz04qabinq5kcjdsr1855lmcdsi9sqn9zf79s16q97k";
-       buildDepends = [ base containers transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck transformers
        ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance";
@@ -97648,7 +100138,7 @@ self: {
        pname = "order-statistics";
        version = "0.1.1";
        sha256 = "1df9b0q4rmgnd74q7pckcppyiygzba6f39vajkwb2pmxlfafcy7a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers math-functions statistics vector vector-space
        ];
        jailbreak = true;
@@ -97663,7 +100153,7 @@ self: {
        pname = "ordered";
        version = "0.1";
        sha256 = "0s0g5kgzdw7qjsdcddszjclamx9bi0369pkwhh0wncjg68a7mq69";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A definition of Posets";
        license = "unknown";
      }) {};
@@ -97674,7 +100164,7 @@ self: {
        pname = "orders";
        version = "0.1.0.0";
        sha256 = "1ry6flg5sh3hl1xpkqk67ayd4y0xx3j2pwcz26q1pgqn6m84plzr";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "basic orders";
        license = stdenv.lib.licenses.bsd3;
@@ -97688,8 +100178,8 @@ self: {
        pname = "ordrea";
        version = "0.3.0.0";
        sha256 = "067nf69diqi00vswd7xarl55ps9v5cwqmph1w6nzjylnl0pjh811";
-       buildDepends = [ base containers transformers vector ];
-       testDepends = [ base directory process split ];
+       libraryHaskellDepends = [ base containers transformers vector ];
+       testHaskellDepends = [ base directory process split ];
        description = "Push-pull implementation of discrete-time FRP";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -97702,7 +100192,7 @@ self: {
        sha256 = "04d56k6x6psynk8lddbawc3kfa4yc66w4qgjag20grm4zd7y45ax";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ attoparsec base text ];
+       executableHaskellDepends = [ attoparsec base text ];
        jailbreak = true;
        description = "Organize scala imports";
        license = stdenv.lib.licenses.gpl3;
@@ -97716,10 +100206,10 @@ self: {
        pname = "orgmode";
        version = "0.1.0.0";
        sha256 = "084dzafa8pm2hs346zk3x3agzzcxay7ca9r40s6sh61vfc6hbwg0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HStringTemplate parsec regex-posix syb text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec HStringTemplate network network-uri parsec
          QuickCheck random regex-posix syb text
        ];
@@ -97737,11 +100227,11 @@ self: {
        pname = "orgmode-parse";
        version = "0.1.1.2";
        sha256 = "1ys9gcydipjxn5ba7ndmz70ri218d6wivxrd7xvcsf4kncfks3xi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring containers hashable HUnit
          old-locale tasty tasty-hunit text thyme unordered-containers
        ];
@@ -97758,10 +100248,12 @@ self: {
        pname = "origami";
        version = "0.0.4";
        sha256 = "0q0dsyhpp63kkpjqvjksy1xnwp1f9yilgxrxgwcqrzdjzmgg4rzw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers lens mtl pretty template-haskell
        ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        homepage = "http://github.com/nedervold/origami";
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
@@ -97776,8 +100268,8 @@ self: {
        pname = "os-release";
        version = "0.2.1";
        sha256 = "0ij6i1yp2rmbkr9jhr8i969xajw3kbfx0yb44s51gm3mcjb3g4la";
-       buildDepends = [ base containers parsec transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec transformers ];
+       testHaskellDepends = [
          base containers hlint hspec parsec process regex-compat temporary
          transformers
        ];
@@ -97794,7 +100286,7 @@ self: {
        pname = "osc";
        version = "1.0.0.2";
        sha256 = "0f7diw6nna7mq5rsn63jk9n230pnrr5ppi5dp8rcpniqry2gs1q3";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring data-binary-ieee754 network
        ];
        jailbreak = true;
@@ -97813,10 +100305,11 @@ self: {
        sha256 = "18pc2r5acb3b6dr7niib4fn8x2la6y3f5zlj3ibrxhl5c1q35j6y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring conduit conduit-extra containers libnotify process
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra containers libnotify
          resourcet time transformers
        ];
+       executableHaskellDepends = [ base process ];
        description = "Show keys pressed with an on-screen display (Linux only)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97832,7 +100325,7 @@ self: {
        pname = "osm-download";
        version = "0.4";
        sha256 = "056ggv31nycgz59gkmibzmx0k5x8klb5bwlnbhdih8d71larbsb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers data-default directory gps
          http-conduit http-types monad-control monadIO mtl persistent
          persistent-sqlite persistent-template pool-conduit stm stm-chans
@@ -97850,7 +100343,7 @@ self: {
        pname = "osx-ar";
        version = "0.11";
        sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn";
-       buildDepends = [ base binary bytestring containers ];
+       libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97864,10 +100357,10 @@ self: {
        pname = "ot";
        version = "0.2.0.0";
        sha256 = "0vf4lqc0mffnhz4a03jvs35rl1ygp2ipdmn3dyb5darsg941gsd3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base binary either ghc mtl QuickCheck text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base binary HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
@@ -97886,7 +100379,9 @@ self: {
        sha256 = "1dwl9jbrhw5b7z2imlnkn8qjk36z06gqca4y9h8r85phsdkyzbm4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parsec split uniplate ];
+       executableHaskellDepends = [
+         base containers parsec split uniplate
+       ];
        description = "Pretty-printer for Ott parse trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97897,8 +100392,8 @@ self: {
        pname = "overture";
        version = "0.0.5";
        sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw";
-       buildDepends = [ base ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        description = "An alternative to some of the Prelude";
        license = stdenv.lib.licenses.mit;
@@ -97912,7 +100407,9 @@ self: {
        pname = "pack";
        version = "0.4.0";
        sha256 = "19ps1dk855br5h9x72f26sjx8xnh4gmqb0cf5mi65jpp5zvp0zj9";
-       buildDepends = [ array base bytestring lens transformers vector ];
+       libraryHaskellDepends = [
+         array base bytestring lens transformers vector
+       ];
        jailbreak = true;
        homepage = "https://github.com/capsjac/pack";
        description = "Bidirectional fast ByteString packer/unpacker";
@@ -97929,7 +100426,8 @@ self: {
        sha256 = "0r4zksyszbhywyyayjs1cn8d69cnm0p4y9xqir9nw1g4gkl23df8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base filemanip filepath groom process ];
+       executableHaskellDepends = [
          base Cabal filemanip filepath groom packdeps process
        ];
        description = "Utilities for working with cabal packages and your package database";
@@ -97944,7 +100442,9 @@ self: {
        sha256 = "0rsv60n6fd9kkjihdjzi7hadxj8yd6bd640w92y2wx1y9qxl8lhm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal Diff filepath haskell-src-exts ];
+       executableHaskellDepends = [
+         base Cabal Diff filepath haskell-src-exts
+       ];
        jailbreak = true;
        description = "Haskell Package Versioning Tool";
        license = stdenv.lib.licenses.bsd3;
@@ -97961,10 +100461,11 @@ self: {
        sha256 = "08an9nwg448d3w4yds67l02mgikmjmn52pvva3i386fv4hfkabhp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal containers directory filepath split tar text
          time
        ];
+       executableHaskellDepends = [ base Cabal ];
        homepage = "http://packdeps.haskellers.com/";
        description = "Check your cabal packages for lagging dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -97979,11 +100480,11 @@ self: {
        pname = "packed-dawg";
        version = "0.2.0.7";
        sha256 = "03wf6pnv2l7aydxzv0gx073324iy5j7pbfh5nl3p5xdpr8y8il7y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary deepseq mtl unordered-containers vector
          vector-binary-instances
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary deepseq HUnit mtl QuickCheck tasty tasty-hunit
          tasty-quickcheck unordered-containers vector
          vector-binary-instances
@@ -97997,10 +100498,10 @@ self: {
      mkDerivation {
        pname = "packedstring";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "1x78pzzdlnpcmh9p37rlf8m5cxf3yqm2alf3whl4zpr9w25r0qj8";
+       revision = "1";
        editedCabalFile = "cbc334ff8e721fb18b6799b28dc3e77addc7234aa553725b0af68375f75e0bcf";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        jailbreak = true;
        description = "(Deprecated) Packed Strings";
        license = stdenv.lib.licenses.bsd3;
@@ -98015,8 +100516,8 @@ self: {
        pname = "packer";
        version = "0.1.8";
        sha256 = "1r7q54a1c6yb0gjd8hvxq1jw2fmgbhf5anfw47nzibs1bywjjgbi";
-       buildDepends = [ base bytestring ghc-prim transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ghc-prim transformers ];
+       testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "http://github.com/vincenthz/hs-packer";
@@ -98031,12 +100532,12 @@ self: {
      mkDerivation {
        pname = "packunused";
        version = "0.1.1.4";
-       revision = "1";
        sha256 = "1ahb8wq7yxnfzwcvppk8cyhj9r51fz9ci1pwy0h4ql7iyc3z0vy8";
+       revision = "1";
        editedCabalFile = "5ddb122ff2a1ac4e79226f31b4d8f7dab67bb5501d0e715d84dbfe36c845b772";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal directory filepath haskell-src-exts optparse-applicative
          split
        ];
@@ -98053,7 +100554,7 @@ self: {
        sha256 = "04jlfinds38kjy0qrk00a7ik5x7mkdwkb0cwmlzlif45x4zrhwfv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base deepseq directory-tree ];
+       executableHaskellDepends = [ base deepseq directory-tree ];
        jailbreak = true;
        homepage = "https://github.com/Tener/archlinux-utils";
        description = "Read whole Pacman database which pushes it into the memory cache";
@@ -98068,7 +100569,7 @@ self: {
        pname = "padKONTROL";
        version = "0.1";
        sha256 = "1sv7124ms2msqb2wb361xshykmh8cr4i85qayjak8y8q7bpzkdfd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hmidi minioperational transformers
        ];
        jailbreak = true;
@@ -98087,7 +100588,10 @@ self: {
        sha256 = "1zkh8cx4bdgsyra7x9kzzdcckg65y1hacwq90w36gdl6i4hs7nj0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring containers lens text wreq ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers lens text wreq
+       ];
+       executableHaskellDepends = [ base text wreq ];
        jailbreak = true;
        homepage = "https://github.com/diogob/pagarme_haskell";
        description = "Pagarme API wrapper";
@@ -98105,10 +100609,11 @@ self: {
        sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra directory process resourcet
          safe terminfo text transformers unix
        ];
+       executableHaskellDepends = [ base bytestring conduit-extra text ];
        homepage = "https://github.com/pharpend/pager";
        description = "Open up a pager, like 'less' or 'more'";
        license = stdenv.lib.licenses.bsd2;
@@ -98125,10 +100630,10 @@ self: {
      mkDerivation {
        pname = "pagerduty";
        version = "0.0.3.2";
-       revision = "1";
        sha256 = "0cdn5xmqpfl85nair2ns3dv690wgyfiapks0lnc3aqi8nnly7bws";
+       revision = "1";
        editedCabalFile = "016fff9ce8abfc6dec19a84ed7043a2d6f6692f2b0f20a845e98a347a1bc48ba";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring bytestring-conversion conduit
          data-default-class exceptions generics-sop http-client http-types
          lens lens-aeson mmorph monad-control mtl template-haskell text time
@@ -98148,7 +100653,7 @@ self: {
        pname = "pagure-hook-receiver";
        version = "0.1.0.0";
        sha256 = "0qnnkxcad4843v6c1fqqkiip6cv82q5fckpn5v40sw2p9xk3lkcl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers scotty shelly text transformers unix
        ];
        homepage = "https://pagure.io/pagure-hook-receiver";
@@ -98162,7 +100667,7 @@ self: {
        pname = "palette";
        version = "0.1.0.2";
        sha256 = "1snhn4mz58ax5sd77kh1m4jicwdmlrf89j612rkz5bkavvks6rrr";
-       buildDepends = [ array base colour containers ];
+       libraryHaskellDepends = [ array base colour containers ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Utilities for choosing and creating color schemes";
        license = stdenv.lib.licenses.bsd3;
@@ -98176,7 +100681,7 @@ self: {
        sha256 = "1k0kvd8p1ivwmpmf8khwmb4vyk8z0di74xn5840zy9jhf1cwx4kn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base bytestring containers ];
+       executableHaskellDepends = [ array base bytestring containers ];
        homepage = "http://www.jeuring.net/homepage/palindromes/index.html";
        description = "Finding palindromes in strings";
        license = stdenv.lib.licenses.bsd3;
@@ -98188,9 +100693,9 @@ self: {
        pname = "pam";
        version = "0.1";
        sha256 = "1lmkq12p18qavx2c7xrnha56017y0f21ri4l3cqal4fb8zy0g5nj";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ pam ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ pam ];
+       libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) pam;};
@@ -98205,7 +100710,7 @@ self: {
        pname = "panda";
        version = "2009.4.1";
        sha256 = "0yn6ia1pql5fvj784a57ym74n5sd08n1g9djgapllw9lkf6r7hv7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cgi containers data-default directory filepath gravatar
          haskell98 hcheat kibro MissingH mps network old-locale old-time
          pandoc parsec parsedate process rss utf8-string xhtml
@@ -98217,11 +100722,11 @@ self: {
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, alex, ansi-terminal, array, base
+    ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq-generics, Diff
      , directory, executable-path, extensible-exceptions, filemanip
-     , filepath, haddock-library, happy, highlighting-kate, hslua, HTTP
+     , filepath, haddock-library, highlighting-kate, hslua, HTTP
      , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
      , network, network-uri, old-time, pandoc-types, parsec, process
      , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
@@ -98233,25 +100738,29 @@ self: {
        pname = "pandoc";
        version = "1.15.0.6";
        sha256 = "0ipdy5wl2qb8nvmdka9si17hvxn38xmv5pzpb9v5lvaj8a0rcl6r";
+       configureFlags = [ "-fhttps" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson alex array base base64-bytestring binary blaze-html
-         blaze-markup bytestring cmark containers data-default
-         deepseq-generics directory extensible-exceptions filemanip filepath
-         haddock-library happy highlighting-kate hslua HTTP http-client
-         http-client-tls http-types JuicyPixels mtl network network-uri
-         old-time pandoc-types parsec process random scientific SHA syb
-         tagsoup temporary texmath text time unordered-containers vector xml
-         yaml zip-archive zlib
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring binary blaze-html blaze-markup
+         bytestring cmark containers data-default deepseq-generics directory
+         extensible-exceptions filemanip filepath haddock-library
+         highlighting-kate hslua HTTP http-client http-client-tls http-types
+         JuicyPixels mtl network network-uri old-time pandoc-types parsec
+         process random scientific SHA syb tagsoup temporary texmath text
+         time unordered-containers vector xml yaml zip-archive zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring containers directory extensible-exceptions
+         filepath highlighting-kate HTTP network network-uri pandoc-types
+         text yaml
+       ];
+       testHaskellDepends = [
          ansi-terminal base bytestring containers Diff directory
          executable-path filepath highlighting-kate HUnit pandoc-types
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
-       configureFlags = [ "-fhttps" ];
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
@@ -98270,13 +100779,16 @@ self: {
        sha256 = "0dpr74alkz9vy5yc09bnqb968hcrqys2xlydjda1g3qsarjg7p9y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers
-         data-default directory filepath hs-bibutils mtl old-locale pandoc
-         pandoc-types parsec process rfc5051 setenv split syb tagsoup
-         temporary text time vector xml-conduit yaml
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time vector xml-conduit yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath pandoc pandoc-types process syb temporary text vector yaml
+       ];
+       testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
@@ -98294,11 +100806,11 @@ self: {
        sha256 = "1ay54zkxxa22nz5sr40d6k4bam81hxh19583kffwqdcp0af23d7l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers data-default mtl pandoc pandoc-types
          yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers data-default hspec mtl pandoc
          pandoc-types process yaml
        ];
@@ -98312,16 +100824,16 @@ self: {
      mkDerivation {
        pname = "pandoc-csv2table";
        version = "1.0.1";
-       revision = "1";
        sha256 = "0b4xszf9bzfhrjgy2cymryab58zhh4jwv9p8g2hiqgrxix8jr1qb";
+       revision = "1";
        editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base csv pandoc pandoc-types text ];
+       libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
+       executableHaskellDepends = [ base csv pandoc pandoc-types ];
        homepage = "https://github.com/baig/pandoc-csv2table-filter";
        description = "Convert CSV to Pandoc Table Markdown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-lens" = callPackage
@@ -98330,7 +100842,7 @@ self: {
        pname = "pandoc-lens";
        version = "0.3.2";
        sha256 = "1n0h3cf2yb5rmlfd0bbxlj3r8bm4h8yffd76fqsbw3s5jm0df4wb";
-       buildDepends = [ base containers lens pandoc-types ];
+       libraryHaskellDepends = [ base containers lens pandoc-types ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
@@ -98347,7 +100859,7 @@ self: {
        sha256 = "0vq94j5jsq60p0wbml50hwqa2zpidbzx92cbb7d2ialqj7816zwb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring explicit-exception http-conduit pandoc-types
          spreadsheet
        ];
@@ -98364,7 +100876,7 @@ self: {
        pname = "pandoc-types";
        version = "1.12.4.5";
        sha256 = "0yw7mkhx63320vqabql2iqnmkrwh1qs670sicqpcvv73dchdp8c7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
        homepage = "http://johnmacfarlane.net/pandoc";
@@ -98380,7 +100892,7 @@ self: {
        sha256 = "0jdlfqhp7h6jsp9qq2ndnm8fs96m19cmmd5rnjpqb76ilg6kn7l9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base pandoc ];
+       executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98394,11 +100906,11 @@ self: {
        pname = "pango";
        version = "0.13.1.0";
        sha256 = "0s69ga5gn9grdqcfxkbnvk0f3malql3fnhzh9cwvpfzqk3hxn4hn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo containers directory glib mtl pretty process text
        ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ pango ];
+       libraryPkgconfigDepends = [ pango ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
@@ -98414,9 +100926,11 @@ self: {
        sha256 = "02j3bydxzs39ljfnx1sgsn9ppw1cah81dfbws57yp9vdrcyq2ipf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring directory filepath monads-tf template-haskell
-         transformers
+       libraryHaskellDepends = [
+         base bytestring monads-tf template-haskell transformers
+       ];
+       executableHaskellDepends = [
+         base directory filepath monads-tf template-haskell transformers
        ];
        homepage = "https://skami.iocikun.jp/haskell/packages/papillon";
        description = "packrat parser";
@@ -98432,7 +100946,7 @@ self: {
        sha256 = "14f4mv9xgqwmmyy3fg1miqdmi7a6bs3hixqk4z46r0pz44w6nlxd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://pdos.csail.mit.edu/~baford/packrat/thesis/";
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
@@ -98445,7 +100959,7 @@ self: {
        pname = "para";
        version = "1.1";
        sha256 = "0l5abmqi548s10f87m124ld4hhphhl1szljyc04a13fah4dsqjbh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Text paragraph formatting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98461,12 +100975,18 @@ self: {
        sha256 = "1iz7fg7ziq3ffq1wac0z2m151rn4xmvd5kig04fdw1cy0x487c9c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers cpphs directory filepath
          haskell-src-meta parsec pretty syb template-haskell th-lift
          uniplate
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base bytestring containers cpphs directory filepath
+         haskell-src-meta parsec pretty syb template-haskell th-lift
+         uniplate
+       ];
+       executableToolDepends = [ alex ];
        jailbreak = true;
        description = "Paragon";
        license = stdenv.lib.licenses.bsd3;
@@ -98479,7 +100999,7 @@ self: {
        pname = "parallel";
        version = "3.2.0.3";
        sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn";
-       buildDepends = [ array base containers deepseq ];
+       libraryHaskellDepends = [ array base containers deepseq ];
        jailbreak = true;
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -98491,7 +101011,7 @@ self: {
        pname = "parallel";
        version = "3.2.0.6";
        sha256 = "0hp6vf4zxsw6vz6lj505xihmnfhgjp39c9q7nyzlgcmps3xx6a5r";
-       buildDepends = [ array base containers deepseq ];
+       libraryHaskellDepends = [ array base containers deepseq ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98501,12 +101021,14 @@ self: {
      mkDerivation {
        pname = "parallel-io";
        version = "0.3.3";
-       revision = "1";
        sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
+       revision = "1";
        editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers extensible-exceptions random ];
+       libraryHaskellDepends = [
+         base containers extensible-exceptions random
+       ];
        homepage = "http://batterseapower.github.com/parallel-io";
        description = "Combinators for executing IO actions in parallel on a thread pool";
        license = stdenv.lib.licenses.bsd3;
@@ -98520,7 +101042,7 @@ self: {
        pname = "parallel-tasks";
        version = "4.0.1.0";
        sha256 = "0cng14pivk0cw3xax0z4j59s0vpbkm7hjycsb3cif6pfjbypsm3x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal deepseq here old-locale stm time
          transformers vector vector-algorithms
        ];
@@ -98535,7 +101057,7 @@ self: {
        pname = "parallel-tree-search";
        version = "0.4.1";
        sha256 = "1x2k649q6gqz9z16vwg1j59ajf2wp59lfwb65g8819fz4rwimncr";
-       buildDepends = [ base parallel tree-monad ];
+       libraryHaskellDepends = [ base parallel tree-monad ];
        homepage = "http://github.com/sebfisch/parallel-tree-search";
        description = "Parallel Tree Search";
        license = stdenv.lib.licenses.publicDomain;
@@ -98547,7 +101069,7 @@ self: {
        pname = "parameterized-data";
        version = "0.1.5";
        sha256 = "1zcfpapbgmzfrrwn8bq829scb89b52p1567xaw45d77z3hw24cq1";
-       buildDepends = [ base template-haskell type-level ];
+       libraryHaskellDepends = [ base template-haskell type-level ];
        homepage = "http://code.haskell.org/parameterized-data";
        description = "Parameterized data library implementing lightweight dependent types";
        license = stdenv.lib.licenses.bsd3;
@@ -98560,7 +101082,7 @@ self: {
        pname = "parco";
        version = "0.1";
        sha256 = "0598hz6zqcn4lh5y3vr54z4jh4ampxnh8rq29k6p5vnmrpvn4lq4";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98572,7 +101094,7 @@ self: {
        pname = "parco-attoparsec";
        version = "0.1";
        sha256 = "0bc2gyvc1i3l3p702zs6hfkab7fmc7li5kh4mdzy3a91gzgsl3jh";
-       buildDepends = [ attoparsec base mtl parco ];
+       libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98584,7 +101106,7 @@ self: {
        pname = "parco-parsec";
        version = "0.1";
        sha256 = "0m3dsjay3av4y0v4j76wxybmk4mkjdhqq81w1wsfr173d4blgxf3";
-       buildDepends = [ base mtl parco parsec ];
+       libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98598,7 +101120,7 @@ self: {
        pname = "parcom-lib";
        version = "0.8.0.3";
        sha256 = "0xkxkqswpkqr9xcpg52v845kkxg8z20r26yih8l2vwkym5cj49ab";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl text transformers utf8-string word8
        ];
        homepage = "https://bitbucket.org/tdammers/parcom-lib";
@@ -98620,7 +101142,7 @@ self: {
        sha256 = "05id69rb2cdzs1jf7zgv0gxgvbwm6x83s6ihdh9w1wnnpa7ykpap";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          abstract-par accelerate accelerate-io array async base binary
          bytestring containers deepseq directory distributed-process
          distributed-process-simplelocalnet distributed-static fclabels
@@ -98639,7 +101161,7 @@ self: {
        pname = "parport";
        version = "0.0.0";
        sha256 = "1d4fq67179n6flmi4ll0341cnnx6p7v44sj5xkk5vknm7qv1p5nx";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Simply interfacing the parallel port on linux";
        license = "GPL";
      }) {};
@@ -98650,7 +101172,7 @@ self: {
        pname = "parse-dimacs";
        version = "1.3";
        sha256 = "0amh3h49xi65kx8l34cy5jkai1f0d9l1qxp4937f3cjf7afif0pj";
-       buildDepends = [ array base bytestring parsec ];
+       libraryHaskellDepends = [ array base bytestring parsec ];
        description = "DIMACS CNF parser library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98663,11 +101185,11 @@ self: {
        pname = "parse-help";
        version = "0.0";
        sha256 = "1vy7v49nh60gkb7vsig87hv11cxn19xs2jjvd0xnnhdz0zm4z7yf";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers data-default file-location
          template-haskell text th-lift
        ];
-       testDepends = [ cmdargs ];
+       testHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://github.com/gregwebs/cmdargs-help";
        description = "generate command line arguments from a --help output";
@@ -98683,7 +101205,8 @@ self: {
        sha256 = "0pzw7w1kr2rv6ffqgn93rypn37wy2r5k01p3y5256laaplm575am";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/BartMassey/parseargs";
        description = "Command-line argument parsing library for Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -98697,8 +101220,10 @@ self: {
        pname = "parsec";
        version = "3.1.9";
        sha256 = "1ja20cmj6v336jy87c6h3jzjp00sdbakwbdwp11iln499k913xvi";
-       buildDepends = [ base bytestring mtl text ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base bytestring mtl text ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        homepage = "https://github.com/aslatter/parsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -98710,7 +101235,7 @@ self: {
        pname = "parsec-extra";
        version = "0.1.0.5";
        sha256 = "0x5lpkly8z26ygp0k8ddkybgmfi5n2vnf6sv3sjn3xm531xf6qy4";
-       buildDepends = [ base monads-tf parsec transformers ];
+       libraryHaskellDepends = [ base monads-tf parsec transformers ];
        description = "Some miscellaneous basic string parsers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98721,7 +101246,7 @@ self: {
        pname = "parsec-numbers";
        version = "0.1.0";
        sha256 = "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98734,8 +101259,8 @@ self: {
        pname = "parsec-parsers";
        version = "0.2";
        sha256 = "1knmcciyq07vp06s3xh4hwz654n017863dh9hdp1mwm57vc43s3j";
-       buildDepends = [ base parsec parsers ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base parsec parsers ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/parsec-parsers/";
        description = "Parsing instances for Parsec";
@@ -98748,8 +101273,8 @@ self: {
        pname = "parsec-permutation";
        version = "0.1.2.0";
        sha256 = "0yfdgvw093kk5id9h6b566zniss26kw6rxnvsni6dgr4knzyx1xi";
-       buildDepends = [ base parsec ];
-       testDepends = [ base parsec QuickCheck ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base parsec QuickCheck ];
        description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98760,7 +101285,7 @@ self: {
        pname = "parsec-tagsoup";
        version = "0.1";
        sha256 = "1pzspf5fimjlki5fn3lxz1kdpd9pf2ww8z9sf08zaiyfp4ms15n1";
-       buildDepends = [ base parsec tagsoup ];
+       libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Parsec parsers for Tagsoup tag streams";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -98771,7 +101296,7 @@ self: {
        pname = "parsec-utils";
        version = "0.1.0.0";
        sha256 = "0pfdl9zsdzxcbjh37234djcbg6sdhqzx3fnin0b55hxn78k26ivi";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Utility functions and combinators for Text.Parsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98782,7 +101307,7 @@ self: {
        pname = "parsec1";
        version = "1.0.0.6";
        sha256 = "0wwmghla8cqmmpwx9wwcmh39d9np9cgc1d0w3xf18k4adb1sg636";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Portable monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -98794,7 +101319,7 @@ self: {
        pname = "parsec2";
        version = "1.0.0";
        sha256 = "0iq5b5d0pdm49qnigss29vnxj3yjqa5rllp29dxl8df6393k6sk9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -98807,7 +101332,7 @@ self: {
        pname = "parsec3";
        version = "1.0.1.8";
        sha256 = "00p3kffqmsi6lvxbpa60nql3lgm9vnxsspp8m0jz2d2hfl7hadqf";
-       buildDepends = [ base bytestring mtl text ];
+       libraryHaskellDepends = [ base bytestring mtl text ];
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -98819,7 +101344,7 @@ self: {
        pname = "parsec3-numbers";
        version = "0.1.0";
        sha256 = "0i7fvbhvvmf5nld51kv9v0vpb42dlnpivxcl7ll0zwa3gzks2cm5";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from Char sequences";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98830,7 +101355,7 @@ self: {
        pname = "parsedate";
        version = "3000.0.0";
        sha256 = "0gsylvm8srddmh3g3ysjgqqmgp0ddg6pdi2sz15v6nrvsqfabiip";
-       buildDepends = [ base old-locale old-time parsec ];
+       libraryHaskellDepends = [ base old-locale old-time parsec ];
        homepage = "http://www.cs.chalmers.se/~bringert/darcs/parsedate/doc/";
        description = "Data and time parsing for CalendarTime";
        license = stdenv.lib.licenses.bsd3;
@@ -98842,8 +101367,8 @@ self: {
        pname = "parseerror-eq";
        version = "0.1.0.1";
        sha256 = "1w5hn50gwyq2qcax869nplmhrclpsxfy0ckij6ydlhmq22zh0l03";
-       buildDepends = [ base parsec ];
-       testDepends = [ base hspec parsec ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base hspec parsec ];
        homepage = "https://github.com/stackbuilders/parseerror-eq";
        description = "Adds and Eq instance for Parsec's ParseError if needed";
        license = stdenv.lib.licenses.mit;
@@ -98855,10 +101380,9 @@ self: {
        pname = "parsek";
        version = "1.0.1.3";
        sha256 = "184cbw9gz3vv2jbr2wzkygv25y70jayxd8d76pgpvjcaps4qqxp7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Parallel Parsing Processes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsely" = callPackage
@@ -98867,7 +101391,7 @@ self: {
        pname = "parsely";
        version = "0.1";
        sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
-       buildDepends = [ base mtl parsec ];
+       libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://naesten.dyndns.org:8080/repos/parsely";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98881,7 +101405,9 @@ self: {
        sha256 = "0cvdvphxlbyv5l9q5yc4b4kb59ghar2pmqx8pk387ffgz71r7ppb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring haskell-src-exts text ];
+       executableHaskellDepends = [
+         aeson base bytestring haskell-src-exts text
+       ];
        jailbreak = true;
        description = "Prints Haskell parse trees in JSON";
        license = stdenv.lib.licenses.asl20;
@@ -98897,10 +101423,10 @@ self: {
        pname = "parsergen";
        version = "0.2.0.7";
        sha256 = "01yx4pa5x87nqz8k999jr7bnyfkjlgk660c53xkj5ipcvl4b9mfi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath parsec template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath HUnit parsec QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -98920,11 +101446,11 @@ self: {
        pname = "parsers";
        version = "0.12.2.1";
        sha256 = "0wrzqx282ygc3m05nff2zkshgnx4lkws8d54qhkd9pjxja0fbjn7";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base charset containers parsec scientific text
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers directory doctest filepath
          parsec QuickCheck quickcheck-instances
        ];
@@ -98944,11 +101470,14 @@ self: {
        sha256 = "0prbn7vi2bp66x4fs5cm8lz9qv4d1kpcd20mf24zwpa9siwyf4aq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring bytestring-mmap bytestring-nums
          bytestring-show containers deepseq derive mtl zlib
        ];
-       buildTools = [ happy ];
+       libraryToolDepends = [ happy ];
+       executableHaskellDepends = [
+         array base binary bytestring containers deepseq mtl
+       ];
        jailbreak = true;
        description = "NMR-STAR file format parser";
        license = stdenv.lib.licenses.bsd3;
@@ -98961,7 +101490,7 @@ self: {
        pname = "parsimony";
        version = "1.3";
        sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        description = "Monadic parser combinators derived from Parsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98971,10 +101500,10 @@ self: {
      mkDerivation {
        pname = "partial";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0ybh0yz68gawbfswk1s498asc1z7qw6b8qys7rasw5i5iw6vjvr8";
+       revision = "1";
        editedCabalFile = "f49cbb0cfb2f101a006bb54ada3982ae85b6413d019fd92927ce259b3666e172";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/paf31/partial";
        description = "A nullary type class for partial functions";
        license = stdenv.lib.licenses.mit;
@@ -98985,10 +101514,10 @@ self: {
      mkDerivation {
        pname = "partial-handler";
        version = "1.0.0.0";
-       revision = "1";
        sha256 = "1fmfiw38v77anh20xh5zzqxm2dcryyyismsagn09sc27jdgnnrzl";
+       revision = "1";
        editedCabalFile = "2e1042c8b036ba686e544bfdd1302fd9f66f377010fa05739e7fc000d97fa597";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/partial-handler";
        description = "A composable exception handler";
        license = stdenv.lib.licenses.mit;
@@ -99000,7 +101529,7 @@ self: {
        pname = "partial-isomorphisms";
        version = "0.2";
        sha256 = "0wmlx1dp7i9rp3s5028gvqa7z0g1dkzlyd134kh04s1lx2hb94px";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
@@ -99014,7 +101543,7 @@ self: {
        pname = "partial-lens";
        version = "0.0.1";
        sha256 = "0s7p69fl1a3q4x2n9hf4540dcxjxjsj4knf2nal3wl1djh067ja8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad-transformers data-lens transformers
        ];
        jailbreak = true;
@@ -99029,7 +101558,7 @@ self: {
        pname = "partial-uri";
        version = "0.2";
        sha256 = "0n3rmajbmnydqk6jk36n83a6ra5p1dkdbd592ywjfq4jhmh98333";
-       buildDepends = [ base network-uri ];
+       libraryHaskellDepends = [ base network-uri ];
        homepage = "https://github.com/singpolyma/partial-uri";
        description = "Datatype for passing around unresolved URIs";
        license = "unknown";
@@ -99045,11 +101574,12 @@ self: {
        sha256 = "0s5cr0ysxv74dlziyf2ga29wawwlikqgb2njv8g1f1rb8i5n97gv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       executableHaskellDepends = [
          aeson aeson-pretty base base64-bytestring binary bytestring
          optparse-applicative vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring binary bytestring QuickCheck vector
        ];
        homepage = "https://github.com/startling/partly";
@@ -99067,7 +101597,7 @@ self: {
        pname = "passage";
        version = "0.1";
        sha256 = "11qrm27a1fn8p8z0q1400nd30sblm8pcn6znz4syg9jkmqhpn8ig";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath GraphSCC monadLib
          mwc-random pretty primitive process random
        ];
@@ -99082,7 +101612,7 @@ self: {
        pname = "passwords";
        version = "0.1.0.6";
        sha256 = "0x345pfa28abj152kkr1afnaraf4r8pj0216ack79brxvdhlk6li";
-       buildDepends = [ base containers MonadRandom random ];
+       libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -99093,7 +101623,7 @@ self: {
        pname = "pastis";
        version = "0.1.2";
        sha256 = "1425gzss5maqzrphrvvsw60lkapwg3wfjx10c59qkylx63k5ixjl";
-       buildDepends = [ base HTTP network ];
+       libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99107,7 +101637,7 @@ self: {
        sha256 = "12pmqcpqa6gjph40w4ga53ij8b989igaf3r6jwxng67kmddkq22z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl ];
+       executableHaskellDepends = [ base bytestring mtl ];
        homepage = "http://github.com/markusle/pasty/tree/master";
        description = "A simple command line pasting utility";
        license = "GPL";
@@ -99120,7 +101650,7 @@ self: {
        pname = "patch-combinators";
        version = "0.2.2";
        sha256 = "007bxr6xfqjmbx4b9k3n3qw7jmrn298v8cqxvycfhy5924l9jyi6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for patching functions and data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99136,7 +101666,7 @@ self: {
        sha256 = "0ls3dlwgki483l1raaqb247by0kpzvqc54g1gmvr71zfgbfxrjl2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-cuda accelerate-fft
          accelerate-io accelerate-utility base Cabal filepath gnuplot
          hmatrix JuicyPixels utility-ht vector
@@ -99155,8 +101685,10 @@ self: {
        pname = "path";
        version = "0.5.2";
        sha256 = "10ai0ygal1pipdi6221nhv0apgv8hzrra7jpgkn7nl62dbj2sl34";
-       buildDepends = [ base exceptions filepath template-haskell ];
-       testDepends = [ base hspec HUnit mtl ];
+       libraryHaskellDepends = [
+         base exceptions filepath template-haskell
+       ];
+       testHaskellDepends = [ base hspec HUnit mtl ];
        description = "Path";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99167,8 +101699,8 @@ self: {
        pname = "path-pieces";
        version = "0.2.0";
        sha256 = "116zx2ryzywh2rd4q16a5vh04gw92as9vgfvraw3a66xn0m6g5y0";
-       buildDepends = [ base text time ];
-       testDepends = [ base hspec HUnit QuickCheck text ];
+       libraryHaskellDepends = [ base text time ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck text ];
        description = "Components of paths";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99179,7 +101711,7 @@ self: {
        pname = "pathfinding";
        version = "0.1.0.0";
        sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/rvion/pathfinding";
        description = "pathfinding in grid and graphs";
        license = stdenv.lib.licenses.mit;
@@ -99191,8 +101723,8 @@ self: {
        pname = "pathfindingcore";
        version = "1.2";
        sha256 = "0x2bw79ym5rndhy5qd50gqv6fkqvp2zby4af2d5gdvsbm9fhv6c8";
-       buildDepends = [ array base split ];
-       testDepends = [ array base HUnit tasty tasty-hunit ];
+       libraryHaskellDepends = [ array base split ];
+       testHaskellDepends = [ array base HUnit tasty tasty-hunit ];
        homepage = "http://github.com/TheBizzle";
        description = "A toy pathfinding library";
        license = stdenv.lib.licenses.bsd3;
@@ -99205,7 +101737,7 @@ self: {
        pname = "pathtype";
        version = "0.5.4";
        sha256 = "1ns5q3nrkl99xp4mrmk8wpvb9qzyvnw5cyjwh5rh76ykm2d5dbg7";
-       buildDepends = [ base directory QuickCheck time ];
+       libraryHaskellDepends = [ base directory QuickCheck time ];
        homepage = "http://code.haskell.org/pathtype";
        description = "Type-safe replacement for System.FilePath etc";
        license = stdenv.lib.licenses.bsd3;
@@ -99217,7 +101749,7 @@ self: {
        pname = "patience";
        version = "0.1.1";
        sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Patience diff and longest increasing subsequence";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99230,7 +101762,7 @@ self: {
        sha256 = "0agmgp3qvd710fcrqyfyvhck6yd311wxmmh5qd8lfgdm6597lhvi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HandsomeSoup hxt ];
+       executableHaskellDepends = [ base HandsomeSoup hxt ];
        jailbreak = true;
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
        license = stdenv.lib.licenses.mit;
@@ -99242,7 +101774,7 @@ self: {
        pname = "pattern-arrows";
        version = "0.0.2";
        sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html";
        description = "Arrows for Pretty Printing";
        license = stdenv.lib.licenses.mit;
@@ -99256,7 +101788,7 @@ self: {
        pname = "patterns";
        version = "0.1.1";
        sha256 = "176si32zbrklf7wsspg0qdswd85ah0gl9k25ylx9qi2rr1vp18pv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers mtl time utf8-string
          zeromq-haskell
        ];
@@ -99272,8 +101804,8 @@ self: {
        pname = "paymill";
        version = "0.0.0";
        sha256 = "1gw3mxh766wf5anyn84qcf8nn96fzd1ibcjg55bk9b1yw6dc1va0";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        description = "This is an unofficial client for the Paymill API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99289,11 +101821,12 @@ self: {
        sha256 = "0z71j79wqxnixadpy47n30nrwhqya6qaadlwvrk9q60vrqvd21rm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring errors http-client lens lens-aeson text time
          transformers vector wreq
        ];
-       testDepends = [
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers
        ];
@@ -99310,7 +101843,7 @@ self: {
        pname = "paypal-api";
        version = "0.2";
        sha256 = "0im96yxvbb78sb0b83yypcwsa27gnjbjxbfki5rdnpgbf2yr8k9h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers failure http-conduit http-types
          mtl old-locale text time wai
        ];
@@ -99329,7 +101862,9 @@ self: {
        sha256 = "03cb5diy7wvcd0gm09r4172mck0n4v5hxyc622r8k3phzvzq9zdf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers HTTP network process ];
+       executableHaskellDepends = [
+         base containers HTTP network process
+       ];
        description = "pastebin command line application";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99341,7 +101876,7 @@ self: {
        pname = "pbc4hs";
        version = "0.1.1.5";
        sha256 = "16dki82d9x6rpkbax090ax8ynwjxv31cvpzpy51ynq83kjg3v2z9";
-       buildDepends = [ base hslua string-qq ];
+       libraryHaskellDepends = [ base hslua string-qq ];
        jailbreak = true;
        homepage = "https://github.com/DavidFeng/pbc4hs";
        description = "pbc for HsLua";
@@ -99356,10 +101891,10 @@ self: {
        pname = "pbkdf";
        version = "1.1.1.1";
        sha256 = "1nbn8kan43i00g23g8aljxjpaxm9q1qhzxxdgks0mc4mr1f7bifx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary byteable bytedump bytestring cryptohash utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary byteable bytedump bytestring cryptohash utf8-string
        ];
        homepage = "https://github.com/cdornan/pbkdf";
@@ -99368,17 +101903,16 @@ self: {
      }) {};
 
   "pcap" = callPackage
-    ({ mkDerivation, base, bytestring, libpcap, network, time }:
+    ({ mkDerivation, base, bytestring, network, time }:
      mkDerivation {
        pname = "pcap";
        version = "0.4.5.2";
        sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7";
-       buildDepends = [ base bytestring network time ];
-       extraLibraries = [ libpcap ];
+       libraryHaskellDepends = [ base bytestring network time ];
        homepage = "https://github.com/bos/pcap";
        description = "A system-independent interface for user-level packet capture";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libpcap;};
+     }) {};
 
   "pcap-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, pcap, transformers }:
@@ -99386,7 +101920,9 @@ self: {
        pname = "pcap-conduit";
        version = "0.1";
        sha256 = "07a6cwaq668a948njjybj9clbswmhz88xrwjkb42jg9gm1nh46kz";
-       buildDepends = [ base bytestring conduit pcap transformers ];
+       libraryHaskellDepends = [
+         base bytestring conduit pcap transformers
+       ];
        homepage = "http://github.com/thoughtpolice/pcap-conduit";
        description = "Conduit <-> libpcap";
        license = stdenv.lib.licenses.bsd3;
@@ -99399,7 +101935,9 @@ self: {
        pname = "pcap-enumerator";
        version = "0.5";
        sha256 = "0v7ar3jbs54ibhrbbzmvajc7pc8h8dv56wr77w4vsbyz6xq4sqdb";
-       buildDepends = [ base bytestring enumerator pcap transformers ];
+       libraryHaskellDepends = [
+         base bytestring enumerator pcap transformers
+       ];
        homepage = "http://github.com/cutsea110/pcap-enumerator";
        description = "Convert a pcap into an enumerator";
        license = stdenv.lib.licenses.bsd3;
@@ -99416,11 +101954,12 @@ self: {
        sha256 = "1nwyv5c0x262b4j73560bnxhab07ky0cba8nrzdbmmwl2g72c8m7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring deepseq lens linear mtl text
          vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base directory HUnit lens string-qq test-framework
          test-framework-hunit text vector
        ];
@@ -99436,7 +101975,7 @@ self: {
        pname = "pcf";
        version = "0.1.0.1";
        sha256 = "1dmp9afylsf4n7gxa23wn25w8h89lqyhjlxa5g7gshrbwxkx7c55";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bound c-dsl containers monad-gen mtl prelude-extras
          transformers void
        ];
@@ -99452,8 +101991,10 @@ self: {
        pname = "pcg-random";
        version = "0.1.3.1";
        sha256 = "02sx8l51dks316n0df7h75igynb56ms8gs8siczbl5zrlrgycywi";
-       buildDepends = [ base bytestring entropy primitive random time ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base bytestring entropy primitive random time
+       ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/cchalmers/pcg-random";
        description = "Haskell bindings to the PCG random number generator";
        license = stdenv.lib.licenses.bsd3;
@@ -99467,10 +102008,10 @@ self: {
        pname = "pcre-heavy";
        version = "0.2.2";
        sha256 = "08cv6vmf5qpjky8zfrz3c5cczn5vrf30p5masyb3m625wm2sjjw3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pcre-light stringable template-haskell
        ];
-       testDepends = [ base doctest Glob ];
+       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";
@@ -99482,7 +102023,7 @@ self: {
        pname = "pcre-less";
        version = "0.2.1";
        sha256 = "1widnpz4r2az96lwxrq21vm21j9j7b4sn86kqn2iih3xs2dpwqf9";
-       buildDepends = [ array base regex-pcre ];
+       libraryHaskellDepends = [ array base regex-pcre ];
        description = "Nicer interface to regex-pcre";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99493,8 +102034,8 @@ self: {
        pname = "pcre-light";
        version = "0.4.0.3";
        sha256 = "0l1df2sk5qwf424bvb8mbdkr2xjg43fi92n5r22yd7vm1zz0jqvf";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ pcre ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ pcre ];
        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;
@@ -99506,7 +102047,7 @@ self: {
        pname = "pcre-light-extra";
        version = "0.0.0";
        sha256 = "1kjh36gglszd16rsh0rm2q5fxjlfipzld4hw0l2r23y0flbqkbvx";
-       buildDepends = [ base bytestring pcre-light ];
+       libraryHaskellDepends = [ base bytestring pcre-light ];
        jailbreak = true;
        homepage = "http://github.com/urso/pcre-light-extra";
        description = "pcre-light extra functionality";
@@ -99521,10 +102062,10 @@ self: {
        pname = "pcre-utils";
        version = "0.1.5";
        sha256 = "0b6n3sls6r65kn7i9z607ck99sxw2xxh7frljc09cx73iy71ml69";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bytestring mtl regex-pcre-builtin vector
        ];
-       testDepends = [ base bytestring HUnit regex-pcre-builtin ];
+       testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ];
        description = "Perl-like substitute and split for PCRE regexps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99537,7 +102078,7 @@ self: {
        pname = "pdf-toolbox-content";
        version = "0.0.3.3";
        sha256 = "03kyp3nnbg4gchc4g9biavlf0hdjv77pc66jqngzjzmk8rh03k9c";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring containers io-streams
          pdf-toolbox-core text
        ];
@@ -99554,7 +102095,7 @@ self: {
        pname = "pdf-toolbox-core";
        version = "0.0.3.3";
        sha256 = "006fp7cvq8r4l0iif2ihi0cq8pxl5mm8vf7ny4zhaniyyf52g68m";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers errors io-streams scientific
          transformers zlib-bindings
        ];
@@ -99572,7 +102113,7 @@ self: {
        pname = "pdf-toolbox-document";
        version = "0.0.5.1";
        sha256 = "0qcnhdhxvrj9ypwyb3h7q7w6yn9jpzzrqrlhnas40lvjb9rc2yws";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cipher-aes cipher-rc4 containers crypto-api
          cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text
          transformers
@@ -99593,7 +102134,7 @@ self: {
        sha256 = "02nnxvbd5l2wni9djqmdmqagb5k10dnc1k4crlkvrc8fa9rlajz2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cairo containers directory filepath gtk io-streams
          pdf-toolbox-content pdf-toolbox-document process random text
          transformers
@@ -99613,7 +102154,7 @@ self: {
        sha256 = "07a9ddr4j5f4vhv1md32f0d3mwhx5p9lw0bwjikfhhqq49jvrpa5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers filepath FindBin process
        ];
        description = "Simple command-line utility to convert PDF into text";
@@ -99628,7 +102169,7 @@ self: {
        pname = "pdfinfo";
        version = "1.5.4";
        sha256 = "04894cwvcn910j2b0j95dc6i9v6xriqa0v97z3vyi9dhi9yiysls";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl old-locale process-extras text time time-locale-compat
        ];
        homepage = "https://github.com/chrisdone/pdfinfo";
@@ -99644,7 +102185,9 @@ self: {
        sha256 = "00bnbfy3awl9vd9vvmh6ylfn2d882r3r1am6b6788b78lvznypxa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory pdfinfo process temporary ];
+       executableHaskellDepends = [
+         base directory pdfinfo process temporary
+       ];
        jailbreak = true;
        homepage = "http://dmwit.com/pdfsplit";
        description = "split two-column PDFs, so there is one column per page";
@@ -99659,7 +102202,7 @@ self: {
        pname = "pdynload";
        version = "0.0.3";
        sha256 = "0949nzk85fp9vs6v90cd6kxgg52pcaz2mfahv7416qpgp65hpw93";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath ghc ghc-paths old-time process
        ];
        description = "pdynload is polymorphic dynamic linking library";
@@ -99675,7 +102218,7 @@ self: {
        pname = "peakachu";
        version = "0.3.1";
        sha256 = "1wmlainnbrzpwrsr4qhw7m39s4crhc67xg1mxam0rfj9c1cnimxp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base derive GLUT List template-haskell time TypeCompose
        ];
        description = "Experiemental library for composable interactive programs";
@@ -99689,7 +102232,7 @@ self: {
        pname = "peano";
        version = "0.1.0.1";
        sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Peano numbers";
        license = "unknown";
      }) {};
@@ -99700,7 +102243,7 @@ self: {
        pname = "peano-inf";
        version = "0.6.5";
        sha256 = "1w8rvlckqcy41ciq2csb2nf83l969nwvvrrlm0x1yzf5i6ibg33b";
-       buildDepends = [ base containers lazysmallcheck ];
+       libraryHaskellDepends = [ base containers lazysmallcheck ];
        description = "Lazy Peano numbers including observable infinity value";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99716,9 +102259,13 @@ self: {
        sha256 = "110i4y93gm6b76and12vra8nr5q2dz20dvgpbpdgic3sv2ds16k0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal cmdargs containers deepseq derive directory
-         filepath grm mtl old-time process shake syb uniplate wl-pprint
+       libraryHaskellDepends = [
+         array base Cabal cmdargs containers deepseq derive grm mtl shake
+         syb uniplate wl-pprint
+       ];
+       executableHaskellDepends = [
+         base Cabal cmdargs deepseq derive directory filepath grm mtl
+         old-time process shake syb uniplate wl-pprint
        ];
        description = "pec embedded compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -99731,7 +102278,7 @@ self: {
        pname = "pecoff";
        version = "0.11";
        sha256 = "0vb22jfl309k4a6b80015cyrs5cxls7vyf8faz7lrm7i0vj0vz1q";
-       buildDepends = [ base binary bytestring containers ];
+       libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99746,7 +102293,7 @@ self: {
        sha256 = "0mh56nkn31dwpyrl238b06gyfwy3p7y90b9y6k639vpqkn9nnzcd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath haskeline logict mtl parsec
        ];
        homepage = "http://github.com/HackerFoo/peg";
@@ -99765,10 +102312,11 @@ self: {
        sha256 = "1km847arc193wq6cdr38xvz1znbdmrgdyji2p9rs4j2p35rr6s6y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashtables haskell-src-meta ListLike monad-control mtl
          template-haskell
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://tanakh.github.com/Peggy";
        description = "The Parser Generator for Haskell";
@@ -99783,8 +102331,8 @@ self: {
        pname = "pell";
        version = "0.1.0.0";
        sha256 = "0sxgliwhd0iplv3xd44a40vz8i2kmzvsq1a3zvbz4j77611hmnxd";
-       buildDepends = [ arithmoi base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ arithmoi base containers ];
+       testHaskellDepends = [
          arithmoi base Cabal cabal-test-quickcheck containers primes
          QuickCheck
        ];
@@ -99803,8 +102351,8 @@ self: {
        pname = "pem";
        version = "0.2.2";
        sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
-       buildDepends = [ base base64-bytestring bytestring mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base base64-bytestring bytestring mtl ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -99819,7 +102367,7 @@ self: {
        pname = "penn-treebank";
        version = "0.1.0.1";
        sha256 = "12c5bzn3ac8783lny56n7rd8a1ik4ayfm1pr5v7gm7z53f7iz0qy";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        description = "Tools for manipulating the Penn TreeBank";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99837,13 +102385,14 @@ self: {
        sha256 = "0bzxihhi7cs8cqbnz7mf6sj12dyr267265asc010pgyffpjc22qi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          action-permutations anonymous-sums base bytestring cereal
          containers contravariant either matchers multiarg ofx old-locale
          parsec prednote rainbow rainbox semigroups split text time
          transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          anonymous-sums base parsec QuickCheck random-shuffle semigroups
          tasty tasty-quickcheck text time transformers
        ];
@@ -99864,7 +102413,7 @@ self: {
        sha256 = "0mdl8wpcy2yzscpww6vv5vhgiwy5xi0js1yxd7y4h5dmvhxsrr9l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers explicit-exception multiarg parsec penny-lib
          pretty-show semigroups text transformers
        ];
@@ -99887,7 +102436,7 @@ self: {
        sha256 = "0fy671xvia7kjlcrwpsv93gsnyz5wvcajlva98ykbh7cdkf56b17";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          action-permutations base binary bytestring cereal containers
          explicit-exception matchers multiarg ofx old-locale parsec prednote
          pretty-show rainbow semigroups split text time transformers
@@ -99905,7 +102454,7 @@ self: {
        pname = "peparser";
        version = "0.21";
        sha256 = "1qy8hghpvp9idiq4ksn55n1dpx7823s7mjfvqfgrmhj0xl1b1y54";
-       buildDepends = [ base binary bytestring haskell98 ];
+       libraryHaskellDepends = [ base binary bytestring haskell98 ];
        homepage = "https://github.com/igraves/peparser-haskell";
        description = "A parser for PE object files";
        license = stdenv.lib.licenses.bsd3;
@@ -99918,7 +102467,7 @@ self: {
        pname = "perceptron";
        version = "0.1.0.3";
        sha256 = "0w1vrsv43z92y6vsv9nzs2pjlqkhrxvzh53r2722530lzff34m78";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "The perceptron learning algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -99937,13 +102486,17 @@ self: {
        sha256 = "04vj8kva5qmrf8r93xyf0qw8nx64j241pdc19s2ddvd21lq5wqkz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cognimeta-utils collections-api
          comonad-transformers containers cryptohash data-binary-ieee754
          data-lens data-lens-fd data-lens-template filepath ghc-prim
          MonadRandom mtl primitive QuickCheck stm strict tagged
          template-haskell time transformers unix
        ];
+       executableHaskellDepends = [
+         base bytestring cognimeta-utils containers MonadRandom mtl
+         QuickCheck template-haskell transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/Cognimeta/perdure";
        description = "Robust persistence for acyclic immutable data";
@@ -99959,8 +102512,8 @@ self: {
        pname = "perm";
        version = "0.4.0.0";
        sha256 = "0lf6smw3m32vwrga5y671z355w0vphp3n63cfnsirk1kiz5ik5rx";
-       buildDepends = [ base catch-fd mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base catch-fd mtl transformers ];
+       testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit
        ];
        jailbreak = true;
@@ -99976,7 +102529,7 @@ self: {
        pname = "permutation";
        version = "0.5.0.5";
        sha256 = "005737s6k9dfpjmjf41m3k1wc31c2kql08ig7fd6npk22nhwmdai";
-       buildDepends = [ base ghc-prim QuickCheck ];
+       libraryHaskellDepends = [ base ghc-prim QuickCheck ];
        homepage = "https://github.com/spacekitteh/permutation";
        description = "A library for permutations and combinations";
        license = stdenv.lib.licenses.bsd3;
@@ -99988,7 +102541,7 @@ self: {
        pname = "permute";
        version = "1.0";
        sha256 = "03g1d9h26f1id0pnaigy9xy1cv5pvzqcjrwgzn75xnnbm5c3y9ch";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100002,7 +102555,9 @@ self: {
        sha256 = "096gjkmw06crywwwydyr67447xmp8x967dwh1gavlr0061skb72p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base optparse-applicative persistent text ];
+       executableHaskellDepends = [
+         base optparse-applicative persistent text
+       ];
        jailbreak = true;
        description = "Transforms persist's quasi-quoted syntax into ER format";
        license = stdenv.lib.licenses.gpl3;
@@ -100016,7 +102571,7 @@ self: {
        pname = "persistable-record";
        version = "0.1.0.0";
        sha256 = "1z03rixy03zp4l4ygb9jlj4p4x5vp20r5qq39hi8vn1x37j39x26";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers dlist names-th template-haskell transformers
        ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
@@ -100029,33 +102584,32 @@ self: {
      , blaze-html, blaze-markup, bytestring, conduit, containers
      , exceptions, fast-logger, hspec, lifted-base, monad-control
      , monad-logger, mtl, old-locale, path-pieces, resource-pool
-     , resourcet, scientific, silently, sqlite, tagged, template-haskell
-     , text, time, transformers, transformers-base, unordered-containers
+     , resourcet, scientific, silently, tagged, template-haskell, text
+     , time, transformers, transformers-base, unordered-containers
      , vector
      }:
      mkDerivation {
        pname = "persistent";
        version = "2.2";
        sha256 = "04l5394yrnm0d5cz7nq2phmsbm5vxbggn4wp8n0i0ms0y7blfh0p";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger lifted-base
          monad-control monad-logger mtl old-locale path-pieces resource-pool
          resourcet scientific silently tagged template-haskell text time
          transformers transformers-base unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
          conduit containers fast-logger hspec lifted-base monad-control
          monad-logger mtl old-locale path-pieces resource-pool resourcet
          scientific tagged template-haskell text time transformers
          unordered-containers vector
        ];
-       extraLibraries = [ sqlite ];
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) sqlite;};
+     }) {};
 
   "persistent-cereal" = callPackage
     ({ mkDerivation, base, cereal, persistent, text }:
@@ -100063,7 +102617,7 @@ self: {
        pname = "persistent-cereal";
        version = "0.1.0";
        sha256 = "09akf8vpkn2jskf1vf9mq96sakqzr7mfs8hhri8qlbkwx3i5nr6f";
-       buildDepends = [ base cereal persistent text ];
+       libraryHaskellDepends = [ base cereal persistent text ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/co-dan/persistent-cereal";
        description = "Helper functions for writing Persistent instances";
@@ -100076,7 +102630,7 @@ self: {
        pname = "persistent-equivalence";
        version = "0.3";
        sha256 = "14nn01bbwskllbccgcnwnjwzyws6vppqv4l51n6pcvhwbphn18qz";
-       buildDepends = [ array base diffarray ];
+       libraryHaskellDepends = [ array base diffarray ];
        jailbreak = true;
        description = "Persistent equivalence relations (aka union-find)";
        license = stdenv.lib.licenses.bsd3;
@@ -100090,7 +102644,7 @@ self: {
        pname = "persistent-hssqlppp";
        version = "0.1";
        sha256 = "1p4fpa5qlkn2jmggszzmzg0bva8r8j0x7b2bidqyzlw2i9332ba2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring hssqlppp monad-control mtl persistent
          persistent-template template-haskell text th-lift
        ];
@@ -100105,7 +102659,7 @@ self: {
        pname = "persistent-instances-iproute";
        version = "0.1.0.1";
        sha256 = "0nmk138kv020aa0pw29l177rb6rji4rnmw4ndnkn1xvp8gh3w0yn";
-       buildDepends = [ base bytestring iproute persistent ];
+       libraryHaskellDepends = [ base bytestring iproute persistent ];
        description = "Persistent instances for types in iproute";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -100118,7 +102672,7 @@ self: {
        pname = "persistent-map";
        version = "0.3.5";
        sha256 = "0an0j6xkxygxlvjj50fq356sc4njbniz9jzv6v2h9pihsmcckhvq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers directory EdisonAPI EdisonCore filepath LRU
          mtl stm-io-hooks
        ];
@@ -100138,7 +102692,7 @@ self: {
        pname = "persistent-mongoDB";
        version = "2.1.2.2";
        sha256 = "1ppjywipfp48dsahc4mf8p9vx99937yh552kq7dhalnd1yfcbcik";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bson bytestring cereal conduit containers
          monad-control mongoDB network path-pieces persistent resource-pool
          resourcet text time transformers
@@ -100157,7 +102711,7 @@ self: {
        pname = "persistent-mysql";
        version = "2.2";
        sha256 = "09hajfvwgjkrmk1qmjfx3z6qkisv4gj0qjcmd1m8n9nb76bmdfz9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger mysql mysql-simple persistent resourcet
          text transformers
@@ -100179,7 +102733,7 @@ self: {
        sha256 = "0rvcjl9p7pj0hrf0ghhj96ib2knhxnfi9nhc7cppn7gnja1x8ldp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit containers convertible HDBC HDBC-odbc
          monad-control monad-logger persistent persistent-template resourcet
          text time transformers
@@ -100199,7 +102753,7 @@ self: {
        pname = "persistent-postgresql";
        version = "2.2";
        sha256 = "0ydwc2jb8w3wma8f0v7i16pzglx0gv1ffikfvislw3c6wkangwby";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
          postgresql-simple resourcet text time transformers
@@ -100217,7 +102771,7 @@ self: {
        pname = "persistent-protobuf";
        version = "0.1.5";
        sha256 = "046dpasgv6bwcm17w0z9dz4bvaa622cdb8paj7j6accmsc4rvs9z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring persistent protocol-buffers
          protocol-buffers-descriptor template-haskell text
        ];
@@ -100234,7 +102788,7 @@ self: {
        pname = "persistent-ratelimit";
        version = "0.1.0.1";
        sha256 = "13mvf0k4nkcdcz7gcvqsw3mrnbpvw0lvs94rff0y9q50cc6y36xd";
-       buildDepends = [ base time yesod ];
+       libraryHaskellDepends = [ base time yesod ];
        jailbreak = true;
        homepage = "https://github.com/jprider63/persistent-ratelimit";
        description = "A library for rate limiting activities with a persistent backend";
@@ -100251,12 +102805,12 @@ self: {
        pname = "persistent-redis";
        version = "0.3.2";
        sha256 = "0p5wjf4f201mpdwry188v1h9wf3fh1pvfsm663x4ipy3b1yc8b1k";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base binary bytestring hedis monad-control mtl
          path-pieces persistent scientific text time transformers
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base binary bytestring hedis monad-control mtl
          path-pieces persistent persistent-template scientific
          template-haskell text time transformers utf8-string
@@ -100272,7 +102826,9 @@ self: {
        pname = "persistent-refs";
        version = "0.4";
        sha256 = "1lyhz0cywls91a6crjq5v8x4h4740s73h3blvbkr6fg26kh11cs6";
-       buildDepends = [ base containers mtl ref-fd transformers ];
+       libraryHaskellDepends = [
+         base containers mtl ref-fd transformers
+       ];
        homepage = "https://github.com/acfoltzer/persistent-refs";
        description = "Haskell references backed by an IntMap for persistence and reversibility";
        license = stdenv.lib.licenses.bsd3;
@@ -100289,11 +102845,12 @@ self: {
        sha256 = "1567ja3f87syw6x6x6gl6xzdl3pl8ammlrqy2500gbgr7ni0a47i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
        homepage = "http://www.yesodweb.com/book/persistent";
@@ -100311,12 +102868,12 @@ self: {
        pname = "persistent-template";
        version = "2.1.3.4";
        sha256 = "0wi1mrcilz66jnlgz16crqlh4bibb03mj460bgg3af4f8zpwja2g";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers ghc-prim monad-control
          monad-logger path-pieces persistent tagged template-haskell text
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
        homepage = "http://www.yesodweb.com/book/persistent";
@@ -100332,8 +102889,8 @@ self: {
        pname = "persistent-vector";
        version = "0.1.1";
        sha256 = "1l5v02pjb24gk4hw28knjp55l7z6jzcfiklfikd2nqbl7866c2j2";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/travitch/persistent-vector";
@@ -100352,14 +102909,14 @@ self: {
        pname = "persistent-zookeeper";
        version = "0.2.0";
        sha256 = "11s99wrxhyzyfg657dqma1v1vvdadskvrjybrya2zm8lp675ri9z";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring binary bytestring conduit
          containers hzk monad-control mtl path-pieces persistent
          persistent-template resource-pool resourcet scientific
          template-haskell text time transformers transformers-base
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base64-bytestring binary bytestring conduit
          containers hspec hzk monad-control mtl path-pieces persistent
          persistent-template resource-pool resourcet scientific
@@ -100379,14 +102936,13 @@ self: {
        pname = "persona";
        version = "0.1.0.0";
        sha256 = "1w1m1m3kybk8cg8qn44l04i19i0zqgaz1i1k6666gvvrzk2rh7nh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default-class jose lens network-uri text time
          unordered-containers
        ];
        homepage = "https://github.com/frasertweedale/hs-persona";
        description = "Persona (BrowserID) library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persona-idp" = callPackage
@@ -100401,7 +102957,7 @@ self: {
        sha256 = "082ly9m0m0g9brgzma489i4b4pkqqy50gv0a6hn7pvyhpr901b6n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson asn1-types base blaze-markup bytestring crypto-random
          directory filepath hamlet http-types jose lens optparse-applicative
          pem persona scotty shakespeare text time transformers unix wai x509
@@ -100409,7 +102965,6 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-persona-idp";
        description = "Persona (BrowserID) Identity Provider";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pesca" = callPackage
@@ -100420,7 +102975,7 @@ self: {
        sha256 = "12cwmjszbbqrd1f21jvwvp026ja3377c3p0wfrbrl34g23gnysgp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        homepage = "http://www.cs.chalmers.se/~aarne/pesca/";
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
@@ -100438,13 +102993,13 @@ self: {
        pname = "peyotls";
        version = "0.1.6.5";
        sha256 = "0dy641izw76cn1rslf7mbmbwhl5ajxjll95w4rg7pyvq2lq2qk9f";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base bytable bytestring cipher-aes
          crypto-numbers crypto-pubkey crypto-pubkey-types crypto-random
          cryptohash handle-like monad-control monads-tf pem stm
          transformers-base word24 x509 x509-store x509-validation
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring crypto-random handle-like network random stm x509
          x509-store
        ];
@@ -100463,8 +103018,8 @@ self: {
        pname = "pez";
        version = "0.1.0";
        sha256 = "0w2m8i1h87v9l5lhz8mdllnrx62fk3isqhw3cvnv9rf6rk3zhv74";
-       buildDepends = [ base failure fclabels thrist ];
-       testDepends = [
+       libraryHaskellDepends = [ base failure fclabels thrist ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -100484,9 +103039,9 @@ self: {
        sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base bytestring HTTP ini postgresql-simple random scotty text
-         transformers
+       libraryHaskellDepends = [ base bytestring HTTP ];
+       executableHaskellDepends = [
+         async base ini postgresql-simple random scotty text transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/BardurArantsson/pg-harness";
@@ -100501,7 +103056,7 @@ self: {
        pname = "pg-harness-client";
        version = "0.3.1";
        sha256 = "12z5354in4zswn219cvxhqbva76p2jsccmzdn5iyw5g401546lr2";
-       buildDepends = [ base bytestring HTTP ];
+       libraryHaskellDepends = [ base bytestring HTTP ];
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "Client library for pg-harness-server";
        license = stdenv.lib.licenses.bsd2;
@@ -100517,7 +103072,7 @@ self: {
        sha256 = "0459i1x5hsxkihyb5a8ca947ngs0gg8866s77bcdsifjw6b3cb4a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base ini postgresql-simple random scotty text transformers
        ];
        jailbreak = true;
@@ -100535,17 +103090,18 @@ self: {
      mkDerivation {
        pname = "pgdl";
        version = "8.3";
-       revision = "2";
        sha256 = "0kbx9dgmy9pvcgcpsjplrpnqlk8x3icfpr0flincmzqkzxxzcaq5";
+       revision = "2";
        editedCabalFile = "9d6e976e130869b6761d870380b867c2501c43a1318a5f385687608c13a0ef72";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal configurator directory filepath HTTP
          network-uri process tagsoup text vty vty-ui
        ];
        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
@@ -100554,7 +103110,7 @@ self: {
        pname = "pgm";
        version = "0.1.4";
        sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv";
-       buildDepends = [ array base bytestring parsec ];
+       libraryHaskellDepends = [ array base bytestring parsec ];
        homepage = "https://github.com/astanin/haskell-pgm";
        description = "Pure Haskell implementation of PGM image format";
        license = stdenv.lib.licenses.bsd3;
@@ -100568,8 +103124,8 @@ self: {
        pname = "pgp-wordlist";
        version = "0.1.0.1";
        sha256 = "123d8fh1bd78iq4n00xc873zsnizczzdl372vkl87z4lpivfkpd3";
-       buildDepends = [ base bytestring containers text vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers text vector ];
+       testHaskellDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck text
        ];
        homepage = "https://github.com/quchen/pgp-wordlist";
@@ -100587,7 +103143,7 @@ self: {
        pname = "pgsql-simple";
        version = "0.1.2";
        sha256 = "1z39g6bp748ya54in48vcg8z20c3skza82cv203rqy192nj01km5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring binary blaze-builder
          blaze-textual bytestring containers MonadCatchIO-transformers mtl
          network old-locale pcre-light text time utf8-string
@@ -100610,7 +103166,7 @@ self: {
        pname = "pgstream";
        version = "0.1.0.3";
        sha256 = "0zbasvi8392pa7ibd0q5072f1i7h0114v46rwhdfczsk1qzlnscg";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base blaze-builder bytestring conduit
          conduit-extra deepseq mtl parallel postgresql-binary
          postgresql-libpq resource-pool resourcet scientific stm stm-chans
@@ -100629,7 +103185,7 @@ self: {
        pname = "phantom-state";
        version = "0.2.0.2";
        sha256 = "04fg0j79nkajsiw8n2yy62mwiw1r4fjy2jln5ng07h64pwyncdnm";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Phantom State Transformer. Like State Monad, but without values.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -100641,7 +103197,9 @@ self: {
        pname = "phasechange";
        version = "0.1";
        sha256 = "0i54myn9abrpzrs58llqgii9fhd9ns9hipnaj00dnqx2mfbg7pan";
-       buildDepends = [ array base ghc-prim monad-st primitive vector ];
+       libraryHaskellDepends = [
+         array base ghc-prim monad-st primitive vector
+       ];
        jailbreak = true;
        homepage = "http://github.com/glehel/phasechange";
        description = "Freezing, thawing, and copy elision";
@@ -100657,16 +103215,16 @@ self: {
        pname = "phash";
        version = "0.0.5";
        sha256 = "1bndzncy52swvfk2p1imvxlbiv01qx9qi5mb68jmc22b1d99s6bv";
-       buildDepends = [ base ];
-       testDepends = [
-         base doctest HUnit pHash smallcheck tasty tasty-hunit
-         tasty-smallcheck
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ pHash ];
+       testHaskellDepends = [
+         base doctest HUnit smallcheck tasty tasty-hunit tasty-smallcheck
        ];
-       extraLibraries = [ pHash ];
+       testSystemDepends = [ pHash ];
        homepage = "http://github.com/michaelxavier/phash";
        description = "Haskell bindings to pHash, the open source perceptual hash library";
        license = stdenv.lib.licenses.gpl3;
-       broken = true;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { pHash = null;};
 
   "phone-push" = callPackage
@@ -100678,7 +103236,7 @@ self: {
        pname = "phone-push";
        version = "0.1.3";
        sha256 = "0ndaddj3ssrdclzigdj0q04pwpdkbmhfc3rz8j7q9f4l7iv6yshi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring binary bytestring conduit convertible
          HsOpenSSL http-conduit network time transformers
        ];
@@ -100694,7 +103252,7 @@ self: {
        pname = "phonetic-code";
        version = "0.1.1.1";
        sha256 = "0pjvjqxp37n901s16ys5qq5rzblamz8izvsd1992w06bcyrs36cw";
-       buildDepends = [ array base containers regex-compat ];
+       libraryHaskellDepends = [ array base containers regex-compat ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/phonetic-code";
        description = "Phonetic codes: Soundex and Phonix";
        license = stdenv.lib.licenses.bsd3;
@@ -100708,7 +103266,9 @@ self: {
        pname = "phooey";
        version = "2.0.0.1";
        sha256 = "0aa0s7qmy78s4q1mjcnw0qiqlbmdmkmk2nbn6hkmw5fn29iq0iwj";
-       buildDepends = [ array base mtl reactive TypeCompose wx wxcore ];
+       libraryHaskellDepends = [
+         array base mtl reactive TypeCompose wx wxcore
+       ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Phooey";
        description = "Functional user interfaces";
@@ -100726,10 +103286,10 @@ self: {
        sha256 = "0d44fzflpyw94rfyn9nw9pqklm01vw6nczava2kfj68sq12m94rp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory exif filepath mtl old-locale parsec time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory exif filepath HUnit mtl old-locale parsec process
          regex-posix time unix
        ];
@@ -100747,7 +103307,7 @@ self: {
        sha256 = "1bczvnmbgc7qcpmlhrnmql4yn2grry2ys7hcg06sqzwr5qhl1k9k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl SDL transformers ];
+       executableHaskellDepends = [ base mtl SDL transformers ];
        jailbreak = true;
        homepage = "https://github.com/skypers/phraskell";
        description = "A fractal viewer";
@@ -100767,12 +103327,17 @@ self: {
        sha256 = "1v6zcyfjnkgwc9kffi7lf15qb3j4wq2kclx26i1k9ssf6h7cs5g9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers directory fgl filepath graphviz
          hierarchical-clustering HUnit parsec prettyclass process split text
          time vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         async base bytestring containers directory fgl filepath graphviz
+         hierarchical-clustering HUnit parsec prettyclass process split text
+         time vector
+       ];
+       testHaskellDepends = [
          async base bytestring containers directory fgl filepath graphviz
          hierarchical-clustering HUnit parsec prettyclass process split
          test-framework test-framework-hunit test-framework-th text time
@@ -100796,7 +103361,7 @@ self: {
        sha256 = "1w5krkss2qzzcqqmgqs369p5xnqyrm76vvsxd7mlhcdqaaj06n2q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          AES base binary byteable bytestring containers cryptohash HTTP
          io-streams mtl network parsec RSA transformers
        ];
@@ -100815,12 +103380,12 @@ self: {
      mkDerivation {
        pname = "pia-forward";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "02ryfiibkbfx6zg1n0h8kvb4mkiai57cvllqcwp815x50rsrpd2r";
+       revision = "1";
        editedCabalFile = "7ace7bfcb4b05c4099a28ec12b7e12682669ddfe6d4e5f68c4d74c05914b7582";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring data-default directory filepath http-client
          http-client-tls network-info process random text text-format time
          xdg-basedir
@@ -100841,12 +103406,12 @@ self: {
        pname = "pianola";
        version = "0.1.1";
        sha256 = "02y630yskx139l5yii45rf47w2a2v3x0pad59ac9qzjalv7s68aq";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-iteratee base bytestring comonad
          comonad-transformers containers either errors filepath free
          iteratee logict msgpack mtl network pipes streams text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers errors filepath network streams text transformers
        ];
        description = "Remotely controlling Java Swing applications";
@@ -100862,7 +103427,9 @@ self: {
        sha256 = "14wil9fqx7n7zk7ldhk336g9mbybcf0gljvwjrnra3r01yiz7f20";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec picosat pretty ];
+       libraryHaskellDepends = [
+         base containers mtl parsec picosat pretty
+       ];
        jailbreak = true;
        homepage = "https://github.com/sdiehl/picologic";
        description = "Utilities for symbolic predicate logic expressions";
@@ -100880,11 +103447,11 @@ self: {
        pname = "picoparsec";
        version = "0.1.2.2";
        sha256 = "1gf51clsfllfpmpm4bfzyicwk1zz3kymyi8zcdfm5y5rhg1yjcg9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq monoid-subclasses
          scientific text
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring deepseq monoid-subclasses QuickCheck
          quickcheck-instances quickcheck-unicode scientific tasty
          tasty-quickcheck text vector
@@ -100900,7 +103467,7 @@ self: {
        pname = "picosat";
        version = "0.1.3";
        sha256 = "1ljgarjvhw7qi06bjykgbd17s27h73gdj21rpi5x4ddv9fb68k9p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/sdiehl/haskell-picosat";
        description = "Bindings to the PicoSAT solver";
        license = stdenv.lib.licenses.mit;
@@ -100914,7 +103481,7 @@ self: {
        sha256 = "0ab0msb12cj38qimxllwk0p0g9aggfxhgvdp2b5znxpixlr39cz9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers Imlib mtl ];
+       libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100928,7 +103495,7 @@ self: {
        sha256 = "0rsc2anh20hlr2dfyh07dyrrfns0l1pibz6w129fp5l8m6h3xjin";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl parsec text ];
+       executableHaskellDepends = [ base mtl parsec text ];
        homepage = "http://www.mew.org/~kazu/proj/piki/";
        description = "Yet another text-to-html converter";
        license = stdenv.lib.licenses.bsd3;
@@ -100945,7 +103512,7 @@ self: {
        pname = "pinboard";
        version = "0.6.5";
        sha256 = "0xnxdnr2ifn0z78jzibg64znki2jppfy13fsl7s8vwrw0i5ys7a8";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers either haskell-src-exts HsOpenSSL
          http-streams http-types io-streams mtl network old-locale random
          text time transformers unordered-containers vector
@@ -100961,7 +103528,7 @@ self: {
        pname = "pipe-enumerator";
        version = "0.3.0.2";
        sha256 = "0h6k00k85pn0jajk3rvvfnrfwlkllprhv00x0qd9zg9gg7lf7zkc";
-       buildDepends = [ base enumerator pipes transformers ];
+       libraryHaskellDepends = [ base enumerator pipes transformers ];
        homepage = "https://github.com/zadarnowski/pipe-enumerator";
        description = "A bidirectional bridge between pipes and iteratees";
        license = stdenv.lib.licenses.bsd3;
@@ -100975,7 +103542,9 @@ self: {
        sha256 = "1hmbhgnrq894jnm7gy6yc812nysvkrbjk6qqjmk7g7fsj46xpdfg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring editor-open Hclip safe ];
+       executableHaskellDepends = [
+         base bytestring editor-open Hclip safe
+       ];
        homepage = "https://github.com/pharpend/pipeclip";
        description = "Open your editor, pipe the output to the system clipboard";
        license = stdenv.lib.licenses.bsd2;
@@ -100989,8 +103558,8 @@ self: {
        pname = "pipes";
        version = "4.1.6";
        sha256 = "0dbl9sa0ryclyxwm0zfmqvpx7ljmpnfccmnihxia35q471h50sid";
-       buildDepends = [ base mmorph mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base mmorph mtl transformers ];
+       testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
          transformers
        ];
@@ -101006,7 +103575,7 @@ self: {
        pname = "pipes-aeson";
        version = "0.4.1.3";
        sha256 = "0c95fm4bj4y0dsar4r7n9irvhrcihylcp8k40khm2bqcad14pjjc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
@@ -101024,11 +103593,11 @@ self: {
        pname = "pipes-async";
        version = "0.1.1";
        sha256 = "1b0l3fnblfgwgcbd5brs5iwix4wix1ijx10ppwb8yb1wbqbmh8z2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-async lifted-base monad-control pipes pipes-safe stm
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec lifted-async lifted-base monad-control pipes pipes-safe
          stm transformers-base
        ];
@@ -101045,10 +103614,10 @@ self: {
        pname = "pipes-attoparsec";
        version = "0.5.1.2";
        sha256 = "1qhhy86c89j6ial5y1j2lhgqx225qr33777jk8sxv021gkabsmlv";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-parse text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base HUnit mmorph pipes pipes-parse tasty tasty-hunit
          text transformers
        ];
@@ -101067,7 +103636,10 @@ self: {
        sha256 = "0alr94jjh583cdi19zrlacrc71dspy12lhq8h24hqiar6l2lr1d7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring pipes-core transformers
+       ];
+       executableHaskellDepends = [
          attoparsec base bytestring pipes-core transformers
        ];
        jailbreak = true;
@@ -101083,7 +103655,7 @@ self: {
        pname = "pipes-bgzf";
        version = "0.2.0.1";
        sha256 = "04y0wzy8982g64xyxq6rl9xc63n0c8xl8mhyf0x4ivqxnn49iv23";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl parallel pipes streaming-commons
        ];
        description = "Blocked GZip";
@@ -101099,11 +103671,11 @@ self: {
        pname = "pipes-binary";
        version = "0.4.0.4";
        sha256 = "1c90vvdzbrp5x73iwpdcsi701v4krmqqxj0l9kyzfygvd242i56i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring ghc-prim lens-family-core pipes pipes-parse
          smallcheck tasty tasty-hunit tasty-smallcheck transformers
        ];
@@ -101120,7 +103692,7 @@ self: {
        pname = "pipes-bytestring";
        version = "2.1.1";
        sha256 = "1zn8vbsq214x1dswaz1sb7vjjvwxjy5sg8cv67cdmac0l1rw5dmz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pipes pipes-group pipes-parse transformers
        ];
        description = "ByteString support for pipes";
@@ -101133,7 +103705,7 @@ self: {
        pname = "pipes-cellular";
        version = "0.0.0.1";
        sha256 = "0j0ayzvc9k3fmd9j37p41z50nqp4hwyywashcvng23qgp7m4ahdc";
-       buildDepends = [ base bytestring data-cell pipes ];
+       libraryHaskellDepends = [ base bytestring data-cell pipes ];
        homepage = "https://github.com/zadarnowski/pipes-cellular";
        description = "Pipes-based combinators for cellular data processing";
        license = stdenv.lib.licenses.bsd3;
@@ -101146,7 +103718,9 @@ self: {
        pname = "pipes-cellular-csv";
        version = "1.0.0.0";
        sha256 = "1lzism9rrs1569lhbjl6b49c461igmpgvxq6pnnpfvnqbps56vc9";
-       buildDepends = [ base bytestring data-cell pipes pipes-cellular ];
+       libraryHaskellDepends = [
+         base bytestring data-cell pipes pipes-cellular
+       ];
        homepage = "https://github.com/zadarnowski/pipes-cellular-csv";
        description = "Efficient pipes-based cellular CSV codec";
        license = stdenv.lib.licenses.bsd3;
@@ -101160,7 +103734,7 @@ self: {
        pname = "pipes-cereal";
        version = "0.1.0.0";
        sha256 = "04f538gyzvwxhqscsj9sywi6hz5k1fabjaga0vf861hlmv9agaa8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal mtl pipes pipes-bytestring pipes-parse
        ];
        description = "Encode and decode binary streams using the pipes and cereal libraries";
@@ -101175,7 +103749,7 @@ self: {
        pname = "pipes-cereal-plus";
        version = "0.4.0";
        sha256 = "1x1qfl8s0lhvcz2hqh5dl5ilyixar995bqqzas721ni2skflbhqr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal-plus errors mtl pipes pipes-bytestring text
        ];
        jailbreak = true;
@@ -101195,7 +103769,7 @@ self: {
        sha256 = "0czgzmfl5rs0p63x24zr4pcl01a0wy93hx8wpin9k61yfx7bb4ix";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring pipes pipes-safe process stm
        ];
        homepage = "http://www.github.com/massysett/pipes-cliff";
@@ -101209,8 +103783,8 @@ self: {
        pname = "pipes-concurrency";
        version = "2.0.3";
        sha256 = "0jsfnlzl6yvhikgn6v361ld9aypv2h2nsz1q24dxfk953zvm2sp5";
-       buildDepends = [ base pipes stm ];
-       testDepends = [ async base pipes stm ];
+       libraryHaskellDepends = [ base pipes stm ];
+       testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101221,7 +103795,7 @@ self: {
        pname = "pipes-conduit";
        version = "0.0.1";
        sha256 = "1nzylhmi3f2m0xnqgx0m9g0p5pwl6xnidsz8ykzmv8wafrh60dh8";
-       buildDepends = [ base conduit mtl pipes-core ];
+       libraryHaskellDepends = [ base conduit mtl pipes-core ];
        jailbreak = true;
        homepage = "https://github.com/pcapriotti/pipes-extra";
        description = "Conduit adapters";
@@ -101237,7 +103811,7 @@ self: {
        pname = "pipes-core";
        version = "0.1.0";
        sha256 = "1abzy45bjiy8lijg4a5xkwdh1k37c6m921y2s31x0yqgq79qlgyp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base categories lifted-base monad-control transformers void
        ];
        jailbreak = true;
@@ -101252,7 +103826,7 @@ self: {
        pname = "pipes-courier";
        version = "0.1.0.0";
        sha256 = "1v2bm2cmzb6a7bmpv8byrb5x4k5pivp3s8ma6r6dwhldic294jgf";
-       buildDepends = [ base courier pipes ];
+       libraryHaskellDepends = [ base courier pipes ];
        jailbreak = true;
        homepage = "http://github.com/kvanberendonck/pipes-courier";
        description = "Pipes utilities for interfacing with the courier message-passing framework";
@@ -101268,11 +103842,11 @@ self: {
        pname = "pipes-csv";
        version = "1.4.0";
        sha256 = "1q1gnfnkvlkk8lwllhyar7323k3jynh9rl6x9yks7lc3nqr1n16j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring cassava pipes unordered-containers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cassava HUnit pipes pipes-bytestring test-framework
          test-framework-hunit vector
        ];
@@ -101287,7 +103861,7 @@ self: {
        pname = "pipes-errors";
        version = "0.3";
        sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76";
-       buildDepends = [ base errors pipes ];
+       libraryHaskellDepends = [ base errors pipes ];
        jailbreak = true;
        homepage = "https://github.com/jdnavarro/pipes-errors";
        description = "Integration between pipes and errors";
@@ -101305,8 +103879,10 @@ self: {
        sha256 = "0yrbjs9y9s9a1q59138f7m0fsp8vsg0a31sfzgwfrg9pm2sfivfr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring pipes-core transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring pipes-core transformers
+       ];
+       testHaskellDepends = [
          base bytestring HUnit mtl pipes-core test-framework
          test-framework-hunit test-framework-th-prime
        ];
@@ -101324,8 +103900,8 @@ self: {
        pname = "pipes-extras";
        version = "1.0.0";
        sha256 = "1dwqvbmngiprdffi9l0vhrlchfrr8cl0dvzlb34pmczkm9rvq8xk";
-       buildDepends = [ base foldl pipes transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base foldl pipes transformers ];
+       testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
        ];
        jailbreak = true;
@@ -101341,7 +103917,7 @@ self: {
        pname = "pipes-fastx";
        version = "0.3.0.0";
        sha256 = "0xds11gfacj7m5lz6cssaj4v5z73ycrdmn57f0qxzqdsc2kln9ii";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring
        ];
        description = "Streaming parsers for Fasta and Fastq";
@@ -101354,7 +103930,9 @@ self: {
        pname = "pipes-group";
        version = "1.0.2";
        sha256 = "01k1j0b7rg39lfh2zhxxnj1bclmaas69b9wiai89h5i1m6aanmp0";
-       buildDepends = [ base free pipes pipes-parse transformers ];
+       libraryHaskellDepends = [
+         base free pipes pipes-parse transformers
+       ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101367,7 +103945,7 @@ self: {
        pname = "pipes-http";
        version = "1.0.2";
        sha256 = "0hqab1pzcj11qwvc4dznis0qsyn1zc1d0riqxy6b5k04p9i2jbzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-client http-client-tls pipes
        ];
        description = "HTTP client with pipes interface";
@@ -101382,7 +103960,7 @@ self: {
        pname = "pipes-illumina";
        version = "0.1.0.0";
        sha256 = "19s6rkrfvmni914flq37fkbfs6angzl3c40bzg0ddivn4ada7jvn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath pipes pipes-bgzf
        ];
        homepage = "http://github.com/rcallahan/pipes-illumina";
@@ -101396,7 +103974,7 @@ self: {
        pname = "pipes-interleave";
        version = "0.2.1";
        sha256 = "1xs48bxr4qjnwcmaajl3av4db87bxwm6nyffk3k5rks47lqmra3r";
-       buildDepends = [ base containers pipes ];
+       libraryHaskellDepends = [ base containers pipes ];
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
@@ -101408,8 +103986,8 @@ self: {
        pname = "pipes-mongodb";
        version = "0.1.0.0";
        sha256 = "0h4334fajrza7r8jrr78nqhs522kxnbzdj0gnbp7ndvzvx5ij888";
-       buildDepends = [ base monad-control mongoDB pipes ];
-       testDepends = [ base monad-control mongoDB pipes text ];
+       libraryHaskellDepends = [ base monad-control mongoDB pipes ];
+       testHaskellDepends = [ base monad-control mongoDB pipes text ];
        homepage = "http://github.com/jb55/pipes-mongodb";
        description = "Stream results from MongoDB";
        license = stdenv.lib.licenses.mit;
@@ -101423,7 +104001,7 @@ self: {
        pname = "pipes-network";
        version = "0.6.4";
        sha256 = "1wabyv5j4q0wxiz8ry7dq3amlvfh4r0721pd2lksx7hj3a5qzm2p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring network network-simple pipes pipes-safe
          transformers
        ];
@@ -101441,7 +104019,7 @@ self: {
        pname = "pipes-network-tls";
        version = "0.2.1";
        sha256 = "0k3w13s3vasd85mapa594xhi31mhdwqycxqnadidqy24q5s6zdhc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring network network-simple network-simple-tls pipes
          pipes-network pipes-safe tls transformers
        ];
@@ -101461,7 +104039,7 @@ self: {
        pname = "pipes-p2p";
        version = "0.4";
        sha256 = "1ls89dnz0aibmyy4mky7jl4ibirpfrs12yxmflarghv3j6rn0wnc";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base binary bytestring errors exceptions mtl network
          network-simple-sockaddr pipes pipes-concurrency pipes-network
        ];
@@ -101480,7 +104058,7 @@ self: {
        sha256 = "08fdk005yrmr8mz3qlsfjys3pz9iidk53maylbgdk3nixk8plwwm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers errors mtl network
          network-simple-sockaddr pipes pipes-network pipes-p2p
        ];
@@ -101497,7 +104075,7 @@ self: {
        pname = "pipes-parse";
        version = "3.0.3";
        sha256 = "00sslgh1h1n114adc0k2w23wk19pzmf2mh5zn37w40jdganrhlpm";
-       buildDepends = [ base pipes transformers ];
+       libraryHaskellDepends = [ base pipes transformers ];
        description = "Parsing infrastructure for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101511,7 +104089,7 @@ self: {
        pname = "pipes-postgresql-simple";
        version = "0.1.2.0";
        sha256 = "12ij2msdwjzzc93mlvvizh6amam5ld9j1a0b9xsa2awdjd21mwc1";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring exceptions mtl pipes pipes-concurrency
          pipes-safe postgresql-simple stm text transformers
        ];
@@ -101527,7 +104105,8 @@ self: {
        sha256 = "1wlgwil8ag6ax0kvammbqk7v2d8k6ygdqpjpys97zxrvy47dfc6r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mwc-random pipes time ];
+       libraryHaskellDepends = [ base mwc-random pipes time ];
+       executableHaskellDepends = [ base pipes time ];
        homepage = "http://github.com/ImAlsoGreg/pipes-rt";
        description = "A few pipes to control the timing of yields";
        license = stdenv.lib.licenses.bsd3;
@@ -101541,7 +104120,7 @@ self: {
        pname = "pipes-safe";
        version = "2.2.3";
        sha256 = "19wr3q6skwdyd68k1r33w2mipfsgsg2982027faq7rnfw9lq2yyi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers exceptions monad-control mtl pipes transformers
          transformers-base
        ];
@@ -101557,11 +104136,11 @@ self: {
        pname = "pipes-shell";
        version = "0.1.3";
        sha256 = "0w49il312ns8pyl05144gznxfdchd0rnq8hprmjrgy8yp3v8j4v1";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring pipes pipes-bytestring pipes-safe process stm
          stm-chans text
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring directory hspec pipes pipes-bytestring
          pipes-safe process stm stm-chans text
        ];
@@ -101579,7 +104158,7 @@ self: {
        pname = "pipes-text";
        version = "0.0.0.16";
        sha256 = "0db6xh10g4h1zy62aamcz59hykhlnq8d7qs24yp7lva8g0ymapyv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pipes pipes-bytestring pipes-group pipes-parse
          pipes-safe streaming-commons text transformers
        ];
@@ -101596,7 +104175,7 @@ self: {
        pname = "pipes-vector";
        version = "0.6.2";
        sha256 = "11nibsshxgnr2jw8lh8q9aygbmpfsq7mf7kdvaqzyggmrdsns2wn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-primitive pipes primitive transformers vector
        ];
        description = "Various proxies for streaming data into vectors";
@@ -101611,7 +104190,7 @@ self: {
        pname = "pipes-wai";
        version = "3.0.2";
        sha256 = "0wfab4nln9v91qprwm2ik9cz27m2qdhcw7qnndg4dhq47m7kvaw8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring http-types pipes transformers wai
        ];
        homepage = "http://github.com/brewtown/pipes-wai";
@@ -101627,8 +104206,8 @@ self: {
        pname = "pipes-websockets";
        version = "0.0.0.0";
        sha256 = "176gp747anh6a4wghkcj3jblb7ywhrp8c5wc7wrain77vn1sihk6";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -101648,7 +104227,10 @@ self: {
        sha256 = "1zlj7vcn3ng11n80a9m37al7y322ph9grq5qxn022vpb82baxwr4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring pipes pipes-safe semigroups zeromq4-haskell
+       ];
+       executableHaskellDepends = [
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
        homepage = "https://github.com/peddie/pipes-zeromq4";
@@ -101664,7 +104246,7 @@ self: {
        pname = "pipes-zlib";
        version = "0.4.3";
        sha256 = "04iiw0r1mnxl4myyp87wqhff6jm0g2246gwismi7jnwy7xmllsmc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pipes transformers zlib zlib-bindings
        ];
        homepage = "https://github.com/k0001/pipes-zlib";
@@ -101682,7 +104264,7 @@ self: {
        sha256 = "1mz4cfhg8y7cv38ir2lzl7b2p1nfm8c4syvgzz4b9j98dxg694xz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers haskeline haskeline-class mpppc
          mtl parsec text utf8-string
        ];
@@ -101703,9 +104285,12 @@ self: {
        sha256 = "10qrhpxk8v5qrs4pq4ghj0dj3brsbiv61pb5vakpq031h7grfg8p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring directory filepath optparse-applicative process
-         temporary text unordered-containers yaml
+       libraryHaskellDepends = [
+         base bytestring directory filepath process temporary text
+         unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative text unordered-containers yaml
        ];
        jailbreak = true;
        homepage = "https://github.com/chiro/haskell-pit";
@@ -101720,7 +104305,7 @@ self: {
        pname = "pkcs1";
        version = "1.0.2";
        sha256 = "1598gj6r6mv3z68qir1rgjk4p73w0k2fwkkban04s97xf86a0669";
-       buildDepends = [ base bytestring random ];
+       libraryHaskellDepends = [ base bytestring random ];
        homepage = "http://sep07.mroot.net/";
        description = "RSA encryption with PKCS1 padding";
        license = "GPL";
@@ -101734,7 +104319,7 @@ self: {
        sha256 = "019mli0g65g7k4rsp2myxc7g6p6wykj85amvb2g2ipw117zpzkfz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal split ];
+       executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101746,7 +104331,7 @@ self: {
        pname = "pktree";
        version = "0.2";
        sha256 = "172dsg1krxqamq8ids9xwyfqidr9z0qq4nmbq4rk2x62g4q0960c";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/singpolyma/pktree-haskell";
        description = "Implementation of the PKTree spatial index data structure";
        license = "unknown";
@@ -101758,7 +104343,7 @@ self: {
        pname = "placeholders";
        version = "0.1";
        sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ahammar/placeholders";
        description = "Placeholders for use while developing Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -101770,7 +104355,7 @@ self: {
        pname = "plailude";
        version = "0.6.0";
        sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i";
-       buildDepends = [ base bytestring mtl time unix ];
+       libraryHaskellDepends = [ base bytestring mtl time unix ];
        jailbreak = true;
        homepage = "https://secure.plaimi.net/works/plailude";
        description = "plaimi's prelude";
@@ -101785,7 +104370,7 @@ self: {
        pname = "planar-graph";
        version = "1.0.0.0";
        sha256 = "1c7a168wkym50nh6a0vqfnqgj4hsk91d4x3w84ip0phcnig65iip";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers data-clist
          deepseq
        ];
@@ -101801,7 +104386,9 @@ self: {
        pname = "plat";
        version = "0.1.0.1";
        sha256 = "06syff2yzrs7qvj8m1f7bgzd6qc834zl9qphv67q3ps5r2hy09qd";
-       buildDepends = [ base bytestring containers mtl utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl utf8-string
+       ];
        description = "Simple templating library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101817,10 +104404,13 @@ self: {
        sha256 = "1g49w0h3fms4ihxwbaq0bg0dzgqa1k83zrbnnd57svcr5qgi9clb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring filepath optparse-applicative text word8
+       libraryHaskellDepends = [
+         attoparsec base bytestring filepath text word8
        ];
-       testDepends = [ base bytestring doctest hlint hspec ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [ base bytestring doctest hlint hspec ];
        homepage = "https://github.com/pjones/playlists";
        description = "Library and executable for working with playlist files";
        license = stdenv.lib.licenses.bsd3;
@@ -101832,7 +104422,7 @@ self: {
        pname = "plist";
        version = "0.0.6";
        sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb";
-       buildDepends = [ base base64-bytestring bytestring hxt ];
+       libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101845,10 +104435,10 @@ self: {
      mkDerivation {
        pname = "plivo";
        version = "0.2.0.0";
-       revision = "1";
        sha256 = "16q6jwnbzxhapmkzi2sn1k02z8gq11s9wp555fv7msv2if5axrp0";
+       revision = "1";
        editedCabalFile = "7ef78cd34067e8d72872b32bcad9d01537710c11efce159c990aeb4670e4efb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring errors http-streams http-types
          io-streams network-uri old-locale time unexceptionalio
        ];
@@ -101867,7 +104457,7 @@ self: {
        pname = "plot";
        version = "0.2.3.4";
        sha256 = "1dclv0z94xpxmx80yzzppahq92cqjwaqr0g1ama0spywxhz6l7h3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo colour hmatrix mtl pango transformers
        ];
        homepage = "http://github.com/amcphail/plot";
@@ -101881,7 +104471,7 @@ self: {
        pname = "plot-gtk";
        version = "0.2.0.2";
        sha256 = "18p3jjrs1asd35q3fykfsrwx22d7rqczymbyxsaqwya5y0nv3ymn";
-       buildDepends = [ base glib gtk hmatrix mtl plot process ];
+       libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        homepage = "http://code.haskell.org/plot";
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
@@ -101895,7 +104485,7 @@ self: {
        pname = "plot-gtk-ui";
        version = "0.1.0.0";
        sha256 = "0q3f1rm1s22vrk19yzbflr1pwbl094lx5j8zbyhqqjvhpz491dx7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
        homepage = "https://github.com/sumitsahrawat/plot-gtk-ui";
@@ -101909,7 +104499,9 @@ self: {
        pname = "plot-gtk3";
        version = "0.1.0.1";
        sha256 = "0x7s9wb8r2sds25q9k6h8mvpfzgi90v497ccxskvb3qd0a1jv24f";
-       buildDepends = [ base glib gtk3 hmatrix mtl plot process ];
+       libraryHaskellDepends = [
+         base glib gtk3 hmatrix mtl plot process
+       ];
        homepage = "http://code.haskell.org/plot";
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
@@ -101923,7 +104515,9 @@ self: {
        sha256 = "1qa5mxq9j5m5zbvzsmrzg8jb9w9v8ik50c8w5ffddcrrqb9b8mcq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base colour gtk hmatrix plot text vector ];
+       executableHaskellDepends = [
+         base colour gtk hmatrix plot text vector
+       ];
        jailbreak = true;
        homepage = "https://github.com/sumitsahrawat/plot-lab";
        description = "A plotting tool with Mathematica like Manipulation abilities";
@@ -101936,7 +104530,7 @@ self: {
        pname = "plotserver-api";
        version = "0.22";
        sha256 = "17vr3c9dnd1jabx66qih7z19mk0irrxzab51gl5gifcgdxlf4s3x";
-       buildDepends = [ base curl split ];
+       libraryHaskellDepends = [ base curl split ];
        description = "Plotserver API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -101949,7 +104543,7 @@ self: {
        pname = "plugins";
        version = "1.5.4.0";
        sha256 = "126lp2bbz9aa3pfi5dmbbzgsancdj1m26k7man96avixb21mzbi8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths
          ghc-prim haskell-src process random
        ];
@@ -101967,10 +104561,10 @@ self: {
        pname = "plugins-auto";
        version = "0.0.4";
        sha256 = "1gia9d45d7rb658wm6ihkfz36l4ph7w0hr0vnfw42s035aj5shy4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath hinotify mtl plugins template-haskell
        ];
-       testDepends = [ base directory process ];
+       testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101984,10 +104578,10 @@ self: {
        pname = "plugins-multistage";
        version = "0.6.1";
        sha256 = "0kwibjp9r9gwkmi8i79cc217jhnqljcgdkvpsk7hclmaa7ir3caq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory ghc process template-haskell th-desugar
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th template-haskell
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
@@ -102001,7 +104595,7 @@ self: {
        pname = "plumbers";
        version = "0.0.3";
        sha256 = "1grw827jhxwka1zl0n5ycgrpc4ljw8bxg3psms8lsxfiiz6mwmq9";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102017,10 +104611,11 @@ self: {
        sha256 = "0hi32n4gjvydahlclzc47qsnwqhzxxa7irc4qv6qbgpra4j6zqg1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring cereal directory filepath lens linear
          parallel-io transformers vector
        ];
+       executableHaskellDepends = [ base bytestring linear vector ];
        description = "PLY file loader";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102033,7 +104628,7 @@ self: {
        pname = "png-file";
        version = "0.0.1.1";
        sha256 = "18m5pqf2dx26spwjav9b67plha9f3bgn4wl6g6pckl0mmym3zm10";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary-file bytestring monads-tf template-haskell zlib
        ];
        homepage = "https://skami.iocikun.jp/haskell/packages/png-file";
@@ -102050,7 +104645,9 @@ self: {
        pname = "pngload";
        version = "0.1";
        sha256 = "1j8zagi5xcb4spvq1r0wcnn211y2pryzf0r8z7h70ypqak7sy6ps";
-       buildDepends = [ array base bytestring haskell98 mtl parsec zlib ];
+       libraryHaskellDepends = [
+         array base bytestring haskell98 mtl parsec zlib
+       ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102062,7 +104659,7 @@ self: {
        pname = "pngload-fixed";
        version = "1.0";
        sha256 = "02ikfn7kl8jx5iffa2pv0n1z1c75qcg9aq94nrccfdp532wxr7bx";
-       buildDepends = [ array base bytestring mtl parsec zlib ];
+       libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102074,7 +104671,7 @@ self: {
        pname = "pnm";
        version = "0.1.0.0";
        sha256 = "0h6wsqv6c36cmk30gs3rjdjbxxq9zih49pmzhj2dh9nyxsqbj2yw";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "PNM image format header parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102093,13 +104690,19 @@ self: {
        sha256 = "1736gj66ljgarmdxwzc9m5aa9inkmgzfmn9sjcqlcs0kpp5faqsh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring data-default dns iproute monad-control
+         network optparse-applicative persistent persistent-sqlite
+         persistent-template persistent-zookeeper text transformers
+         unordered-containers yaml
+       ];
+       executableHaskellDepends = [
          aeson base bytestring data-default dns http-conduit iproute
          monad-control network optparse-applicative persistent
          persistent-sqlite persistent-template persistent-zookeeper shelly
-         text transformers unordered-containers yaml
+         text unordered-containers yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cabal-test-bin hspec hspec-contrib hspec-server
          hspec-test-sandbox shakespeare test-sandbox text transformers
        ];
@@ -102117,7 +104720,7 @@ self: {
        pname = "pointed";
        version = "4.2.0.2";
        sha256 = "0ynswx6ybl7b6vbrm2bd2zj2sbvsclhdi440lpv1aix5smd8m2jb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers data-default-class hashable kan-extensions
          semigroupoids semigroups stm tagged transformers
          transformers-compat unordered-containers
@@ -102133,7 +104736,7 @@ self: {
        pname = "pointedlist";
        version = "0.6.1";
        sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l";
-       buildDepends = [ base binary ];
+       libraryHaskellDepends = [ base binary ];
        description = "A zipper-like comonad which works as a list, tracking a position";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102148,10 +104751,13 @@ self: {
        sha256 = "0lkwan8vi86jl72wfpdi0saac6rbx8z270r2nf3vp0468dqk25cf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers haskell-src-exts transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base containers haskell-src-exts transformers
+       ];
+       testHaskellDepends = [
          array base containers haskell-src-exts HUnit QuickCheck
          transformers
        ];
@@ -102169,7 +104775,10 @@ self: {
        sha256 = "151cyy324g6cl5bdwcpbvcvpavj3x2592jbic1jq5q3fgahf5wqk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers haskell-src-exts mtl syb transformers
+       ];
+       executableHaskellDepends = [
          base containers haskell-src-exts mtl syb transformers
        ];
        homepage = "http://github.com/23Skidoo/pointful";
@@ -102183,7 +104792,7 @@ self: {
        pname = "pointless-fun";
        version = "1.1.0.6";
        sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Some common point-free combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -102195,7 +104804,7 @@ self: {
        pname = "pointless-haskell";
        version = "0.0.9";
        sha256 = "0f0bnd6dyi1ancdxd2hkszshws9d8jz8iamz5pir0i4nsj69mqyx";
-       buildDepends = [ base GHood process syb ];
+       libraryHaskellDepends = [ base GHood process syb ];
        homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Haskell";
        description = "Pointless Haskell library";
        license = stdenv.lib.licenses.bsd3;
@@ -102210,7 +104819,7 @@ self: {
        pname = "pointless-lenses";
        version = "0.0.9";
        sha256 = "1z09wbx9nrlpg0msq69zyaypp28rfm653l22g7q5xcn0wn4hfs0b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers derive pointless-haskell process QuickCheck
        ];
        homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Lenses";
@@ -102227,7 +104836,7 @@ self: {
        pname = "pointless-rewrite";
        version = "0.0.3";
        sha256 = "0dc37gw8p5zyi23g94llbq7vb5n09rgznjf24nhg28jw2vmf3f0n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl pointless-haskell pointless-lenses process
        ];
        description = "Pointless Rewrite library";
@@ -102241,8 +104850,8 @@ self: {
        pname = "poker-eval";
        version = "0.3.1";
        sha256 = "0v1is9jnpw1ij3b7h9figkjqk58dzc44v6vpdmxfmb80w0myihrv";
-       buildDepends = [ array base mtl random vector ];
-       extraLibraries = [ poker-eval ];
+       libraryHaskellDepends = [ array base mtl random vector ];
+       librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
      }) { inherit (pkgs) poker-eval;};
@@ -102256,7 +104865,7 @@ self: {
        pname = "pokitdok";
        version = "4.1.0.2";
        sha256 = "08pknbn79hihkil1vcpr7a8ilah3i5b6lnlc41bmprycyqz5vj1w";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-string bytestring case-insensitive directory hex
          HTTP http-client http-conduit http-types strict text time
        ];
@@ -102272,7 +104881,7 @@ self: {
        pname = "polar";
        version = "0.0.1";
        sha256 = "1f0anpxc57vxa5z0x4wrfay0g1sw2qwnz5nkz74y9vmh8vd99kkh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://space.k-hornz.de/polar";
        description = "Complex numbers in polar form";
        license = stdenv.lib.licenses.bsd3;
@@ -102288,7 +104897,7 @@ self: {
        sha256 = "0mnccx3xj568s3q82achf1pj57zqdpj9iskgh62w39xbqm7spivl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dawg directory filepath mtl polysoup text
          text-binary transformers
        ];
@@ -102305,7 +104914,9 @@ self: {
        pname = "polimorf";
        version = "0.7.3";
        sha256 = "0vv7j1l0wnjwpd3hpxswq0k33izl0ck2njspcga885bkrd45lzdr";
-       buildDepends = [ base binary containers text text-binary ];
+       libraryHaskellDepends = [
+         base binary containers text text-binary
+       ];
        jailbreak = true;
        homepage = "https://github.com/kawu/polimorf";
        description = "Working with the PoliMorf dictionary";
@@ -102318,7 +104929,7 @@ self: {
        pname = "poll";
        version = "0.0";
        sha256 = "0v4cyrr506zqvxqbxkncss2pl2j38skl02p1vj6cjxcvlzb2y43p";
-       buildDepends = [ base enumset utility-ht ];
+       libraryHaskellDepends = [ base enumset utility-ht ];
        description = "Bindings to poll.h";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102330,11 +104941,13 @@ self: {
      mkDerivation {
        pname = "poly-arity";
        version = "0.0.4.1";
-       revision = "2";
        sha256 = "15yl8mqwahbrwl0hmz6lb4k7i48qgnxhav7xalj4q541ghd7cnwp";
+       revision = "2";
        editedCabalFile = "0bce1ff7388433830c7824530bb9c4fe3f4545bad44683dec2a5780028d870af";
-       buildDepends = [ base constraints HList ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base constraints HList ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "Tools for working with functions of undetermined arity";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102345,7 +104958,7 @@ self: {
        pname = "polyToMonoid";
        version = "0.1";
        sha256 = "068acarrpd66682yjscm6l5k9kj9p8zxbf3hi76kz7gvkhkbsjj8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Polyvariadic functions mapping to a given monoid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102358,7 +104971,7 @@ self: {
        pname = "polynomial";
        version = "0.7.2";
        sha256 = "1w1zpa2l7l7yzqdgr142mqhf73mq8kiz7h3ydpd84n4vawjzz7z1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq pretty vector vector-space vector-th-unbox
        ];
        homepage = "https://github.com/mokus0/polynomial";
@@ -102372,7 +104985,7 @@ self: {
        pname = "polynomials-bernstein";
        version = "1.1.1";
        sha256 = "0pjdwi84gz5j1rij4m89nyljjafzjnakmf4yd6vj4xz54nmmygg6";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        description = "A solver for systems of polynomial equations in bernstein form";
        license = "GPL";
      }) {};
@@ -102383,7 +104996,7 @@ self: {
        pname = "polyparse";
        version = "1.11";
        sha256 = "1z417f80b0jm4dgv25fk408p3d9mmcd1dlbya3ry0zdx4md09vrh";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "http://code.haskell.org/~malcolm/polyparse/";
        description = "A variety of alternative parser combinator libraries";
        license = "LGPL";
@@ -102400,10 +105013,11 @@ self: {
        sha256 = "1l31ynlkjkk2zzpsv194gv3pbl55liizvq4x16m5z52vzgszb570";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cgi containers free-theorems haskell-src mtl
          network old-locale old-time parsec pretty syb utf8-string xhtml
        ];
+       executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102415,7 +105029,9 @@ self: {
        pname = "polysoup";
        version = "0.6";
        sha256 = "1c7lmx7waj2p9gn9k0hsvnmzrxf3ryz5q7zr4770g3nj8yvbpyp2";
-       buildDepends = [ base containers deepseq polyparse tagsoup ];
+       libraryHaskellDepends = [
+         base containers deepseq polyparse tagsoup
+       ];
        jailbreak = true;
        homepage = "https://github.com/kawu/polysoup";
        description = "Online XML parsing with polyparse and tagsoup";
@@ -102428,7 +105044,7 @@ self: {
        pname = "polytypeable";
        version = "0.1.0.0";
        sha256 = "0vb2adm97ypi553lsjz7333q3dg9fmi0incrxlikqixk0f3ajaq8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102440,7 +105056,7 @@ self: {
        pname = "polytypeable-utils";
        version = "0.1.0.0";
        sha256 = "1hbpamgqsmsjkzjjva15f566yra77hwasp88b6y68nx9qa36a821";
-       buildDepends = [ base haskell98 polytypeable ];
+       libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102452,7 +105068,7 @@ self: {
        pname = "ponder";
        version = "0.0.1";
        sha256 = "1nq4z063g429hxwf4vbyyr2b2s7sn325m0h6ggf793inlj48ci0h";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        homepage = "https://gihub.com/matt76k/ponder";
        description = "PEG parser combinator";
@@ -102469,7 +105085,7 @@ self: {
        sha256 = "00qyrbibav26x5ycipnyypybgjms2kxn38s3iy9gqzv0kmgsdxna";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HDBC HDBC-sqlite3 hlogger pontarius-xmpp pontarius-xpmn
          xml-types
        ];
@@ -102497,7 +105113,7 @@ self: {
        pname = "pontarius-xmpp";
        version = "0.4.2.2";
        sha256 = "1krbr0vdza3s6w4sa119x591i5ryq9bmqfnacy665xr5si4bkzcv";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
          data-default dns exceptions hslogger iproute lens-family
@@ -102506,7 +105122,7 @@ self: {
          unbounded-delays void x509-system xml-conduit xml-picklers
          xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base Cabal conduit configurator containers data-default
          derive directory doctest filepath hslogger hspec hspec-expectations
          HUnit lens mtl network QuickCheck quickcheck-instances ranges
@@ -102528,7 +105144,7 @@ self: {
        pname = "pontarius-xpmn";
        version = "0.0.1.0";
        sha256 = "1nd228fgsxlqxql38wkvhq8k5d04bgknpx7i83qxrzj8kb6890dy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers pontarius-xmpp random text xml-types
        ];
        jailbreak = true;
@@ -102546,7 +105162,7 @@ self: {
        sha256 = "0a8bya0kwk9d965awpg881bgzy9z1szcwsqqr0lfkd6bw3cb9fyy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ascii-art.de/ascii/uvw/unicorn.txt";
        description = "Can I have a pony?";
        license = stdenv.lib.licenses.bsd3;
@@ -102557,10 +105173,10 @@ self: {
      mkDerivation {
        pname = "pool";
        version = "0.1.2.1";
-       revision = "1";
        sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c";
+       revision = "1";
        editedCabalFile = "c79e139723764f4d4ba584c6cf6f73174700271910b15ed0f25a150a53a8c951";
-       buildDepends = [ base monad-control transformers ];
+       libraryHaskellDepends = [ base monad-control transformers ];
        jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Thread-safe resource pools. (deprecated)";
@@ -102575,10 +105191,10 @@ self: {
      mkDerivation {
        pname = "pool-conduit";
        version = "0.1.2.3";
-       revision = "1";
        sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv";
+       revision = "1";
        editedCabalFile = "b894f71054b3824a0a05753e8273efbc7c1dc48efa9c6d56625ba4411a74afa5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control resource-pool resourcet transformers
        ];
        jailbreak = true;
@@ -102598,7 +105214,7 @@ self: {
        sha256 = "0v7l0jvk2acqslb1inw6lgwbjraj73s396r160hw56slqxh5sgxl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base concurrent-split containers deepseq transformers unsafe
          utility-ht
        ];
@@ -102613,7 +105229,7 @@ self: {
        pname = "pop3-client";
        version = "0.1.4";
        sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv";
-       buildDepends = [ base mtl network ];
+       libraryHaskellDepends = [ base mtl network ];
        homepage = "https://github.com/tmrudick/haskell-pop3-client/";
        description = "POP3 Client Library";
        license = stdenv.lib.licenses.bsd3;
@@ -102625,7 +105241,7 @@ self: {
        pname = "popenhs";
        version = "1.0.0";
        sha256 = "01pb8g5zl99zccnjnkwklfgaz1pqjp1xrgz5b3qy45nclyln0bm4";
-       buildDepends = [ base directory haskell98 unix ];
+       libraryHaskellDepends = [ base directory haskell98 unix ];
        homepage = "http://www.haskell.org/~petersen/haskell/popenhs/";
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
@@ -102640,11 +105256,11 @@ self: {
        pname = "poppler";
        version = "0.13";
        sha256 = "1fv0h2ixanzv5vy4l2ln23f9n8ghmgdxzlyx54hh69bwhrcg049s";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
        ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gdk_pixbuf pango poppler ];
+       libraryPkgconfigDepends = [ gdk_pixbuf pango poppler ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
@@ -102658,7 +105274,7 @@ self: {
        pname = "populate-setup-exe-cache";
        version = "1.0";
        sha256 = "06z723fgqwvcxgxy63pqwmjb6xkcl69xmdry117f0i5rhy0aix3y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mietek/populate-setup-exe-cache/";
        description = "Empty Cabal package";
        license = stdenv.lib.licenses.mit;
@@ -102670,7 +105286,7 @@ self: {
        pname = "portable-lines";
        version = "0.1";
        sha256 = "1l94p3s56a3kfqc8fzqc52z12rhg3c8xsmgcw1i20dnl8aygalsh";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Alternative 'lines' implementation that understands CR-LF and CR";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102681,8 +105297,8 @@ self: {
        pname = "portaudio";
        version = "0.2.4";
        sha256 = "0vxlfn2462fmknj94sd5ajbm3lydy3z8mrqb3vgh47wwn0sq8sk3";
-       buildDepends = [ base containers ];
-       extraLibraries = [ portaudio ];
+       libraryHaskellDepends = [ base containers ];
+       librarySystemDepends = [ portaudio ];
        homepage = "http://code.haskell.org/portaudio";
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
@@ -102698,7 +105314,7 @@ self: {
        sha256 = "1cc7kbbz0vqh60acaxyn8b8pdmwx2w022sgvk1mw7p60s8jhng2d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers extensible-exceptions stringsearch
        ];
        description = "FreeBSD ports index search and analysis tool";
@@ -102712,7 +105328,7 @@ self: {
        pname = "porter";
        version = "0.1";
        sha256 = "0aw1gq7z3h5ag5vzl6crw7vijg9w25s0jvxr4rkniv4jk0wlfmnk";
-       buildDepends = [ haskell2010 ];
+       libraryHaskellDepends = [ haskell2010 ];
        description = "Implementation of the Porter stemming algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102724,7 +105340,7 @@ self: {
        pname = "ports";
        version = "0.4.3.2";
        sha256 = "1ixyrg4k1f91v2r485r2fs8bgq373bhvg02mza5jdcb1amyfi7rm";
-       buildDepends = [ base haskell98 unix ];
+       libraryHaskellDepends = [ base haskell98 unix ];
        homepage = "http://www.cse.unsw.edu.au/~chak/haskell/ports/";
        description = "The Haskell Ports Library";
        license = "LGPL";
@@ -102737,7 +105353,7 @@ self: {
        pname = "ports-tools";
        version = "0.0.1";
        sha256 = "0bs7b88qiczf59dliqhbxbzciv4xi07b6djspgpydigyrf5maac6";
-       buildDepends = [ base directory process ];
+       libraryHaskellDepends = [ base directory process ];
        homepage = "http://github.com/ppenzin/hs-ports-tools/";
        description = "Library to interact with port tools on FreeBSD";
        license = "unknown";
@@ -102749,10 +105365,9 @@ self: {
        pname = "positive";
        version = "0.4.1";
        sha256 = "034vlx889sgwvn7g2s1vl3w0nf1vs0c2c1gc0vn77wd9l1vw0hfg";
-       buildDepends = [ base nats semigroups ];
+       libraryHaskellDepends = [ base nats semigroups ];
        description = "Positive integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "posix-acl" = callPackage
@@ -102763,11 +105378,11 @@ self: {
        pname = "posix-acl";
        version = "0.2.0.0";
        sha256 = "1qiq5bqq6bwdxrxc3i27jiq1ic5pn0309453a0y6vjwamrc8h7rv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers lifted-base monad-control transformers
          transformers-base unix
        ];
-       extraLibraries = [ acl ];
+       librarySystemDepends = [ acl ];
        jailbreak = true;
        homepage = "https://github.com/tensor5/posix-acl";
        description = "Support for Posix ACL";
@@ -102781,7 +105396,7 @@ self: {
        pname = "posix-escape";
        version = "0.1";
        sha256 = "0yrx8cr6qximfy0vh7qqljlkj27q9gksrnqmqbnj2hk5bsa5l48w";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Quote arguments to be passed through the Unix shell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102792,7 +105407,7 @@ self: {
        pname = "posix-filelock";
        version = "0.1";
        sha256 = "106rrbw4d0f13wcj19m6h0vy3v53j11bawqd3q4r0pcsypk53qmk";
-       buildDepends = [ base transformers unix ];
+       libraryHaskellDepends = [ base transformers unix ];
        homepage = "https://github.com/singpolyma/posix-filelock-haskell";
        description = "Nice wrapper around POSIX fcntl advisory locks";
        license = "unknown";
@@ -102805,8 +105420,10 @@ self: {
        pname = "posix-paths";
        version = "0.2.1.0";
        sha256 = "187sq0rcdg06h64kkjdgqg32s8s51hd4cgf6hvajj1pgd9pyd1i0";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [ base bytestring doctest HUnit QuickCheck unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [
+         base bytestring doctest HUnit QuickCheck unix
+       ];
        description = "POSIX filepath/directory functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102817,8 +105434,8 @@ self: {
        pname = "posix-pty";
        version = "0.2.0.1";
        sha256 = "1f0jyhfl41fvnjc290lm7x4dik2bhymcfxzf0il1iza5rpcjabxa";
-       buildDepends = [ base bytestring process unix ];
-       extraLibraries = [ util ];
+       libraryHaskellDepends = [ base bytestring process unix ];
+       librarySystemDepends = [ util ];
        homepage = "https://bitbucket.org/merijnv/posix-pty";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
@@ -102830,7 +105447,7 @@ self: {
        pname = "posix-realtime";
        version = "0.0.0.3";
        sha256 = "0g7mflyvhrypr8a5795vnqb5qlkg3w4nd3j8pnqql9dbmcbqc2aq";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102841,7 +105458,7 @@ self: {
        pname = "posix-timer";
        version = "0.3";
        sha256 = "0z4j98pb46gzhi5i5pvxxm7an7am5i757p43cp2jv8pirx33k8zd";
-       buildDepends = [ base transformers-base unix ];
+       libraryHaskellDepends = [ base transformers-base unix ];
        homepage = "https://github.com/mvv/posix-timer";
        description = "Bindings to POSIX clock and timer functions";
        license = stdenv.lib.licenses.bsd3;
@@ -102853,7 +105470,7 @@ self: {
        pname = "posix-waitpid";
        version = "0.1";
        sha256 = "1v3y3pg3gv0s26hdqc5fsar2j3vk4kpldkr23zxm14ncpz2w2dhk";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102865,7 +105482,7 @@ self: {
        pname = "possible";
        version = "0.1.0.5";
        sha256 = "1iiyz3yf5rwcdawrbawdrx3fwrhb1s62ram6yavfwkvc7j9rfvzx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tolysz/possible";
        description = "Three valued Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
@@ -102877,7 +105494,7 @@ self: {
        pname = "post-mess-age";
        version = "0.1.0.0";
        sha256 = "1rl7i37szwnqs6slhha3wv45mw9w9x6yxcrkbdcfvdc63x8nh74w";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Send messages to a Handle concurrently without getting them mixed";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102888,7 +105505,7 @@ self: {
        pname = "postcodes";
        version = "0.1.1";
        sha256 = "1z0d5pl11jymd0jj1k50si35lq2af3y0apiyz6mbi25zl5x49bi8";
-       buildDepends = [ aeson base bytestring HTTP ];
+       libraryHaskellDepends = [ aeson base bytestring HTTP ];
        homepage = "https://github.com/mattyhall/haskell-postcodes";
        description = "A library that gets postcode information from the uk-postcodes.com";
        license = stdenv.lib.licenses.bsd3;
@@ -102903,11 +105520,11 @@ self: {
        pname = "postgresql-binary";
        version = "0.5.2.1";
        sha256 = "02dzsh9d62pgrqsvjmdxyffr4cryk3sd2dg12jmygg94q5dfkm0m";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base-prelude bytestring loch-th placeholders scientific
          text time transformers uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          base-prelude bytestring HTF postgresql-libpq QuickCheck
          quickcheck-instances scientific text time uuid
        ];
@@ -102925,7 +105542,7 @@ self: {
        pname = "postgresql-config";
        version = "0.1.0";
        sha256 = "1p5kzj2wsd3kigi9qavsqkxv9kfk4qbl809wqbdk4pd7y34ajab4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring monad-control mtl postgresql-simple
          resource-pool time
        ];
@@ -102940,7 +105557,7 @@ self: {
        pname = "postgresql-copy-escape";
        version = "0.1";
        sha256 = "063phxj8r3vy25awwwn47k9ac0s8z59igpgqrhb9gbfdq4ldrlpm";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/joeyadams/hs-postgresql-copy-escape";
        description = "Format data to feed to a PostgreSQL COPY FROM statement";
        license = stdenv.lib.licenses.bsd3;
@@ -102952,7 +105569,7 @@ self: {
        pname = "postgresql-cube";
        version = "0.1.0.0";
        sha256 = "0jla8rxnrk995qxyp5dgwm2d6yrcafyz5mj7yqr6v5jyzh6b59c3";
-       buildDepends = [ base bytestring postgresql-simple ];
+       libraryHaskellDepends = [ base bytestring postgresql-simple ];
        description = "Cube support for postgresql-simple";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -102963,8 +105580,8 @@ self: {
        pname = "postgresql-libpq";
        version = "0.9.1.1";
        sha256 = "0waqg245ly017j1qml4sc24896ax645bv8a2fghwwa46zvbsx0z4";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ postgresql ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ postgresql ];
        homepage = "http://github.com/lpsmith/postgresql-libpq";
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
@@ -102981,11 +105598,15 @@ self: {
        sha256 = "1a81wrqzhpgdhs7i0znamkrrra2bksfwsh22yxv94qg6r7c2qp2p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring directory filepath ghc-prim mtl
          old-locale postgresql-simple process text time transformers unix
          unordered-containers vector
        ];
+       executableHaskellDepends = [
+         base blaze-builder bytestring directory filepath ghc-prim mtl
+         old-locale postgresql-simple process time
+       ];
        jailbreak = true;
        description = "An ORM (Object Relational Mapping) and migrations DSL for PostgreSQL";
        license = "GPL";
@@ -103005,14 +105626,14 @@ self: {
        pname = "postgresql-query";
        version = "1.4.0";
        sha256 = "0ba5sslcjmfvjm1s3sf1ym7lgzgxx0p5gzdgby1r2y20i5cswfsr";
-       buildDepends = [
+       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
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base QuickCheck quickcheck-assertions
          quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th
          text
@@ -103029,14 +105650,16 @@ self: {
      mkDerivation {
        pname = "postgresql-schema";
        version = "0.1.3";
-       revision = "1";
        sha256 = "17i4xpal7cf7km3p59p7m1cbc39rgkjwg6dkmhswnr669v40r350";
+       revision = "1";
        editedCabalFile = "48c36bad1c6796bd2c7211e0002d2aafc5bb0c8dedde4ec9f8ece597335096ce";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base-prelude formatting old-locale optparse-applicative shelly
-         text time
+       libraryHaskellDepends = [
+         base base-prelude formatting shelly text
+       ];
+       executableHaskellDepends = [
+         base base-prelude old-locale optparse-applicative shelly text time
        ];
        jailbreak = true;
        homepage = "https://github.com/mfine/postgresql-schema";
@@ -103056,12 +105679,12 @@ self: {
        pname = "postgresql-simple";
        version = "0.4.10.0";
        sha256 = "0ar8rjd3fsk56ykf7ys3f14ld3771dknhvkfk08fq7054rilrir0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-textual bytestring
          case-insensitive containers hashable postgresql-libpq scientific
          template-haskell text time transformers uuid vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base16-bytestring bytestring containers cryptohash HUnit
          text time vector
        ];
@@ -103079,11 +105702,15 @@ self: {
        sha256 = "0qz75dgp346q6sbxwlfrqd9hpkh14krij2r8440nhb9qs4ccl2jz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cryptohash directory
          postgresql-simple time
        ];
-       testDepends = [ base bytestring hspec postgresql-simple ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple time
+       ];
+       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
        jailbreak = true;
        homepage = "https://github.com/ameingast/postgresql-simple-migration";
        description = "PostgreSQL Schema Migrations";
@@ -103096,7 +105723,7 @@ self: {
        pname = "postgresql-simple-sop";
        version = "0.1.0.7";
        sha256 = "1hbfh4rp40h1h4m8dzr70zrfb24fckqwp5s6a7kc2fa7a9lw9g8r";
-       buildDepends = [ base generics-sop postgresql-simple ];
+       libraryHaskellDepends = [ base generics-sop postgresql-simple ];
        homepage = "https://github.com/openbrainsrc/postgresql-simple-sop";
        description = "Generic functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
@@ -103110,7 +105737,7 @@ self: {
        pname = "postgresql-simple-typed";
        version = "0.1.0.1";
        sha256 = "0rgy0sx4fwcsr8ln14vhrp23hc1b67c07gw0hj5csrsjn40s0c2c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base postgresql-libpq postgresql-simple template-haskell
          transformers typedquery utf8-string
        ];
@@ -103128,8 +105755,12 @@ self: {
        pname = "postgresql-simple-url";
        version = "0.1.0.1";
        sha256 = "1878zcfgis931nn5pnbixzfj2sbp790rxq294cwjy6g1ab35w5ng";
-       buildDepends = [ base network-uri postgresql-simple split ];
-       testDepends = [ base postgresql-simple tasty tasty-quickcheck ];
+       libraryHaskellDepends = [
+         base network-uri postgresql-simple split
+       ];
+       testHaskellDepends = [
+         base postgresql-simple tasty tasty-quickcheck
+       ];
        homepage = "https://github.com/futurice/postgresql-simple-url";
        description = "PostgreSQL";
        license = stdenv.lib.licenses.mit;
@@ -103145,12 +105776,12 @@ self: {
        pname = "postgresql-typed";
        version = "0.4.0";
        sha256 = "0w3fbxwiqsl32g4hmkdxyw821nd14dv3i2pwykpx68c9w6vvlmx9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptohash
          haskell-src-meta network old-locale postgresql-binary scientific
          template-haskell text time utf8-string uuid
        ];
-       testDepends = [ base bytestring network time ];
+       testHaskellDepends = [ base bytestring network time ];
        homepage = "https://github.com/dylex/postgresql-typed";
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.bsd3;
@@ -103175,7 +105806,7 @@ self: {
        sha256 = "0s1nmdpdjylqb6lmb9ijh83pfjyf8j6dkagl3rzl4dxc97w6fbpy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-string bcrypt blaze-builder bytestring
          case-insensitive cassava containers convertible hasql hasql-backend
          hasql-postgres HTTP http-types jwt MissingH mtl network network-uri
@@ -103184,7 +105815,16 @@ self: {
          stringsearch text time transformers unordered-containers vector wai
          wai-cors wai-extra wai-middleware-static warp
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base base64-string bcrypt blaze-builder bytestring
+         case-insensitive cassava containers convertible hasql hasql-backend
+         hasql-postgres HTTP http-types jwt MissingH mtl network network-uri
+         optparse-applicative Ranged-sets regex-base regex-tdfa
+         regex-tdfa-text resource-pool scientific split string-conversions
+         stringsearch text time transformers unordered-containers vector wai
+         wai-cors wai-extra wai-middleware-static warp
+       ];
+       testHaskellDepends = [
          aeson base base64-string bcrypt blaze-builder bytestring
          case-insensitive cassava containers convertible hasql hasql-backend
          hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP
@@ -103213,10 +105853,12 @@ self: {
        sha256 = "1iqg7wirdcysjq4i7ah3lkzc2rzlbgvc7asq953zdir21g9jpqwk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring cprng-aes data-default-class mtl network
-         pipes pipes-bytestring pipes-parse stringsearch tls transformers
-         uuid
+         pipes pipes-parse stringsearch tls transformers uuid
+       ];
+       executableHaskellDepends = [
+         base bytestring data-default-class pipes pipes-bytestring tls
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -103233,10 +105875,11 @@ self: {
        sha256 = "1jh1byixnc8mh3g4xb1w0nx9ghh5dchhqf1nxji869kbim2lqgaw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers http-client-tls
          http-types network-api-support text
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "https://github.com/apiengine/postmark";
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
@@ -103253,11 +105896,11 @@ self: {
        sha256 = "1yzhblrqnd94gvcl4dzxx6glx1qyyvjy7gqa6ymqahcy8kh1v7ki";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory hopenssl hsdns hsemail hsyslog
          mtl network old-time parsec unix
        ];
-       extraLibraries = [ adns openssl ];
+       executableSystemDepends = [ adns openssl ];
        homepage = "http://github.com/peti/postmaster";
        description = "Postmaster ESMTP Server";
        license = "GPL";
@@ -103272,7 +105915,7 @@ self: {
        sha256 = "1d95y8nchzzy3zaq1dsm94b7nhrlxhwpq7yn9dr1nisz43f4j7bx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring split ];
+       executableHaskellDepends = [ base binary bytestring split ];
        homepage = "https://github.com/RossMeikleham/Potato_Tool";
        description = "Command line Dreamcast VMU filesystem toolset";
        license = stdenv.lib.licenses.gpl2;
@@ -103286,7 +105929,7 @@ self: {
        pname = "potrace";
        version = "0.1.0.0";
        sha256 = "1frxf3jzjyyp3bfj6b2mi29fxwcml4bya6sn4c5aizg741dhphng";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-potrace bytestring containers data-default
          JuicyPixels vector
        ];
@@ -103300,7 +105943,7 @@ self: {
        pname = "potrace-diagrams";
        version = "0.1.0.0";
        sha256 = "0ys70a5k384czz0c6bpyy0cqrk35wa1yg6ph19smhm3ag9d8161v";
-       buildDepends = [ base diagrams-lib JuicyPixels potrace ];
+       libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Potrace bindings for the diagrams library";
        license = stdenv.lib.licenses.gpl2;
@@ -103312,7 +105955,7 @@ self: {
        pname = "powermate";
        version = "0.1";
        sha256 = "19qsi4g4v2dwagps3gq9grbin44rzk9ydpkpbwysc4gbizh1lrs0";
-       buildDepends = [ base directory network unix ];
+       libraryHaskellDepends = [ base directory network unix ];
        homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "PowerMate bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -103325,7 +105968,7 @@ self: {
        pname = "powerpc";
        version = "0.0.1";
        sha256 = "0z3nqv8l9h0kwdaqb2vnk7vx5d0hmx02giv2k01llk7vznlkqqny";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://tomahawkins.org";
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
@@ -103338,7 +105981,7 @@ self: {
        pname = "ppm";
        version = "2009.5.13";
        sha256 = "0nzvxi1ybfxb1zqkbfqfic8j3mf3r6i2zdyjf7x41rz6m6lhqfcy";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://github.com/nfjinjing/ppm/tree/master";
        description = "a tiny PPM image generator";
        license = stdenv.lib.licenses.bsd3;
@@ -103350,8 +105993,8 @@ self: {
        pname = "pqc";
        version = "0.8";
        sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4";
-       buildDepends = [ base QuickCheck random stm ];
-       testDepends = [ base ChasingBottoms ];
+       libraryHaskellDepends = [ base QuickCheck random stm ];
+       testHaskellDepends = [ base ChasingBottoms ];
        homepage = "http://hub.darcs.net/shelarcy/pqc";
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -103364,10 +106007,9 @@ self: {
        pname = "pqueue";
        version = "1.3.0";
        sha256 = "0nandznr9dmyvxxb4pfrcc21zyhbkn2q6ny0m60943kdmisf4401";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqueue-mtl" = callPackage
@@ -103378,7 +106020,7 @@ self: {
        pname = "pqueue-mtl";
        version = "1.0.7";
        sha256 = "0ikg11klbq25fjcbpyb7i7z9wyx9mf4hv262m14j741x4dk9ib6g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim MaybeT mtl stateful-mtl uvector
        ];
        jailbreak = true;
@@ -103397,7 +106039,9 @@ self: {
        sha256 = "071arrk0wir2lwziw6p3cbq6ybjdf3gfc4d25sh21gpnk10ighp2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring data-default directory json mps ];
+       executableHaskellDepends = [
+         base bytestring data-default directory json mps
+       ];
        homepage = "http://github.com/nfjinjing/practice-room";
        description = "Practice Room";
        license = stdenv.lib.licenses.bsd3;
@@ -103414,7 +106058,7 @@ self: {
        sha256 = "0d0cl60p58i8w2ll8z826r94zx0svm7v578fy70r7i19pn64l6bd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers cpphs directory filepath haskell-src-exts
          xhtml
        ];
@@ -103433,8 +106077,10 @@ self: {
        pname = "pred-trie";
        version = "0.2.0";
        sha256 = "11d0673jhz8vb271wf0qsl8a480hzrghly07iqcmckybalr17ibs";
-       buildDepends = [ base semigroups ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base semigroups ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103445,7 +106091,7 @@ self: {
        pname = "predicates";
        version = "0.1";
        sha256 = "0ly64xml5gbazyq07s409swgysvlwjc19w4x46yp1684ifv0gghf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A couple of convenience functions for forming predicates";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103459,11 +106105,11 @@ self: {
        pname = "prednote";
        version = "0.36.0.2";
        sha256 = "1nm6r448vzl1gkkasjihaf31i57lx7pi627dxwf73slwxfz4j0wb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers contravariant rainbow split text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers contravariant QuickCheck rainbow split
          tasty tasty-quickcheck tasty-th text transformers
        ];
@@ -103482,7 +106128,11 @@ self: {
        sha256 = "0amx13lnbx6x37adpjrxjac23qbx1xvsk82pn572kyp7pshn7ijj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         barecheck base containers prednote QuickCheck quickpull rainbow
+         rainbow-tests text
+       ];
+       executableHaskellDepends = [
          barecheck base containers prednote QuickCheck quickpull rainbow
          rainbow-tests text
        ];
@@ -103499,11 +106149,11 @@ self: {
      mkDerivation {
        pname = "prefix-units";
        version = "0.1.0.2";
-       revision = "1";
        sha256 = "07b5s2bsqlaad06dgr5psidfgi1nmgc5c16j6kzayw9f4najjrav";
+       revision = "1";
        editedCabalFile = "492d6b953a52678e44a880c5272c30175eed27c3f2bd4de82fc29eee4b4db00a";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base Cabal HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -103524,12 +106174,15 @@ self: {
        sha256 = "0zraxygc8ybf93sw7lq60nynd5k1q65dns5kl4mdyflv3in8cfw8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base blaze-builder bytestring cmdargs containers data-default
-         http-types network process stm system-argv0 system-filepath unix
-         wai warp
+       libraryHaskellDepends = [
+         base containers data-default process stm system-argv0
+         system-filepath unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         async base blaze-builder bytestring cmdargs containers http-types
+         network stm unix wai warp
+       ];
+       testHaskellDepends = [
          base cab containers directory filepath hspec process stm unix
        ];
        jailbreak = true;
@@ -103547,7 +106200,7 @@ self: {
        pname = "pregame";
        version = "0.1.4.3";
        sha256 = "0ls2fmg1xm10njwzz7nifndggq4bpi7ylx3n9aah8bn1hqwf8sy4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs containers data-default lens mtl parallel
          safe stm text transformers tuple vector
        ];
@@ -103564,7 +106217,7 @@ self: {
        pname = "prelude-extras";
        version = "0.4";
        sha256 = "0mzsc9pzcamaa7i3g9hkajy35sbpqdjrflv6r98r8hhlr0yrdjan";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/prelude-extras";
        description = "Haskell 98 - higher order versions of Prelude classes";
        license = stdenv.lib.licenses.bsd3;
@@ -103576,7 +106229,7 @@ self: {
        pname = "prelude-generalize";
        version = "0.4";
        sha256 = "0h452pn7zs97z5gv2p3x9pg61phphwcw5y5g1w38k3gihdvym8jl";
-       buildDepends = [ base comonad logict transformers ];
+       libraryHaskellDepends = [ base comonad logict transformers ];
        jailbreak = true;
        description = "Another kind of alternate Prelude file";
        license = stdenv.lib.licenses.publicDomain;
@@ -103591,7 +106244,7 @@ self: {
        sha256 = "139b0580f1gx4hj211c7lwcq5y6a0qpdzsaidvqbfq36h04w8kjv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base utf8-string ];
+       libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103603,7 +106256,7 @@ self: {
        pname = "prelude-prime";
        version = "0.1";
        sha256 = "1avj11a5bqn8sxizzh1fxhw3dvd55xsimbbhdwymxfn45vvfswr7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A slightly better (but conservative) Prelude";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -103614,7 +106267,7 @@ self: {
        pname = "prelude-safeenum";
        version = "0.1.1.2";
        sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A redefinition of the Prelude's Enum class in order to render it safe";
        license = stdenv.lib.licenses.bsd3;
@@ -103630,7 +106283,7 @@ self: {
        pname = "preprocess-haskell";
        version = "0.0.1.1";
        sha256 = "1jglriabjw44f9phx7ah87wwmri64a61v236dzs58snagzdiq84r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols basic-prelude bytestring Cabal containers
          cpphs deepseq directory file-embed foldl haskell-src-exts here
          system-filepath temporary text turtle unix
@@ -103647,7 +106300,7 @@ self: {
        pname = "preprocessor-tools";
        version = "1.0.1";
        sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9";
-       buildDepends = [ base mtl parsec syb ];
+       libraryHaskellDepends = [ base mtl parsec syb ];
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
        license = stdenv.lib.licenses.bsd3;
@@ -103658,11 +106311,11 @@ self: {
      mkDerivation {
        pname = "presburger";
        version = "1.3.1";
-       revision = "1";
        sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6";
+       revision = "1";
        editedCabalFile = "7c88061e13bab0e63240c05dad36b9518ad50d7ad4ade0f8911efa7826eb4b5d";
-       buildDepends = [ base containers pretty ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base containers pretty ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/yav/presburger";
        description = "A decision procedure for quantifier-free linear arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -103676,7 +106329,7 @@ self: {
        pname = "present";
        version = "2.2";
        sha256 = "1z9zvmszda7h1h4inq4b6ig9bd205mskqq85ns3rzsffxaj471p4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson atto-lisp base bytestring data-default mtl semigroups text
        ];
        description = "Make presentations for data types";
@@ -103689,7 +106342,7 @@ self: {
        pname = "press";
        version = "0.1.2";
        sha256 = "0aa3079az8bazyzqxxhx575vxr4a0p3wvlgh765w3k01vh6dkzgf";
-       buildDepends = [ base containers json mtl parsec ];
+       libraryHaskellDepends = [ base containers json mtl parsec ];
        homepage = "http://github.com/bickfordb/text-press";
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
@@ -103706,7 +106359,7 @@ self: {
        pname = "presto-hdbc";
        version = "0.1.0.3";
        sha256 = "1353nh8pq3ja4pw1fps0a46rfizph47l7k5gqlnkbz8w8b41miap";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring convertible either either-unwrap
          errors HDBC HTTP http-streams io-streams lens mtl network-uri safe
          scientific text transformers
@@ -103722,7 +106375,7 @@ self: {
        pname = "prettify";
        version = "1.0";
        sha256 = "18bwgz2cgkd6n9gwpwipv2bc6d5501mflmr0r2akwy98q2gb9qg8";
-       buildDepends = [ base containers semigroups ];
+       libraryHaskellDepends = [ base containers semigroups ];
        description = "Haskell2010 structured text formatting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103733,8 +106386,8 @@ self: {
        pname = "pretty";
        version = "1.1.3.2";
        sha256 = "0k61v71c40dy4whvy1q1n3hs0xnhscg4svp0prcihn7s57j2spvi";
-       buildDepends = [ base deepseq ghc-prim ];
-       testDepends = [ base deepseq ghc-prim QuickCheck ];
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [ base deepseq ghc-prim QuickCheck ];
        homepage = "http://github.com/haskell/pretty";
        description = "Pretty-printing library";
        license = stdenv.lib.licenses.bsd3;
@@ -103746,7 +106399,7 @@ self: {
        pname = "pretty-class";
        version = "1.0.1.1";
        sha256 = "1qdfp2kpahzflq9a3idwmb0pqs4l7almxn5rbw5gp2pmdx81p3am";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        homepage = "https://github.com/ddssff/pretty-class";
        description = "Pretty printing class similar to Show";
        license = stdenv.lib.licenses.bsd3;
@@ -103758,7 +106411,7 @@ self: {
        pname = "pretty-compact";
        version = "1.0";
        sha256 = "0k6yvdwcfhjp0dbfmc55xfncfry7b69hrp5rsaqm2iia3ahx0nan";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Pretty-printing library";
        license = "GPL";
      }) {};
@@ -103769,7 +106422,7 @@ self: {
        pname = "pretty-hex";
        version = "1.0";
        sha256 = "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "A library for hex dumps of ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103780,7 +106433,7 @@ self: {
        pname = "pretty-ncols";
        version = "0.1";
        sha256 = "0bvd8wgjrj9g86b1z8m9mjzswibrmhasgajnkgr2dlizl5lg7faq";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103792,15 +106445,16 @@ self: {
      mkDerivation {
        pname = "pretty-show";
        version = "1.6.8.2";
-       revision = "1";
        sha256 = "1s95nzjkmqb747s50i68c9s8p91cxgydzqkd2l5yjzdaygrvrhqv";
+       revision = "1";
        editedCabalFile = "3454673131f18cc65fb3fbca43d5d010f6b228abc0b7e501e67ef90ffded4218";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base filepath ghc-prim haskell-lexer pretty
        ];
-       buildTools = [ happy ];
+       libraryToolDepends = [ happy ];
+       executableHaskellDepends = [ base ];
        homepage = "http://wiki.github.com/yav/pretty-show";
        description = "Tools for working with derived `Show` instances and generic inspection of values";
        license = stdenv.lib.licenses.mit;
@@ -103812,7 +106466,7 @@ self: {
        pname = "pretty-sop";
        version = "0.1.0.1";
        sha256 = "1sv6lwzgj9jv7lx3lb868md5w93p77mzspgxgqcss1kr9q5xyfvm";
-       buildDepends = [ base generics-sop pretty-show ];
+       libraryHaskellDepends = [ base generics-sop pretty-show ];
        description = "A generic pretty-printer using generics-sop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103823,7 +106477,7 @@ self: {
        pname = "pretty-tree";
        version = "0.1.0.0";
        sha256 = "0cf856qjacc0lmiina44s00i17ga2qrfr7wdlxhwiqdmpsh5g3fw";
-       buildDepends = [ base boxes containers ];
+       libraryHaskellDepends = [ base boxes containers ];
        description = "Pretty-print trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103834,7 +106488,7 @@ self: {
        pname = "prettyFunctionComposing";
        version = "1.0.1";
        sha256 = "0c39dyjlcrah1aq2rkk7zqysmzxqym6chv8x9zmifclvn5a4j98b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "prettier function composition by (°)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103845,7 +106499,7 @@ self: {
        pname = "prettyclass";
        version = "1.0.0.0";
        sha256 = "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "Pretty printing class similar to Show";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103856,7 +106510,7 @@ self: {
        pname = "prim-uniq";
        version = "0.1.0.1";
        sha256 = "1zssi4zaihjaf3an10ar39d4qb155wcl1j66aymfrr9z2f2rf1gv";
-       buildDepends = [ base dependent-sum primitive ];
+       libraryHaskellDepends = [ base dependent-sum primitive ];
        homepage = "https://github.com/mokus0/prim-uniq";
        description = "Opaque unique identifiers in primitive state monads";
        license = stdenv.lib.licenses.publicDomain;
@@ -103868,7 +106522,7 @@ self: {
        pname = "primes";
        version = "0.2.1.0";
        sha256 = "0ny6fzr967d1fifk050k95j9snnbjjif2bxf3v9s93k3zdc6bmkl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/sebfisch/primes";
        description = "Efficient, purely functional generation of prime numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -103879,10 +106533,10 @@ self: {
      mkDerivation {
        pname = "primitive";
        version = "0.5.1.0";
-       revision = "1";
        sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8";
+       revision = "1";
        editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "https://github.com/haskell/primitive";
        description = "Primitive memory-related operations";
@@ -103895,8 +106549,8 @@ self: {
        pname = "primitive";
        version = "0.6";
        sha256 = "08lpsvrgdvqh8xw7f1wzkvwdnkizblbym8y2xpknk0y62f9g799l";
-       buildDepends = [ base ghc-prim transformers ];
-       testDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim transformers ];
+       testHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/haskell/primitive";
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
@@ -103914,7 +106568,7 @@ self: {
        sha256 = "0hh13i0idpwv509zavg92wwvp3s20vc1ivz7vfwa4kxp0h21phs9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile containers directory happstack happstack-helpers
          happstack-server happstack-state hsp MissingH mtl old-locale
          old-time random regex-posix split time
@@ -103935,7 +106589,7 @@ self: {
        sha256 = "0j3xjlwvix81zxd38540jwb3vp438d72gmfxdhbypyi5f1qgx01x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile directory HTTP mtl network parsec utf8-string XMPP
        ];
        jailbreak = true;
@@ -103953,7 +106607,7 @@ self: {
        pname = "printf-mauke";
        version = "0.6.0";
        sha256 = "1fyxm4bdhv27g83q21d0j59p7da8kgi8sfnsp39xb8gl4k0gd80z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default template-haskell
          utf8-string
        ];
@@ -103970,7 +106624,7 @@ self: {
        sha256 = "1myn6bp28d8nf92v9xf3iw5jvzwmrxbzf8px254hmzv8zvd5ki1i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base xosd ];
+       executableHaskellDepends = [ base xosd ];
        homepage = "http://code.haskell.org/~dons/code/printxosd";
        description = "Simple tool to display some text on an on-screen display";
        license = stdenv.lib.licenses.bsd3;
@@ -103982,7 +106636,7 @@ self: {
        pname = "priority-queue";
        version = "0.2.2";
        sha256 = "0nsiil0yl32m80a1kpg3z0wd5fxwkpz2lzf66pa06iy24q0rz5lf";
-       buildDepends = [ base containers queue reord stateref ];
+       libraryHaskellDepends = [ base containers queue reord stateref ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~mokus/priority-queue";
        description = "Simple implementation of a priority queue";
@@ -103999,7 +106653,10 @@ self: {
        sha256 = "1ffg3ba6wfd72r2d86hq28y83qx80pdza939knay9hsnyw84vd6g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers parallel PSQueue random stm ];
+       libraryHaskellDepends = [
+         base containers parallel PSQueue random stm
+       ];
+       executableHaskellDepends = [ base ];
        description = "Cooperative task prioritization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104010,7 +106667,7 @@ self: {
        pname = "privileged-concurrency";
        version = "0.3";
        sha256 = "0r345189lympvin6xw6r8s04dldj94kv2703ilcazm0a6mgf0q67";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Provides privilege separated versions of the concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104023,8 +106680,8 @@ self: {
        pname = "prizm";
        version = "0.3.1.2";
        sha256 = "0n0pihi8f8y349lmy6hcv2z728isvwjlcggv9pnhm8d0k97la2b9";
-       buildDepends = [ base text ];
-       testDepends = [
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -104040,7 +106697,9 @@ self: {
        pname = "probability";
        version = "0.2.4.1";
        sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc";
-       buildDepends = [ base containers random transformers utility-ht ];
+       libraryHaskellDepends = [
+         base containers random transformers utility-ht
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming";
        description = "Probabilistic Functional Programming";
@@ -104055,7 +106714,7 @@ self: {
        pname = "probable";
        version = "0.1.1";
        sha256 = "1n6p7pharcq2cmfabh2ngfsy9mfqqs6qh57m0kygq13lbzwyy8wr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl mwc-random primitive statistics transformers vector
        ];
        homepage = "http://github.com/alpmestan/probable";
@@ -104071,7 +106730,7 @@ self: {
        pname = "proc";
        version = "0.0.9";
        sha256 = "0p3cr4q34h81g77psypja4m0mgs9mwl51mfb5kdxj5xrsf2nd3la";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath process regex-tdfa split strict
          xformat
        ];
@@ -104086,8 +106745,8 @@ self: {
        pname = "process";
        version = "1.2.3.0";
        sha256 = "1ib01nkh513v5ab7wa255jqpsnqjsjdmh8d9dz8inqw3f4ah97k1";
-       buildDepends = [ base deepseq directory filepath unix ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base deepseq directory filepath unix ];
+       testHaskellDepends = [ base ];
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104101,11 +106760,11 @@ self: {
        pname = "process-conduit";
        version = "1.2.0.1";
        sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit control-monad-loop mtl process resourcet
          shakespeare shakespeare-text template-haskell text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra hspec resourcet
        ];
        homepage = "http://github.com/snoyberg/process-conduit";
@@ -104120,7 +106779,9 @@ self: {
        pname = "process-extras";
        version = "0.3.3.5";
        sha256 = "18fyv47xhvw5881is2hk9a1x35fr21jvw36irlc5cxc3vfmnym6s";
-       buildDepends = [ base bytestring deepseq ListLike process text ];
+       libraryHaskellDepends = [
+         base bytestring deepseq ListLike process text
+       ];
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
@@ -104134,10 +106795,10 @@ self: {
        pname = "process-iterio";
        version = "0.0.0";
        sha256 = "18kdj70fv4y5fnw7d8pd0mbvlwca1pm1f88z4ibpji0n4dja332z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cpphs iterIO process transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cpphs iterIO process transformers
        ];
        homepage = "https://github.com/garious/process-iterio";
@@ -104152,7 +106813,7 @@ self: {
        pname = "process-leksah";
        version = "1.0.1.4";
        sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv";
-       buildDepends = [ base directory filepath unix ];
+       libraryHaskellDepends = [ base directory filepath unix ];
        jailbreak = true;
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -104165,10 +106826,12 @@ self: {
      mkDerivation {
        pname = "process-listlike";
        version = "1.0";
-       revision = "3";
        sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r";
+       revision = "3";
        editedCabalFile = "75f8f07195965b0a2ca36725792b095896801d4e4133c7c67a72600bdbeb63b1";
-       buildDepends = [ base bytestring deepseq ListLike process text ];
+       libraryHaskellDepends = [
+         base bytestring deepseq ListLike process text
+       ];
        jailbreak = true;
        homepage = "https://github.com/ddssff/process-listlike";
        description = "Process extras";
@@ -104184,7 +106847,7 @@ self: {
        pname = "process-progress";
        version = "0.14";
        sha256 = "0kdzb8m6fx0ah9i15fpcz6phzqd88g4djf0a5h0vi4d4qkib6kin";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring deepseq HUnit ListLike mtl process process-listlike
          text time unix utf8-string
        ];
@@ -104202,7 +106865,7 @@ self: {
        pname = "process-qq";
        version = "0.2.0";
        sha256 = "1495dc39kjf9mjvn7ag8hb95bsmhb18sd0ykg4mz7rrl0q03ig2a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator mtl process shakespeare-text
          template-haskell text
        ];
@@ -104225,13 +106888,13 @@ self: {
        pname = "process-streaming";
        version = "0.7.2.2";
        sha256 = "0jmhl7jdrznbf9w9cpwh98apghhcnb9vadj94sjxfh288k21ckb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring conceit containers contravariant foldl
          free pipes pipes-bytestring pipes-concurrency pipes-parse
          pipes-safe pipes-text process semigroups text transformers
          transformers-compat void
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bifunctors bytestring containers directory doctest
          exceptions filepath free lens pipes pipes-attoparsec
          pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -104251,7 +106914,7 @@ self: {
        pname = "processing";
        version = "1.2.0.1";
        sha256 = "1axryd8453b2l4hbhqy5vkj29hqppsvk1sqxbawdhk3d3hs705pa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html containers directory filepath mainland-pretty
          multiset QuickCheck quickcheck-instances template-haskell text
          transformers
@@ -104270,7 +106933,7 @@ self: {
        pname = "processor-creative-kit";
        version = "0.1.0.1";
        sha256 = "1jshzych1vbb24bm219sdpxkb2amvv11fbhqwf7iy4l1prg248h7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bytestring containers deepseq mtl
        ];
        homepage = "https://github.com/takenobu-hs/processor-creative-kit";
@@ -104284,7 +106947,7 @@ self: {
        pname = "procrastinating-structure";
        version = "1.0.1";
        sha256 = "126mp2mfmy9xg1kichl19ga6j3w1s0qpk3hqh47x5x5120qh63l3";
-       buildDepends = [ base procrastinating-variable ];
+       libraryHaskellDepends = [ base procrastinating-variable ];
        description = "Pure structures that can be incrementally created in impure code";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104296,7 +106959,7 @@ self: {
        pname = "procrastinating-variable";
        version = "1.0.2";
        sha256 = "12px0nk7j74hyfzcvxacd9020gk3cd3ijqb7fjmmg8y33354jkc4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gcross/procrastinating-variable";
        description = "Haskell values that cannot be evaluated immediately";
        license = stdenv.lib.licenses.bsd3;
@@ -104309,7 +106972,7 @@ self: {
        pname = "procstat";
        version = "0.1.0.1";
        sha256 = "1md75jc32nfnvs7ygf1mna00gl0wmimp2lkdcs9r9v0iy4b1hr5m";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        jailbreak = true;
        homepage = "http://closure.ath.cx/procstat";
        description = "get information on processes in Linux";
@@ -104327,7 +106990,8 @@ self: {
        sha256 = "02iz323arx9zwclvspgaaqz81bp6jdnj89pjm08n2gamg39zsbdn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base bytestring HUnit process text ];
+       executableHaskellDepends = [
          base bytestring hspec HUnit process QuickCheck text
        ];
        homepage = "https://github.com/nh2/proctest";
@@ -104342,8 +107006,10 @@ self: {
        pname = "product-profunctors";
        version = "0.6.3";
        sha256 = "0mkir3anyccjzcqjybnmx4ijz2h0qnps48pc5giaszmfs9nv7p18";
-       buildDepends = [ base contravariant profunctors template-haskell ];
-       testDepends = [ base profunctors ];
+       libraryHaskellDepends = [
+         base contravariant profunctors template-haskell
+       ];
+       testHaskellDepends = [ base profunctors ];
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -104357,7 +107023,9 @@ self: {
        sha256 = "1cf1ysnfpng7ijgsbnly5878wg7cp907cqpvf4yq9sd6nym8hcng";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers filepath haskell98 parsec ];
+       executableHaskellDepends = [
+         base containers filepath haskell98 parsec
+       ];
        homepage = "http://antiope.com/downloads.html";
        description = "Convert GHC profiles into GraphViz's dot format";
        license = stdenv.lib.licenses.bsd3;
@@ -104374,7 +107042,7 @@ self: {
        sha256 = "104frg0czfk4rgjxyf0xz7100j3y9ndvf01jgv3yibaq98v2h64r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath haskell-src-exts semigroups uniplate zenc
        ];
        homepage = "https://gitorious.org/prof2pretty";
@@ -104392,7 +107060,7 @@ self: {
        sha256 = "17h690m78xsvbcxms2yxq7g9d1w5dx31q1m3a2m3i4gfwby1ndnf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring filepath text unordered-containers
          vector
        ];
@@ -104407,7 +107075,7 @@ self: {
        pname = "profunctor-extras";
        version = "4.0";
        sha256 = "10j458liqlyz5s9gkg95c6aq7ap5fa7d8pc7hygy71nn87pm2g4a";
-       buildDepends = [ base profunctors ];
+       libraryHaskellDepends = [ base profunctors ];
        homepage = "http://github.com/ekmett/profunctor-extras/";
        description = "This package has been absorbed into profunctors 4.0";
        license = stdenv.lib.licenses.bsd3;
@@ -104421,7 +107089,9 @@ self: {
        pname = "profunctors";
        version = "5.1.1";
        sha256 = "0lw2ipacpnp9yqmi8zsp01pzpn5hwj8af3y0f3079mddrmw48gw7";
-       buildDepends = [ base comonad distributive tagged transformers ];
+       libraryHaskellDepends = [
+         base comonad distributive tagged transformers
+       ];
        homepage = "http://github.com/ekmett/profunctors/";
        description = "Profunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -104433,7 +107103,7 @@ self: {
        pname = "progress";
        version = "1.0";
        sha256 = "0cac4v6k2nrpglnf3680y334kw4k0s6xfm86wrfyszl5sq2a7w94";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104447,7 +107117,8 @@ self: {
        sha256 = "09yfspxcdp4y5chim2qmylfmjp0kdg4qg2w54kg3hir8f7kih3ns";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base io-reactive ];
+       libraryHaskellDepends = [ base io-reactive ];
+       executableHaskellDepends = [ base ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104461,7 +107132,7 @@ self: {
        pname = "progression";
        version = "0.5.0.2";
        sha256 = "01s01v59hjy5i8dd9a1gxjpyw2qq3r81np7acn94wjh64c8rrmpa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers criterion directory filepath haskeline process
          txt-sushi
        ];
@@ -104482,7 +107153,7 @@ self: {
        sha256 = "1psbgl19x2wwh4rcd4nsayrc1bq2g27qywr1m9jgmshcz1cinpbh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers directory filepath ghc-prim
          process text
        ];
@@ -104499,8 +107170,8 @@ self: {
        pname = "proj4-hs-bindings";
        version = "0.1";
        sha256 = "0cwkjg1bm1swl103nsziyc71yqgvdq82ywgi2jnn7cj9lk4ihrah";
-       buildDepends = [ base ghc-prim ];
-       extraLibraries = [ proj ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104515,11 +107186,11 @@ self: {
        pname = "project-template";
        version = "0.2.0";
        sha256 = "0433a2cmximz2jbg0m97h80pvmb7vafjvw3qzjpsncavg38xgaxf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring conduit conduit-extra containers
          directory filepath mtl resourcet text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base64-bytestring bytestring conduit containers hspec
          QuickCheck resourcet text transformers
        ];
@@ -104533,10 +107204,10 @@ self: {
      mkDerivation {
        pname = "projection";
        version = "0.1";
-       revision = "1";
        sha256 = "0g9zrdp92w8ygrsmbw4600xaf8d17sm4pq68qd6z7hnf8zps22c1";
+       revision = "1";
        editedCabalFile = "805db4a9404200c6d8c00b7e96f95c9c71e3595b6601f75efed7237ad5bed30b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Projection function for arbitrarily nested binary product types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104549,7 +107220,7 @@ self: {
        pname = "prolog";
        version = "0.2.0.1";
        sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl parsec syb template-haskell th-lift
          transformers
        ];
@@ -104570,7 +107241,7 @@ self: {
        sha256 = "1w3wz0sn1qhw286g3arin30jvlldadw976xr7hp0afdvqicl3892";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs fgl graphviz mtl prolog prolog-graph-lib text
        ];
        jailbreak = true;
@@ -104586,7 +107257,7 @@ self: {
        pname = "prolog-graph-lib";
        version = "0.2.0.1";
        sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr";
-       buildDepends = [ base fgl graphviz mtl prolog text ];
+       libraryHaskellDepends = [ base fgl graphviz mtl prolog text ];
        homepage = "https://github.com/Erdwolf/prolog";
        description = "Generating images of resolution trees for Prolog queries";
        license = stdenv.lib.licenses.publicDomain;
@@ -104602,11 +107273,11 @@ self: {
        pname = "prometheus-client";
        version = "0.1.0.1";
        sha256 = "0bvp40rdlq8f6rh5v75pgqnmiwz85j960sfi22y7s0r5vykbgh5x";
-       buildDepends = [
+       libraryHaskellDepends = [
          atomic-primops base bytestring containers mtl stm time transformers
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          atomic-primops base bytestring containers doctest hspec mtl
          QuickCheck random-shuffle stm time transformers utf8-string
        ];
@@ -104621,8 +107292,8 @@ self: {
        pname = "prometheus-metrics-ghc";
        version = "0.1.0.1";
        sha256 = "15a7hli2fsjmgjnvhdsv1572nqj3i214b0r9bygdang4cjrjv10p";
-       buildDepends = [ base prometheus-client utf8-string ];
-       testDepends = [ base doctest prometheus-client ];
+       libraryHaskellDepends = [ base prometheus-client utf8-string ];
+       testHaskellDepends = [ base doctest prometheus-client ];
        homepage = "https://github.com/fimad/prometheus-haskell";
        description = "Metrics exposing GHC runtime information for use with prometheus-client";
        license = stdenv.lib.licenses.asl20;
@@ -104634,7 +107305,7 @@ self: {
        pname = "promise";
        version = "0.1.0.0";
        sha256 = "1hzsprmw15apc654n77ima1pgs9nj6287d412jb5z37154bd0nfg";
-       buildDepends = [ async base ];
+       libraryHaskellDepends = [ async base ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/promise";
        description = "A monadic interface for async";
@@ -104647,7 +107318,7 @@ self: {
        pname = "promises";
        version = "0.2";
        sha256 = "0fgczzjf93fvrfh9sgy49072c6qw27626qwla0qwl0wvfhaal7ah";
-       buildDepends = [ base primitive ];
+       libraryHaskellDepends = [ base primitive ];
        homepage = "http://github.com/ekmett/promises/";
        description = "Lazy demand-driven promises";
        license = stdenv.lib.licenses.bsd3;
@@ -104659,7 +107330,9 @@ self: {
        pname = "prompt";
        version = "0.1.1.0";
        sha256 = "13ayvs1irsa1hqy6y6ca99dr20vwvy9g10zjrqshvj48i5ra2j4g";
-       buildDepends = [ base mtl transformers transformers-compat ];
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
        homepage = "https://github.com/mstksg/prompt";
        description = "Monad (and transformer) for deferred-effect pure prompt-response queries";
        license = stdenv.lib.licenses.mit;
@@ -104673,7 +107346,7 @@ self: {
        pname = "propane";
        version = "0.1";
        sha256 = "1kzlwsxka72h3a612xi2s741hdx88qsib07kcralv2k76krqxlj4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base colour containers directory filepath repa repa-devil spawn
        ];
        description = "Functional synthesis of images and animations";
@@ -104693,7 +107366,12 @@ self: {
        sha256 = "12pfrv6n61bsg4cyylfr0kw82x36mwvnyvzdkr2lrka79i5l9a5w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers directory exceptions
+         filepath hslogger IfElse MissingH mtl network process QuickCheck
+         time transformers unix unix-compat
+       ];
+       executableHaskellDepends = [
          ansi-terminal async base bytestring containers directory exceptions
          filepath hslogger IfElse MissingH mtl network process QuickCheck
          time transformers unix unix-compat
@@ -104709,7 +107387,7 @@ self: {
        pname = "properties";
        version = "0.0.2";
        sha256 = "04a35zxgps9rn6y86x3jf6gma6kjl8izmnyl45hz64cl9yb5dwwi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "check quickCheck properties in real time";
        license = stdenv.lib.licenses.bsd3;
@@ -104725,7 +107403,7 @@ self: {
        pname = "property-list";
        version = "0.1.0.5";
        sha256 = "0wv97v6b7yfkwaz6mpw3l12q34k620jb1clz0j9a1kvysm1r005k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cereal containers free oneOfN
          recursion-schemes syb template-haskell text time time-locale-compat
          transformers vector xml
@@ -104733,7 +107411,6 @@ self: {
        homepage = "https://github.com/mokus0/property-list";
        description = "Apple property list parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proplang" = callPackage
@@ -104742,7 +107419,7 @@ self: {
        pname = "proplang";
        version = "0.1";
        sha256 = "1vm01qvd0jgcdpqx3p2h6gafhxi5x7bs8r5a6xsk4zz6cc1cbw4m";
-       buildDepends = [ base glade glib gtk ];
+       libraryHaskellDepends = [ base glade glib gtk ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/proplang/";
        description = "A library for functional GUI development";
        license = stdenv.lib.licenses.bsd3;
@@ -104755,8 +107432,8 @@ self: {
        pname = "props";
        version = "0.1.2";
        sha256 = "10bkbqhl15xgc9iglx0f9h218a2hcfg0wali2c6a17wvlpfcwjbx";
-       buildDepends = [ base ];
-       testDepends = [ base doctest QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "http://github.com/deviant-logic/props";
        description = "Reusable quickcheck properties";
        license = stdenv.lib.licenses.bsd3;
@@ -104771,7 +107448,7 @@ self: {
        pname = "prosper";
        version = "0.1.1";
        sha256 = "006h3i316s85f3d6qmwm9kajbxil1xcnqp11jfvv5ypnx2gdyhgb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cereal containers HsOpenSSL http-streams
          io-streams mtl text transformers vector
        ];
@@ -104786,9 +107463,9 @@ self: {
        pname = "proteaaudio";
        version = "0.6.2";
        sha256 = "10ayg0pr7vjffk8l114gwf098kpmamirk6cknw1xhpnr7hwr1mln";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ alsaLib ];
+       libraryToolDepends = [ c2hs ];
        description = "A wrapper for the proteaaudio library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) alsaLib;};
@@ -104802,11 +107479,11 @@ self: {
        pname = "protobuf";
        version = "0.2.1.0";
        sha256 = "0i8hjrj6jycqmq7i1wl0kr9s17g4qfyc0gfwcbhbv70yxwf499di";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal data-binary-ieee754 deepseq mtl text
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal containers hex HUnit mtl QuickCheck tagged
          tasty tasty-hunit tasty-quickcheck text unordered-containers
        ];
@@ -104826,14 +107503,15 @@ self: {
        sha256 = "0k3cljm4r3jxlklkmfhv0362hg8095f1cq73mgdqkbqa5gwrk86r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cplusplus-th template-haskell text
        ];
-       testDepends = [
+       librarySystemDepends = [ protobuf ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring cereal cplusplus-th criterion hprotoc-fork protobuf
          protocol-buffers-fork QuickCheck text utf8-string
        ];
-       extraLibraries = [ protobuf ];
        jailbreak = true;
        homepage = "https://github.com/nicta/protobuf-native";
        description = "Protocol Buffers via C++";
@@ -104849,14 +107527,13 @@ self: {
        pname = "protocol-buffers";
        version = "2.1.4";
        sha256 = "0sn92mf0dl7w6cg25rhm492sl58pssshjyipadis4w4ww0kyp4md";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
        ];
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
@@ -104865,11 +107542,12 @@ self: {
        pname = "protocol-buffers-descriptor";
        version = "2.1.4";
        sha256 = "1m07l890465ks53acmk9g3fzbm2h5l2pdfhp16hcmvvzxlaz2zvy";
-       buildDepends = [ base bytestring containers protocol-buffers ];
+       libraryHaskellDepends = [
+         base bytestring containers protocol-buffers
+       ];
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -104880,7 +107558,7 @@ self: {
        pname = "protocol-buffers-descriptor-fork";
        version = "2.0.16";
        sha256 = "1wn6yqs70n26j6z44yfmz4j4rwj2h1zfpysn56wzaq7bwsdb0bqb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers protocol-buffers-fork
        ];
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
@@ -104897,7 +107575,7 @@ self: {
        pname = "protocol-buffers-fork";
        version = "2.0.16";
        sha256 = "061kc43dg3xdv81wmj4yjm1s6amrd8ql59nj7vff4vdb87v9nriz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl syb
          utf8-string
        ];
@@ -104915,8 +107593,8 @@ self: {
        pname = "proton-haskell";
        version = "0.7";
        sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi";
-       buildDepends = [ base containers directory filepath ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers directory filepath ];
+       testHaskellDepends = [
          base containers directory filepath HUnit test-framework
          test-framework-hunit
        ];
@@ -104931,7 +107609,7 @@ self: {
        pname = "prototype";
        version = "0.5.3";
        sha256 = "1kzinhdy622gzg3mzfln15vgi890i2l3lkrgrw0n0yb08r2n53i7";
-       buildDepends = [ base monads-tf ];
+       libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104947,7 +107625,7 @@ self: {
        sha256 = "127ky7rj9d2bqaddcg99azm18m65ksxr26amq0r5prhym8kmc3jx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring case-insensitive http-types
          optparse-applicative parsec parsers process safe text time
          unordered-containers wai warp
@@ -104965,7 +107643,7 @@ self: {
        pname = "proxy-kindness";
        version = "0.1";
        sha256 = "0wpzj6hnlxvgd7lfd2921mrk97aw7ljf77jry3my97zdapkxz8i7";
-       buildDepends = [ base tagged ];
+       libraryHaskellDepends = [ base tagged ];
        jailbreak = true;
        homepage = "https://github.com/jberryman/proxy-kindness";
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
@@ -104982,18 +107660,17 @@ self: {
        pname = "pseudo-boolean";
        version = "0.1.2.0";
        sha256 = "13bgv7kkglajrvng7vcy7qv9x8xlm0nrv8in8zh5w5m6xl7i5wkz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable parsec
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
          tasty-th temporary
        ];
        homepage = "https://github.com/msakai/pseudo-boolean";
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pseudo-trie" = callPackage
@@ -105002,7 +107679,7 @@ self: {
        pname = "pseudo-trie";
        version = "0.0.4.3";
        sha256 = "020jkgr6h1f4z14xbrl6zsqjqflkps03lh5102742bfsd58d9hvb";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105013,7 +107690,7 @@ self: {
        pname = "pseudomacros";
        version = "0.0.2";
        sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9";
-       buildDepends = [ base template-haskell time ];
+       libraryHaskellDepends = [ base template-haskell time ];
        description = "cpp-style built-in macros using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105027,8 +107704,8 @@ self: {
        pname = "psqueues";
        version = "0.2.0.2";
        sha256 = "1mv86li4acx7jchlbh1nfyqyy9wqf7nifzmlph06wd1kvcs0cj73";
-       buildDepends = [ base deepseq ghc-prim hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
          array base deepseq ghc-prim hashable HUnit QuickCheck tagged
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -105047,7 +107724,7 @@ self: {
        sha256 = "0ps4i5q4kzkla6gzr8amf2bql2y5g0gb4dbjf9w0q58yzzvpp2c8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs ConfigFile containers groom hedis hslogger
          mtl network pipes pipes-bytestring safe system-filepath text time
          transformers
@@ -105064,8 +107741,8 @@ self: {
        pname = "publicsuffix";
        version = "0.20150804";
        sha256 = "06b311vdwihqhdwf2zr0akndgyaxycli7lymzzyfbn0rhhx1g2kn";
-       buildDepends = [ base filepath template-haskell ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base filepath template-haskell ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -105079,10 +107756,10 @@ self: {
        pname = "publicsuffixlist";
        version = "0.1";
        sha256 = "0mbrmhgyjp8jms3fd3nq4knc4j97sw8ijrmnlfjs7qj8jw4vwzxk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers data-default text utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal containers data-default HUnit idna text
          utf8-string
        ];
@@ -105099,11 +107776,11 @@ self: {
        pname = "publicsuffixlistcreate";
        version = "0.0.2";
        sha256 = "0v4arfixnfzpsi3hvik2s2lqqp61324bd98wc8ympqxlmldpbri3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers data-default idna
          publicsuffixlist text
        ];
-       testDepends = [ base cereal HUnit publicsuffixlist ];
+       testHaskellDepends = [ base cereal HUnit publicsuffixlist ];
        jailbreak = true;
        homepage = "https://github.com/litherum/publicsuffixlist";
        description = "Create the publicsuffixlist package";
@@ -105125,14 +107802,17 @@ self: {
        sha256 = "0clcf5gsw34gpqycw652wq8ndmlzz48mf2gla0g7j815j21hrhv8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson async base base64-bytestring bytestring Cabal cipher-aes
-         conduit conduit-extra crypto-api crypto-cipher-types data-default
-         http-client http-conduit http-types HUnit lifted-base mtl
-         QuickCheck SHA smallcheck tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text time transformers uuid vector
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring cipher-aes conduit
+         conduit-extra crypto-api crypto-cipher-types data-default
+         http-client http-conduit http-types lifted-base mtl SHA text time
+         transformers uuid vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson async base bytestring Cabal HUnit QuickCheck smallcheck tasty
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       testHaskellDepends = [
          base Cabal HUnit QuickCheck smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
@@ -105153,9 +107833,10 @@ self: {
        sha256 = "09xaycbzq50q1299r4s84nb8wjhqalimvipv8z135fifvgdsjpm8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base fastcgi feed HTTP json mime network random utf8-string xml
+       libraryHaskellDepends = [
+         base feed HTTP json mime network random utf8-string xml
        ];
+       executableHaskellDepends = [ fastcgi ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/pubsub/";
        description = "A library for Google/SixApart pubsub hub interaction";
@@ -105175,11 +107856,15 @@ self: {
        sha256 = "0pqqcs3plrhq6474j29lnwvc6fhr1wskb0ph8x64gzv9ly52dc9i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty base bytestring console-program containers
-         directory MissingH old-locale random-fu safe text time vector
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring containers directory MissingH
+         random-fu safe text time vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring console-program directory old-locale text time
+         vector
+       ];
+       testHaskellDepends = [
          aeson base bytestring QuickCheck test-framework
          test-framework-quickcheck2 text time vector
        ];
@@ -105198,10 +107883,10 @@ self: {
        pname = "pugixml";
        version = "0.3.2";
        sha256 = "0pvvx7cd16a7cjp991l487p0vgpkdyv7ic64brz92bkjxgrpw94i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class template-haskell
        ];
-       testDepends = [ base bytestring tasty tasty-hunit ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        homepage = "https://github.com/philopon/pugixml-hs";
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
@@ -105217,7 +107902,11 @@ self: {
        sha256 = "0c5h829zh8clggf53byng4gh5g0zxk3763w1nk0ihf2laak238c6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers HsSyck mtl old-time pretty random stm
+         utf8-string
+       ];
+       executableHaskellDepends = [
          base bytestring containers HsSyck mtl old-time pretty random stm
          utf8-string
        ];
@@ -105233,7 +107922,7 @@ self: {
        pname = "pugs-HsSyck";
        version = "0.41";
        sha256 = "108dfhd83yzmlhbgff6j0a40r6vx9aq9dcdd8swk4yib9gbvsrp1";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Fast, lightweight YAML loader and dumper";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105248,7 +107937,7 @@ self: {
        pname = "pugs-compat";
        version = "0.0.6.20130611.0";
        sha256 = "15pgg4z6clqgazi70jac280ib0d4rhz1hdqbg5i4kffziv2q6jsm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory mtl network process
          random regex-base regex-pcre-builtin stm stringtable-atom syb time
          unix utf8-string
@@ -105264,7 +107953,7 @@ self: {
        pname = "pugs-hsregex";
        version = "1.0";
        sha256 = "1px8qvz7afws2w8scplxs4zm628anvh5ssbf0ba9hajh686h133i";
-       buildDepends = [ array base haskell98 ];
+       libraryHaskellDepends = [ array base haskell98 ];
        homepage = "http://repetae.net/john/computer/haskell/hsregex/";
        description = "Haskell PCRE binding";
        license = stdenv.lib.licenses.bsd3;
@@ -105277,8 +107966,8 @@ self: {
        pname = "pulse-simple";
        version = "0.1.14";
        sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ libpulseaudio ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) libpulseaudio;};
@@ -105291,10 +107980,10 @@ self: {
        pname = "punkt";
        version = "0.1.1";
        sha256 = "0hhrpkbgm56zs1ynd0ba37fv1vg2bxr79kfb2myjfxsnc6gr4h9b";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base mtl regex-tdfa regex-tdfa-text text unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base mtl regex-tdfa tasty tasty-hunit tasty-quickcheck text
        ];
        homepage = "https://github.com/bryant/punkt";
@@ -105311,8 +108000,8 @@ self: {
        pname = "punycode";
        version = "2.0";
        sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr";
-       buildDepends = [ base bytestring cereal mtl text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cereal mtl text ];
+       testHaskellDepends = [
          base bytestring cereal encoding HUnit mtl QuickCheck text
        ];
        homepage = "https://github.com/litherum/punycode";
@@ -105330,7 +108019,7 @@ self: {
        sha256 = "064swfpxk7jhb81bi0v9l0r1hn0z2cafnzx7ijdr33xhikyc92rb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers Diff hsfacter hslogger language-puppet
          mtl text
        ];
@@ -105348,10 +108037,10 @@ self: {
        pname = "pure-cdb";
        version = "0.1.1";
        sha256 = "1yjh7h02hkhx2vgvn7qfmfd3bp12ibpkf4znybsd2bfh0i1pzn0n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory mtl vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers mtl test-simple Unixutils vector
        ];
        homepage = "https://github.com/bosu/pure-cdb";
@@ -105365,7 +108054,7 @@ self: {
        pname = "pure-fft";
        version = "0.2.0";
        sha256 = "1zzravfgxbx07c38pf0p73a9nzjk2pbq3hzfw8v9zkqj95b3l94i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Fast Fourier Transform";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105376,7 +108065,7 @@ self: {
        pname = "pure-io";
        version = "0.2.1";
        sha256 = "0pzvkd8jxw859s187n972yaq5wmwi00cxwhivgffr7z29hr0zvx9";
-       buildDepends = [ base containers mtl safe ];
+       libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105387,7 +108076,7 @@ self: {
        pname = "pure-priority-queue";
        version = "0.14";
        sha256 = "125vnkjx6n7pgflk9iqg7b6daw55a1rdfi9pfgp39ikfcx9vhb3p";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "A pure priority queue";
        license = stdenv.lib.licenses.bsd3;
@@ -105403,7 +108092,7 @@ self: {
        sha256 = "17x2drpmdppzxp3nnxq0vajxrzdnhpapk9rz9qcqaxbg934c7h3d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers pure-priority-queue QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -105421,8 +108110,10 @@ self: {
        pname = "pure-zlib";
        version = "0.3";
        sha256 = "1in93rx2y3zaahzpblwybskjrbwc0zrzh792ibi64jxvkrxjkyxn";
-       buildDepends = [ base bytestring containers fingertree monadLib ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers fingertree monadLib
+       ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -105439,7 +108130,9 @@ self: {
        pname = "pureMD5";
        version = "2.1.2.1";
        sha256 = "1zsn949qk95bwx1fbyv84q0lhb4k18bgixl7nivfzsnmhr31fs37";
-       buildDepends = [ base binary bytestring cereal crypto-api tagged ];
+       libraryHaskellDepends = [
+         base binary bytestring cereal crypto-api tagged
+       ];
        description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105448,8 +108141,8 @@ self: {
     ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
      , bower-json, boxes, bytestring, containers, directory, dlist
      , filepath, Glob, haskeline, HUnit, language-javascript, mtl
-     , nodejs, optparse-applicative, parsec, pattern-arrows, process
-     , safe, semigroups, split, syb, text, time, transformers
+     , optparse-applicative, parsec, pattern-arrows, process, safe
+     , semigroups, split, syb, text, time, transformers
      , transformers-compat, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
@@ -105458,25 +108151,29 @@ self: {
        sha256 = "0drx0n1ac0sjnma7c15hsld1n6rwwl7r8fzcdibk73k5pfyz9a6k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-better-errors ansi-wl-pprint base bower-json boxes
-         bytestring containers directory dlist filepath Glob haskeline
-         language-javascript mtl optparse-applicative parsec pattern-arrows
-         process safe semigroups split syb text time transformers
-         transformers-compat unordered-containers utf8-string vector
+       libraryHaskellDepends = [
+         aeson aeson-better-errors base bower-json boxes bytestring
+         containers directory dlist filepath Glob language-javascript mtl
+         parsec pattern-arrows process safe semigroups split syb text time
+         transformers transformers-compat unordered-containers utf8-string
+         vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring containers directory filepath
+         Glob haskeline mtl optparse-applicative parsec process split time
+         transformers transformers-compat
+       ];
+       testHaskellDepends = [
          base containers directory filepath Glob haskeline HUnit mtl
          optparse-applicative parsec process time transformers
          transformers-compat
        ];
-       buildTools = [ nodejs ];
        jailbreak = true;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) nodejs;};
+     }) {};
 
   "purescript-bundle-fast" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
@@ -105488,7 +108185,7 @@ self: {
        sha256 = "0s9db4nb5ppr3yznay7jlgydq68hcdn525cwnxkj41h8fv9sflfw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath optparse-applicative text vector
        ];
        homepage = "https://github.com/bitc/purescript-bundle-fast";
@@ -105508,7 +108205,7 @@ self: {
        pname = "push-notify";
        version = "0.1.0.1";
        sha256 = "1ca9cs55yj1960cx7vha2w33nvqj89rhkdji555aaac3z302jgjs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec-conduit base base16-bytestring bytestring
          cereal certificate conduit connection containers convertible
          cprng-aes data-default http-client http-conduit http-types
@@ -105531,7 +108228,7 @@ self: {
        pname = "push-notify-ccs";
        version = "0.1.0.1";
        sha256 = "1fgpzcbkcsb03lysml28a8w3c9l3nx4mirrn287g7y1kb4kx3bw0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base bytestring cprng-aes crypto-random
          data-default hslogger mtl network pontarius-xmpp push-notify retry
          stm text tls tls-extra unordered-containers xml-types
@@ -105551,7 +108248,7 @@ self: {
        pname = "push-notify-general";
        version = "0.1.0.1";
        sha256 = "0vyw3733xm2s3nxybav8an68mlagk8v3bb43qlz71hkjgjddvpdh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default hashable http-client
          http-conduit http-types push-notify push-notify-ccs text
          unordered-containers xml-conduit yesod
@@ -105570,10 +108267,10 @@ self: {
        pname = "pusher-haskell";
        version = "0.1.0.0";
        sha256 = "0ymj27a3kmaddydd5zshj108fmzhlxasn9i4igzjaj308f1ygki6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HTTP MissingH mtl SHA time
        ];
-       testDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec ];
        jailbreak = true;
        homepage = "http://www.github.com/sidraval/pusher-haskell";
        description = "A Pusher.com client written in Haskell";
@@ -105593,7 +108290,7 @@ self: {
        sha256 = "0cn350p0v6wb6c1n589c2l460c8pac41c645fja5xqxyyiiyni4d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring containers deepseq hslogger io-storage lens
          old-locale optparse-applicative parallel-io pointless-fun
          regex-posix shelly system-fileio system-filepath text text-format
@@ -105613,7 +108310,7 @@ self: {
        pname = "putlenses";
        version = "0.1.3";
        sha256 = "153hxffd1rg3m73kss0j3s7102lj6p84c95gvzyl0gmjpljfxffp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim lens mtl QuickCheck random safe split
          template-haskell transformers
        ];
@@ -105635,12 +108332,16 @@ self: {
        sha256 = "0jbc24a959klaf3niri5ilq0jdqpxdg4fg79bjfdpg51na4xr3hi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers diagrams-lib diagrams-svg filepath hashable
          mtl optparse-applicative parsec SVGFonts text unordered-containers
          vector-space yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base diagrams-lib diagrams-svg filepath optparse-applicative
+         yaml
+       ];
+       testHaskellDepends = [
          base blaze-svg bytestring containers deepseq diagrams-lib
          diagrams-svg tasty tasty-hunit text yaml
        ];
@@ -105659,7 +108360,7 @@ self: {
        sha256 = "0jv0gai689ba5f4c6kdfdlfx5dz000zzk0gdwlz5d9n9pxxfgzxf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base diagrams-lib diagrams-svg filepath optparse-applicative
          puzzle-draw yaml
        ];
@@ -105679,11 +108380,11 @@ self: {
        sha256 = "18hlsh3ndlybkiblcfqzjm1pa4myc01yzr9hx7p48yp86q519hvr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base Codec-Image-DevIL containers haskell98 mtl network stm
          X11
        ];
-       extraLibraries = [ libdevil ];
+       executableSystemDepends = [ libdevil ];
        homepage = "http://code.haskell.org/pvd";
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
@@ -105700,8 +108401,10 @@ self: {
        sha256 = "1cwb214bifiql2d4jacjl93swhy8yigzj72wbhv213c593bxg8jr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring cmdargs pwstore-fast text ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring cmdargs pwstore-fast text
+       ];
+       testHaskellDepends = [
          base bytestring HUnit process pwstore-fast test-framework
          test-framework-hunit
        ];
@@ -105718,7 +108421,7 @@ self: {
        pname = "pwstore-fast";
        version = "2.4.4";
        sha256 = "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring binary byteable bytestring cryptohash random
        ];
        homepage = "https://github.com/PeterScott/pwstore";
@@ -105734,7 +108437,7 @@ self: {
        pname = "pwstore-purehaskell";
        version = "2.1.4";
        sha256 = "1g7lmlgw8iscbbs96r3a534cf46fyks49b1f9y7hv25ny4wp1p9c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring random SHA
        ];
        homepage = "https://github.com/PeterScott/pwstore";
@@ -105750,7 +108453,7 @@ self: {
        sha256 = "1q45l1grcja0mf1g90yxsdlr49gqrx27ycr6vln4hsqb5c0iqcfw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec ];
+       executableHaskellDepends = [ base containers mtl parsec ];
        homepage = "http://community.moertel.com/ss/space/PXSL";
        description = "Parsimonious XML Shorthand Language--to-XML compiler";
        license = "GPL";
@@ -105764,10 +108467,10 @@ self: {
        pname = "pyffi";
        version = "0.4.0.2";
        sha256 = "0cpzl0d0hsdlm1786s75xsq3c93mm1sp7alr6xhihmnrsj71d58h";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers pureMD5 template-haskell
        ];
-       pkgconfigDepends = [ python ];
+       libraryPkgconfigDepends = [ python ];
        jailbreak = true;
        homepage = "http://github.com/Russell91/json-python";
        description = "Call python inline from haskell";
@@ -105782,10 +108485,10 @@ self: {
        pname = "pyfi";
        version = "0.4.0.4";
        sha256 = "0xq5nhc11dkf2yvzcd129n0r7vpias091lzkll4f4cjsmljbxigw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers pureMD5 template-haskell
        ];
-       pkgconfigDepends = [ python ];
+       libraryPkgconfigDepends = [ python ];
        jailbreak = true;
        homepage = "http://github.com/Russell91/pyfi";
        description = "Call python inline from haskell";
@@ -105802,9 +108505,10 @@ self: {
        sha256 = "0p7pmwqs9jfv6464106j0k22x6lij5rc5v74aqbfclx7iwp6lh75";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cereal cmdargs containers mtl
+       libraryHaskellDepends = [
+         attoparsec base bytestring cereal containers mtl
        ];
+       executableHaskellDepends = [ base bytestring cmdargs ];
        jailbreak = true;
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
@@ -105817,7 +108521,9 @@ self: {
        pname = "qc-oi-testgenerator";
        version = "1.2.0.3";
        sha256 = "13rga5haz26qvx3hznbl6ik55s8g7qi3nj7a6vhyx46vjhzwnsvg";
-       buildDepends = [ base fclabels QuickCheck template-haskell ];
+       libraryHaskellDepends = [
+         base fclabels QuickCheck template-haskell
+       ];
        jailbreak = true;
        homepage = "http://www.iai.uni-bonn.de/~jv/GV14.html";
        description = "Compile time generation of operation invariance tests for QuickCheck";
@@ -105830,8 +108536,8 @@ self: {
        pname = "qd";
        version = "1.0.2.1";
        sha256 = "0dhvdrpcbc6qiqna2kiaa0zbz7cgq7ziy2my6k85cbgv6k77p918";
-       buildDepends = [ base floatshow ];
-       extraLibraries = [ qd ];
+       libraryHaskellDepends = [ base floatshow ];
+       librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105843,7 +108549,7 @@ self: {
        pname = "qd-vec";
        version = "1.1";
        sha256 = "0lj5kg0sjkck89phvi239xb2k7hxmxg9dh7yg2df2iaj4c2m2ync";
-       buildDepends = [ base qd Vec ];
+       libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105855,8 +108561,8 @@ self: {
        pname = "qhull-simple";
        version = "0.1";
        sha256 = "0g0abqc5z9nysm21c77kylkka1bvyn16ycinws1lcrjy53cb82sw";
-       buildDepends = [ base vector ];
-       extraLibraries = [ qhull ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ qhull ];
        homepage = "http://nonempty.org/software/haskell-qhull-simple";
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
@@ -105869,7 +108575,7 @@ self: {
        pname = "qrcode";
        version = "0.1.2";
        sha256 = "1wfnxlz6rqjcgnkaqq0wdn75jsh3b9hagb84c1ljnwqaw98n3a9d";
-       buildDepends = [ array base containers mtl vector ];
+       libraryHaskellDepends = [ array base containers mtl vector ];
        description = "QR Code library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105883,8 +108589,10 @@ self: {
        pname = "quadratic-irrational";
        version = "0.0.5";
        sha256 = "1z9a1q8px4sx7fq9i1lwfx98kz0nv8zhkz5vsfn31krvd4xvkndz";
-       buildDepends = [ arithmoi base containers mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         arithmoi base containers mtl transformers
+       ];
+       testHaskellDepends = [
          base directory doctest filepath mtl numbers QuickCheck tasty
          tasty-quickcheck
        ];
@@ -105903,7 +108611,7 @@ self: {
        pname = "quandl-api";
        version = "0.2.1.0";
        sha256 = "01mjwg7myal3hc98s7v582ycabv7qx2j6lcsyvhxbmhzs1wl8sqf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring http-conduit http-types syb
          text time time-locale-compat unordered-containers
        ];
@@ -105922,10 +108630,11 @@ self: {
        sha256 = "0s9wmkngz31wrllffk3i8y66f60liajwhapih7mnriyfvqqsb6ra";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mersenne-random-pure64 mtl random random-fu
          random-source rvar transformers vector
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/boundedvariation/quantfin";
        description = "Quant finance library in pure Haskell";
@@ -105940,8 +108649,8 @@ self: {
        pname = "quantities";
        version = "0.3.0";
        sha256 = "1c9ll27qwmzz8rfy7jlknzg56r0z2hij9aha3vwylv6iaynl4fr9";
-       buildDepends = [ base containers mtl parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl parsec ];
+       testHaskellDepends = [
          base containers doctest Glob hlint hspec mtl parsec process
          regex-compat
        ];
@@ -105957,7 +108666,7 @@ self: {
        pname = "quantum-arrow";
        version = "0.0.5";
        sha256 = "19z5b0jwnz20g0203xd78cv8rgm92diyxard4mbj6dyrj2kkfgww";
-       buildDepends = [ base MonadRandom mtl QuickCheck random ];
+       libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
        jailbreak = true;
        homepage = "http://github.com/luqui/quantum-arrow";
        description = "An embedding of quantum computation as a Haskell arrow";
@@ -105975,8 +108684,10 @@ self: {
        sha256 = "0cpvik35qv587k2qsd2rh7awlwll1gciv0nr7wjr79bn0q9df0cq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bytestring directory mtl snappy ];
-       buildTools = [ alex happy ];
+       executableHaskellDepends = [
+         array base bytestring directory mtl snappy
+       ];
+       executableToolDepends = [ alex happy ];
        homepage = "https://github.com/jstepien/qudb";
        description = "Quite Useless DB";
        license = stdenv.lib.licenses.gpl3;
@@ -105994,11 +108705,12 @@ self: {
        sha256 = "0zw15qym8r00m7kir9h9cys1rmszdqihfcvy6dw52f1pb6cp5vsx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cmdargs cond containers directory iproute
          MissingH network safe scotty text transformers wai wai-extra
          wai-middleware-static warp
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
@@ -106013,8 +108725,8 @@ self: {
        pname = "querystring-pickle";
        version = "0.2.0";
        sha256 = "18by7671q3sp38cii7j8b0jvdbbix4wyaa3wan77s0mfkdxzicrf";
-       buildDepends = [ base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -106031,7 +108743,10 @@ self: {
        sha256 = "05q64mslkbg017fpjx7ma2al6iz5zjrkyzipm8p86n8zcx3l1aw3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base readline terminal-size ];
+       libraryHaskellDepends = [
+         ansi-terminal base readline terminal-size
+       ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/yamadapc/haskell-questioner.git";
        description = "A package for prompting values from the command-line";
        license = stdenv.lib.licenses.mit;
@@ -106043,7 +108758,7 @@ self: {
        pname = "queue";
        version = "0.1.2";
        sha256 = "0fx2svkj2sy2wd056lha9h20hy2z6gjspzl11jmv7i3rdwwfr6f7";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~mokus/queue";
        description = "Abstraction typeclasses for queue-like things";
        license = stdenv.lib.licenses.bsd3;
@@ -106055,7 +108770,7 @@ self: {
        pname = "queuelike";
        version = "1.0.9";
        sha256 = "0nvs9ln55wrczpn948i4z110rbfp0rv2wv8iz94lbyxhilhyjf1z";
-       buildDepends = [ array base containers mtl stateful-mtl ];
+       libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106067,7 +108782,7 @@ self: {
        pname = "quick-generator";
        version = "0.3";
        sha256 = "1bccyvm300bkm3n98ayjc3syfcakjnf26bs2mdqdjimdfw2f0g6n";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Generator random test data for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106078,8 +108793,8 @@ self: {
        pname = "quickcheck-assertions";
        version = "0.2.0";
        sha256 = "0h7pa84hzy3bhv1acf1rvvw3lza0m8shd8a0vykzpx8lnkxbl3v0";
-       buildDepends = [ base ieee754 QuickCheck ];
-       testDepends = [ base hspec ieee754 QuickCheck ];
+       libraryHaskellDepends = [ base ieee754 QuickCheck ];
+       testHaskellDepends = [ base hspec ieee754 QuickCheck ];
        homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
        description = "HUnit like assertions for QuickCheck";
        license = stdenv.lib.licenses.gpl3;
@@ -106093,7 +108808,7 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.11";
        sha256 = "041s6963czs1pz0fc9cx17lgd6p83czqy2nxji7bhxqxwl2j15h2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers hashable old-time QuickCheck text
          time unordered-containers
        ];
@@ -106108,7 +108823,7 @@ self: {
        pname = "quickcheck-io";
        version = "0.1.1";
        sha256 = "16q3sqvxnaqmbb1zbda8f61mdlmmzxhrznqxab113lmg380nwfm2";
-       buildDepends = [ base HUnit QuickCheck ];
+       libraryHaskellDepends = [ base HUnit QuickCheck ];
        description = "Use HUnit assertions as QuickCheck properties";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -106121,7 +108836,7 @@ self: {
        pname = "quickcheck-poly";
        version = "0.2.0.1";
        sha256 = "0imigjsb6jy1k9xipi5b4b300cpv2l7hhd2iiqpn80dp10v7y5na";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 hint MonadCatchIO-mtl QuickCheck regex-compat
          regex-tdfa
        ];
@@ -106136,7 +108851,7 @@ self: {
        pname = "quickcheck-properties";
        version = "0.1";
        sha256 = "0hr61w1wpah1p4h87iz17aby53ysa8waqsl0als8b69in0zyv29w";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "QuickCheck properties for standard type classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106147,7 +108862,7 @@ self: {
        pname = "quickcheck-property-comb";
        version = "0.1.0.2";
        sha256 = "0wqz2amhwf1djbwwdin142mzp94mxbzb12khznijissjdz38knp5";
-       buildDepends = [ base mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl QuickCheck ];
        jailbreak = true;
        homepage = "http://www.github.com/jfeltz/quickcheck-property-comb";
        description = "Combinators for Quickcheck Property construction and diagnostics";
@@ -106162,8 +108877,10 @@ self: {
        pname = "quickcheck-property-monad";
        version = "0.2.3";
        sha256 = "12vg14xwhhsqwygrs5lylsg514am5sslqc15nbl8mwzzxix1w8xb";
-       buildDepends = [ base either QuickCheck transformers ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       libraryHaskellDepends = [ base either QuickCheck transformers ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        jailbreak = true;
        homepage = "http://github.com/bennofs/quickcheck-property-monad/";
        description = "quickcheck-property-monad";
@@ -106178,7 +108895,7 @@ self: {
        pname = "quickcheck-regex";
        version = "0.0.3";
        sha256 = "00h08l3qabj140zzcpj87hy9zb6cw1xj5w6xv6sq2m8yc3pdwi8n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers QuickCheck regex-genex regex-tdfa
        ];
        homepage = "http://github.com/audreyt/quickcheck-regex/";
@@ -106195,7 +108912,7 @@ self: {
        pname = "quickcheck-relaxng";
        version = "0.0.2";
        sha256 = "1wrndgvza9610ai02gkwab30hp8ngdknw8n2lx0mg6qajsiiy949";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hxt hxt-relaxng QuickCheck quickcheck-regex
        ];
        homepage = "http://github.com/audreyt/quickcheck-relaxng/";
@@ -106210,8 +108927,8 @@ self: {
        pname = "quickcheck-rematch";
        version = "0.1.0.0";
        sha256 = "0pmw9441l36sprw9ngq6gn2yi4v427zd5n22s9zicfyiwi4qf5ba";
-       buildDepends = [ base QuickCheck rematch ];
-       testDepends = [ base hspec HUnit QuickCheck rematch ];
+       libraryHaskellDepends = [ base QuickCheck rematch ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
        jailbreak = true;
        homepage = "http://github.com/tcrayford/rematch";
        description = "QuickCheck support for rematch";
@@ -106227,7 +108944,7 @@ self: {
        sha256 = "157v4qcyk5c6hnmhmy5rsrfsj46m343nn2bvrqyb6r92wh70is5g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory process QuickCheck ];
+       executableHaskellDepends = [ base directory process QuickCheck ];
        homepage = "http://www.cs.chalmers.se/~rjmh/QuickCheck/";
        description = "Automated test tool for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -106239,7 +108956,7 @@ self: {
        pname = "quickcheck-simple";
        version = "0.1.0.0";
        sha256 = "0vnxyb3qz8i1rpmkga6151cld1jr3kiyv3xrhg814mhf1fmhb8xl";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Test properties and default-mains for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106250,7 +108967,7 @@ self: {
        pname = "quickcheck-unicode";
        version = "1.0.0.1";
        sha256 = "1a8nl6x7l9b22yx61wm0bh2n1xzb1hd5i5zgg1w4fpaivjnrrhi4";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        homepage = "https://github.com/bos/quickcheck-unicode";
        description = "Generator and shrink functions for testing Unicode-related software";
        license = stdenv.lib.licenses.bsd3;
@@ -106262,11 +108979,10 @@ self: {
        pname = "quickcheck-webdriver";
        version = "0.1.0.7";
        sha256 = "12jkj8jy4f0mix658pd8jfgwx268fs3bbqz90mac1vvag4c72i0h";
-       buildDepends = [ base QuickCheck transformers webdriver ];
+       libraryHaskellDepends = [ base QuickCheck transformers webdriver ];
        jailbreak = true;
        description = "Utilities for using WebDriver with QuickCheck";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quicklz" = callPackage
@@ -106277,8 +108993,8 @@ self: {
        pname = "quicklz";
        version = "1.5.0.11";
        sha256 = "17v9bfdp4ib9258r7001naqwss7l6v83by40va3gm3l418vj62qd";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -106296,8 +109012,11 @@ self: {
        sha256 = "0vy5s3qa67kwj68rxqc0zhqizqpvqa1x0bg3dakq5pimrqhmb7d4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ barecheck base directory filepath QuickCheck ];
-       testDepends = [ base directory filepath QuickCheck ];
+       libraryHaskellDepends = [ base directory filepath QuickCheck ];
+       executableHaskellDepends = [
+         barecheck base directory filepath QuickCheck
+       ];
+       testHaskellDepends = [ base directory filepath QuickCheck ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/quickpull";
        description = "Generate Main module with QuickCheck tests";
@@ -106311,7 +109030,7 @@ self: {
        pname = "quickset";
        version = "0.1.0";
        sha256 = "0xiw57wi9z567nmp4h0vfcw3sr9dciy29jadn47bvi3q278v7zdy";
-       buildDepends = [ base vector vector-algorithms ];
+       libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106325,7 +109044,7 @@ self: {
        pname = "quickspec";
        version = "0.9.6";
        sha256 = "0prwzxsrvfqryl75rmma229d4y7ra61vc3d72kyqi4l44ga2ay21";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ghc-prim QuickCheck random spoon transformers
        ];
        homepage = "https://github.com/nick8325/quickspec";
@@ -106341,7 +109060,9 @@ self: {
        sha256 = "0nvh6jd155xrjzkkbsz5q8d08z50881vkdhmprm7fdxax1gvjc95";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory haskell98 mtl process ];
+       executableHaskellDepends = [
+         base directory haskell98 mtl process
+       ];
        homepage = "https://github.com/davidsiegel/quicktest";
        description = "A reflective batch tester for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -106354,7 +109075,7 @@ self: {
        pname = "quickwebapp";
        version = "2.1.0.0";
        sha256 = "0zwqfwwna1d588yk2i20nzryl56k2bh4nyg03ljszyhna16iclij";
-       buildDepends = [ base bytestring http-types scotty text ];
+       libraryHaskellDepends = [ base bytestring http-types scotty text ];
        jailbreak = true;
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
@@ -106366,7 +109087,7 @@ self: {
        pname = "quiver";
        version = "0.0.0.11";
        sha256 = "1pxnxdm84fqmxvv0l312q8nynpaiyf43jksa2qg1wkl53n0mm2fa";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/zadarnowski/quiver";
        description = "Quiver finite stream processing library";
        license = stdenv.lib.licenses.bsd3;
@@ -106378,7 +109099,7 @@ self: {
        pname = "quiver-bytestring";
        version = "0.0.0.2";
        sha256 = "17wjj1fg60g3km9d4kxfz7lk9bf4sfz0brsg8pb0h2xlw0zvm3wl";
-       buildDepends = [ base bytestring quiver ];
+       libraryHaskellDepends = [ base bytestring quiver ];
        homepage = "https://github.com/zadarnowski/quiver-bytestring";
        description = "Quiver combinators for bytestring streaming";
        license = stdenv.lib.licenses.bsd3;
@@ -106390,7 +109111,7 @@ self: {
        pname = "quiver-cell";
        version = "0.0.0.2";
        sha256 = "10p11ljmwp7szw46saxa972xpjiyr5r19kia6ivaq98jqwcvi5af";
-       buildDepends = [ base data-cell quiver ];
+       libraryHaskellDepends = [ base data-cell quiver ];
        homepage = "https://github.com/zadarnowski/quiver-cell";
        description = "Quiver combinators for cellular data processing";
        license = stdenv.lib.licenses.bsd3;
@@ -106404,13 +109125,12 @@ self: {
        pname = "quiver-csv";
        version = "0.0.0.3";
        sha256 = "19wb16lbv0wr7w2qba6g2cdmzdhpyyjx1bjvrnz0cqbb4di9yscj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-cell quiver quiver-bytestring
        ];
        homepage = "https://github.com/zadarnowski/quiver-csv";
        description = "Quiver combinators for cellular CSV data processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quiver-enumerator" = callPackage
@@ -106419,7 +109139,7 @@ self: {
        pname = "quiver-enumerator";
        version = "0.0.0.1";
        sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp";
-       buildDepends = [ base enumerator quiver ];
+       libraryHaskellDepends = [ base enumerator quiver ];
        homepage = "https://github.com/zadarnowski/quiver-enumerator";
        description = "Bridge between Quiver and Iteratee paradigms";
        license = stdenv.lib.licenses.bsd3;
@@ -106437,12 +109157,13 @@ self: {
        sha256 = "1yha2rsphq2ar8c7p15dlg621d4ym46xgv70fga9mlq2r4zwy2lv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal async base bytestring containers directory dlist
          exceptions filepath hex mtl network network-simple parsec process
          snap-core snap-server stm websockets websockets-snap
        ];
-       testDepends = [ base HUnit mtl ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base HUnit mtl ];
        jailbreak = true;
        homepage = "https://github.com/talw/quoridor-hs";
        description = "A Quoridor implementation in Haskell";
@@ -106458,7 +109179,8 @@ self: {
        sha256 = "1vb9r2nmkhybx1ra2jpzfz5i6klgz2jz09zhg5wi95dnml82p33g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base old-locale split time ];
+       libraryHaskellDepends = [ base old-locale split time ];
+       executableHaskellDepends = [ base ];
        description = "A library and program to create QIF files from Rabobank CSV exports";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106470,7 +109192,7 @@ self: {
        pname = "rad";
        version = "0.1.6.3";
        sha256 = "19g2lc3vmnapccdxf390cmkfl9bd3agcn01kk8ccd4lmaqn2c12d";
-       buildDepends = [ array base containers data-reify ];
+       libraryHaskellDepends = [ array base containers data-reify ];
        jailbreak = true;
        homepage = "http://comonad.com/reader/";
        description = "Reverse Automatic Differentiation";
@@ -106486,8 +109208,8 @@ self: {
        pname = "radian";
        version = "0.0.4";
        sha256 = "1f53h9gcbmfga5khc67z81aysibcj5pqgi3iwa2shy5mfd10a86a";
-       buildDepends = [ base lens ];
-       testDepends = [
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/radian";
@@ -106502,8 +109224,10 @@ self: {
        pname = "radium";
        version = "0.4.2";
        sha256 = "1kwbv7qvpjwdcnj6l26dpyw0xl3irhd5igwda4xx509llc8j8n3s";
-       buildDepends = [ base containers parsec ];
-       testDepends = [ base Cabal containers hspec parsec QuickCheck ];
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
+         base Cabal containers hspec parsec QuickCheck
+       ];
        jailbreak = true;
        homepage = "https://github.com/klangner/radium";
        description = "Chemistry";
@@ -106518,8 +109242,10 @@ self: {
        pname = "radium-formula-parser";
        version = "0.2";
        sha256 = "1b2gmc27dj9fanbjh7h0902jjh3jz1ydc6qvp9p3rfskaf6854bf";
-       buildDepends = [ base containers parsec ];
-       testDepends = [ base Cabal containers hspec parsec QuickCheck ];
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
+         base Cabal containers hspec parsec QuickCheck
+       ];
        jailbreak = true;
        homepage = "https://github.com/klangner/radium-formula-parser";
        description = "Chemistry";
@@ -106535,7 +109261,7 @@ self: {
        sha256 = "1hkz0fd1w72g6wnx9dq7z249195kjlhalcd1y8z13gj6yqn1sl9s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath ];
+       executableHaskellDepends = [ base filepath ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/radix";
        description = "Command-line tool for emitting numbers in various bases";
@@ -106550,13 +109276,18 @@ self: {
        pname = "rados-haskell";
        version = "3.1.0";
        sha256 = "0xffgf95dss442sf6adh7yys39i0z64w155akjyzr9dp2jzr6f2k";
-       buildDepends = [ async base bytestring containers mtl uuid ];
-       testDepends = [ async base bytestring hspec HUnit mtl rados uuid ];
-       extraLibraries = [ rados ];
+       libraryHaskellDepends = [
+         async base bytestring containers mtl uuid
+       ];
+       librarySystemDepends = [ rados ];
+       testHaskellDepends = [
+         async base bytestring hspec HUnit mtl uuid
+       ];
+       testSystemDepends = [ rados ];
        homepage = "github";
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { rados = null;};
 
   "rail-compiler-editor" = callPackage
@@ -106569,11 +109300,13 @@ self: {
        sha256 = "0jjsa21a7f4hysbk9qvcxyyc2ncrmmjh02n7yyhjnfjgdp4sclwb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base cairo containers gtk llvm-general llvm-general-pure mtl
-         process transformers
+       libraryHaskellDepends = [
+         base containers llvm-general llvm-general-pure mtl
        ];
-       testDepends = [ base containers HUnit process ];
+       executableHaskellDepends = [
+         base cairo containers gtk mtl process transformers
+       ];
+       testHaskellDepends = [ base containers HUnit process ];
        jailbreak = true;
        homepage = "https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14";
        description = "Compiler and editor for the esolang rail";
@@ -106588,8 +109321,10 @@ self: {
        pname = "rainbow";
        version = "0.26.0.6";
        sha256 = "1v0za967cp1205fkbwglf28yn2pslp7dvyqb3rbym3j7r3pby3zc";
-       buildDepends = [ base bytestring lens process text ];
-       testDepends = [ base bytestring lens process QuickCheck text ];
+       libraryHaskellDepends = [ base bytestring lens process text ];
+       testHaskellDepends = [
+         base bytestring lens process QuickCheck text
+       ];
        homepage = "https://www.github.com/massysett/rainbow";
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
@@ -106603,7 +109338,9 @@ self: {
        pname = "rainbow-tests";
        version = "0.20.0.4";
        sha256 = "0cjq2m2zpk4j2f7gw65yqqvyc4kng1rsnq48fs4xcs6bdzw0zhlg";
-       buildDepends = [ barecheck base QuickCheck rainbow terminfo text ];
+       libraryHaskellDepends = [
+         barecheck base QuickCheck rainbow terminfo text
+       ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/rainbow";
        description = "Tests and QuickCheck generators to accompany rainbow";
@@ -106619,8 +109356,10 @@ self: {
        pname = "rainbox";
        version = "0.18.0.2";
        sha256 = "1dczbs4y8yzvp132cfy0fl1jv2zf2nm6d3zn4j4pmy2p8cxs1g4v";
-       buildDepends = [ base bytestring containers lens rainbow text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers lens rainbow text
+       ];
+       testHaskellDepends = [
          base bytestring containers lens QuickCheck rainbow tasty
          tasty-quickcheck text
        ];
@@ -106635,7 +109374,7 @@ self: {
        pname = "rake";
        version = "0.0.1";
        sha256 = "0cn22xg7r80f61z8pf7i0rqqag4qx43rhlfpncgkv5b6vcrsafpn";
-       buildDepends = [ base containers text ];
+       libraryHaskellDepends = [ base containers text ];
        homepage = "http://github.com/toschoo/Haskell-Libs";
        description = "Rapid Automatic Keyword Extraction (RAKE)";
        license = "LGPL";
@@ -106649,7 +109388,7 @@ self: {
        pname = "rakhana";
        version = "0.2.0.2";
        sha256 = "10gk2wk8495y1zk148sqsm993dzi4z6a49nn717qccpc2qi4lw6k";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers lens mtl pipes scientific
          transformers vector zlib
        ];
@@ -106666,7 +109405,7 @@ self: {
        pname = "ralist";
        version = "0.1.0.0";
        sha256 = "0v2cg1d2wzjcygk78qcz1yfy9rcqw8yrplnnk6cax41qifhr5z5i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106678,7 +109417,7 @@ self: {
        pname = "rallod";
        version = "0.0.1";
        sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://github.com/moonmaster9000/rallod";
        description = "'$' in reverse";
        license = stdenv.lib.licenses.bsd3;
@@ -106693,7 +109432,7 @@ self: {
        pname = "raml";
        version = "0.1.0";
        sha256 = "02c1rki7azfwfiawi29z5gp1zwfdx46rw17bifpklw7zya525pr9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring text unordered-containers yaml
        ];
        homepage = "https://github.com/fnoble/raml";
@@ -106707,7 +109446,7 @@ self: {
        pname = "rand-vars";
        version = "0.1";
        sha256 = "165jvx59vzmpxp7gw60ivfka77kgc1irwijikkwja7jb4dm4ay3x";
-       buildDepends = [ array base IntervalMap mtl random ];
+       libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106723,7 +109462,7 @@ self: {
        sha256 = "11f72kfya4l41dihjvaz15hzipry281r8i6k6dzp5q3gq4valgyz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base crypto-api directory filepath monadcryptorandom transformers
          unix
        ];
@@ -106737,8 +109476,8 @@ self: {
        pname = "random";
        version = "1.1";
        sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p";
-       buildDepends = [ base time ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base ];
        description = "random number library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106749,7 +109488,7 @@ self: {
        pname = "random-access-list";
        version = "0.2";
        sha256 = "1ymbs3f38l6ch0nphsy9pi32yb1a4hazn3grm9fl0dvgqw28xl8r";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106761,7 +109500,7 @@ self: {
        pname = "random-derive";
        version = "0.1.0.0";
        sha256 = "08irzyg8cgigj009zp5hg33gdwranrdyyzrxhmwyib6fm5bmsj8p";
-       buildDepends = [ base random template-haskell ];
+       libraryHaskellDepends = [ base random template-haskell ];
        homepage = "https://github.com/frerich/random-derive";
        description = "A Template Haskell helper for deriving Random instances";
        license = stdenv.lib.licenses.bsd3;
@@ -106773,7 +109512,7 @@ self: {
        pname = "random-eff";
        version = "0.1.0.1";
        sha256 = "1m28np0zfabp1n1d08przh35bxfr1l7d39kj4a5z61jkchmsaxyf";
-       buildDepends = [ base extensible-effects random ];
+       libraryHaskellDepends = [ base extensible-effects random ];
        jailbreak = true;
        description = "A simple random generator library for extensible-effects";
        license = stdenv.lib.licenses.bsd3;
@@ -106786,7 +109525,7 @@ self: {
        pname = "random-effin";
        version = "0.1.1.0";
        sha256 = "0p1n5dfdsp00q9mlhd7xcl93k5d0wji91p59858gmfx9xf8j0p0h";
-       buildDepends = [ base effin random ];
+       libraryHaskellDepends = [ base effin random ];
        jailbreak = true;
        description = "A simple random generator library for effin";
        license = stdenv.lib.licenses.bsd3;
@@ -106800,7 +109539,9 @@ self: {
        pname = "random-extras";
        version = "0.19";
        sha256 = "1b45s314rqkk0np460p3p0wrqvkv9dczifny8pp76ikksalfvgn0";
-       buildDepends = [ array base containers random-fu random-source ];
+       libraryHaskellDepends = [
+         array base containers random-fu random-source
+       ];
        homepage = "http://github.com/aristidb/random-extras";
        description = "Additional functions for random values";
        license = stdenv.lib.licenses.bsd3;
@@ -106815,7 +109556,7 @@ self: {
        pname = "random-fu";
        version = "0.2.6.2";
        sha256 = "1j7zr7h860vjwlh9d9sj319xs44ly2vyzn3s72c5qc39r0yv00ng";
-       buildDepends = [
+       libraryHaskellDepends = [
          base erf log-domain math-functions monad-loops mtl random-shuffle
          random-source rvar syb template-haskell transformers vector
        ];
@@ -106832,8 +109573,8 @@ self: {
        pname = "random-hypergeometric";
        version = "0.1.0.0";
        sha256 = "0jg4j2nwijb5ic9zl5y9miqhn881dmf0s49gj8f818as3mhvqlgh";
-       buildDepends = [ base math-functions random-fu ];
-       testDepends = [
+       libraryHaskellDepends = [ base math-functions random-fu ];
+       testHaskellDepends = [
          base Cabal cabal-test-quickcheck math-functions mwc-random
          QuickCheck random-fu vector
        ];
@@ -106850,7 +109591,7 @@ self: {
        pname = "random-shuffle";
        version = "0.0.4";
        sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j";
-       buildDepends = [ base MonadRandom random ];
+       libraryHaskellDepends = [ base MonadRandom random ];
        description = "Random shuffle implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106864,7 +109605,7 @@ self: {
        pname = "random-source";
        version = "0.3.0.6";
        sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base flexible-defaults mersenne-random-pure64 mtl mwc-random random
          stateref syb template-haskell th-extras
        ];
@@ -106879,7 +109620,7 @@ self: {
        pname = "random-stream";
        version = "0.1.1";
        sha256 = "0q191kz3hmjzrgs143nja5gcis07igb38f51mwqw64zx7vjqvx66";
-       buildDepends = [ base binary bytestring random ];
+       libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106895,8 +109636,10 @@ self: {
        sha256 = "0y7yvsach0c27ahscxr36avjrq281pmg7w6cv2yj5kmbk7ddwlyi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring mersenne-random-pure64 ];
-       extraLibraries = [ openssl ];
+       executableHaskellDepends = [
+         base binary bytestring mersenne-random-pure64
+       ];
+       executableSystemDepends = [ openssl ];
        homepage = "http://galois.com";
        description = "A fast, SMP parallel random data generator";
        license = stdenv.lib.licenses.bsd3;
@@ -106908,7 +109651,7 @@ self: {
        pname = "randproc";
        version = "0.4";
        sha256 = "0fb0239fwvn1n3rbdr03k4kx1igzbb638a1iq0ln1k1i1fpaayd7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/haskellwiki/Random_Processes";
        description = "Data structures and support functions for working with random processes";
        license = stdenv.lib.licenses.bsd3;
@@ -106922,7 +109665,7 @@ self: {
        sha256 = "0v7j6qqs16j281hn0330vcpkriqgyvl7087ll665c7dcqqh2bswk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base random X11 ];
+       executableHaskellDepends = [ base random X11 ];
        description = "Set the background of your root window to a random colour";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -106935,15 +109678,14 @@ self: {
        pname = "range";
        version = "0.1.2.0";
        sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab";
-       buildDepends = [ base free parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base free parsec ];
+       testHaskellDepends = [
          base Cabal free QuickCheck random test-framework
          test-framework-quickcheck2
        ];
        homepage = "https://bitbucket.org/robertmassaioli/range";
        description = "This has a bunch of code for specifying and managing ranges in your code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "range-set-list" = callPackage
@@ -106952,8 +109694,8 @@ self: {
        pname = "range-set-list";
        version = "0.0.7";
        sha256 = "1qgw95gvbxar13ia6562ddz9zqd14ffyxwp9qi41w859prfc1728";
-       buildDepends = [ base ];
-       testDepends = [ base containers tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        jailbreak = true;
        homepage = "https://github.com/phadej/range-set-list";
        description = "Memory efficient sets with continuous ranges of elements";
@@ -106969,10 +109711,10 @@ self: {
        pname = "range-space";
        version = "0.1.1.2";
        sha256 = "06cl5kgyl1lccr78galqxp21nli2vkvlywy6394cnp14wqfz8r94";
-       buildDepends = [
+       libraryHaskellDepends = [
          base semigroups vector-space vector-space-points
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck semigroups test-framework
          test-framework-quickcheck2 time vector-space vector-space-points
        ];
@@ -106989,7 +109731,7 @@ self: {
        pname = "rangemin";
        version = "2.2.2";
        sha256 = "01n1m3ibi44pjg04mg16j751fjzkspmnq8bzxz55qbyi22wshnwc";
-       buildDepends = [ base containers primitive vector ];
+       libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107001,7 +109743,7 @@ self: {
        pname = "ranges";
        version = "0.2.4";
        sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Ranges and various functions on them";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107014,12 +109756,13 @@ self: {
        pname = "rank1dynamic";
        version = "0.3.1.0";
        sha256 = "0klfwglssp782p1brbfgjm30d2s3lpgd75iv7jq1pih598kkjsd5";
-       buildDepends = [ base binary ghc-prim ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base binary ghc-prim ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        homepage = "http://haskell-distributed.github.com";
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rascal" = callPackage
@@ -107033,11 +109776,15 @@ self: {
        sha256 = "0q7afppkm5jd1p13fszzsfjpdz6g6bw1vd6wigcy3janxn5686rs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-terminal base containers curl curl-aeson directory
          filepath mtl process vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson ansi-terminal base containers curl curl-aeson directory
+         filepath mtl process vector
+       ];
+       testHaskellDepends = [
          aeson ansi-terminal base containers curl curl-aeson directory
          filepath HUnit mtl process QuickCheck tasty tasty-hunit
          tasty-quickcheck vector
@@ -107060,10 +109807,14 @@ self: {
        sha256 = "00p3l8czj7l9jm6ibn9c6wb99v5j5x9ivgh3pamznqcri3lqy7kk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath FontyFruity
-         JuicyPixels lens linear mtl optparse-applicative Rasterific
-         scientific svg-tree text transformers vector
+         JuicyPixels lens linear mtl Rasterific scientific svg-tree text
+         transformers vector
+       ];
+       executableHaskellDepends = [
+         base directory filepath FontyFruity JuicyPixels
+         optparse-applicative Rasterific svg-tree
        ];
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
@@ -107075,7 +109826,7 @@ self: {
        pname = "rate-limit";
        version = "1.1.1";
        sha256 = "1d1dfj05vi8jr2cfy42a58wnm84zm6cmx7fabp2rb83qqm4l2riz";
-       buildDepends = [ base time-units ];
+       libraryHaskellDepends = [ base time-units ];
        homepage = "http://github.com/acw/rate-limit";
        description = "A basic library for rate-limiting IO actions";
        license = stdenv.lib.licenses.bsd3;
@@ -107087,7 +109838,7 @@ self: {
        pname = "ratio-int";
        version = "0.1.2";
        sha256 = "06kqr4iyi184sa8y2vdkw5h0pvh5f8lwcqb8mbcn34lpqm961s7g";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/RaphaelJ/ratio-int";
        description = "Fast specialisation of Data.Ratio for Int.";
        license = stdenv.lib.licenses.bsd3;
@@ -107102,11 +109853,13 @@ self: {
        pname = "raven-haskell";
        version = "0.1.0.0";
        sha256 = "06pa03g9pxxv1qk34ckcgwp5wirj5ag1akml48k18la6p0a2r3mx";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit network old-locale random text
          time unordered-containers uuid
        ];
-       testDepends = [ aeson base bytestring hspec unordered-containers ];
+       testHaskellDepends = [
+         aeson base bytestring hspec unordered-containers
+       ];
        homepage = "https://bitbucket.org/dpwiz/raven-haskell";
        description = "Haskell client for Sentry logging service";
        license = stdenv.lib.licenses.mit;
@@ -107121,7 +109874,7 @@ self: {
        pname = "raven-haskell-scotty";
        version = "0.1.0.3";
        sha256 = "0vllfasn4rky8r8fg3mpln8pdkxbcvrvx8wamn0xswfwf1rvcf6k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive mtl raven-haskell scotty text wai
        ];
        homepage = "http://bitbucket.org/dpwiz/raven-haskell";
@@ -107136,7 +109889,7 @@ self: {
        pname = "raw-strings-qq";
        version = "1.0.2";
        sha256 = "0wnifa97am2s9bqixlidw3nf8w14h2qkg3sn1rxzgvc3fws57jg9";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/23Skidoo/raw-strings-qq";
        description = "Raw string literals for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -107148,7 +109901,7 @@ self: {
        pname = "rawstring-qm";
        version = "0.2.2.2";
        sha256 = "0h3s62sn84skwx3p9lcycswydvg6rijig7pk3g7v4rvypfdlybz6";
-       buildDepends = [ base bytestring template-haskell text ];
+       libraryHaskellDepends = [ base bytestring template-haskell text ];
        homepage = "https://github.com/tolysz/rawstring-qm";
        description = "Simple raw string quotation and dictionary interpolation";
        license = stdenv.lib.licenses.bsd3;
@@ -107162,10 +109915,10 @@ self: {
        pname = "razom-text-util";
        version = "0.1.2.0";
        sha256 = "0sfqc222pplsdmbrhwvbdf6pmqa18vgjd83rk7hqixzp6rk9h7pg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base regex-applicative smaoin text text-position
        ];
-       testDepends = [ base QuickCheck regex-applicative smaoin ];
+       testHaskellDepends = [ base QuickCheck regex-applicative smaoin ];
        homepage = "http://rel4tion.org/projects/razom-text-util/";
        description = "Common text/parsing tools for Razom language packages";
        license = stdenv.lib.licenses.publicDomain;
@@ -107179,7 +109932,7 @@ self: {
        sha256 = "0q7b990k3ijjjwhnm1283k9vzmvypyg7mhvbzagvi74q0sgwyac7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring containers ];
+       executableHaskellDepends = [ base bio bytestring containers ];
        homepage = "http://malde.org/~ketil/";
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
@@ -107194,7 +109947,7 @@ self: {
        pname = "rclient";
        version = "0.1.0.0";
        sha256 = "1hdcbnkb184a1zfxsh4fxgff9znc5sw6503qbix67c45qiw25zhn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 network QuickCheck split
        ];
        description = "Haskell client for Rserve";
@@ -107214,12 +109967,16 @@ self: {
        sha256 = "09ya3d1svg6fj7jdm408gisv0cnn0c2i2c3pn07xggnn882s93bw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory fgl hashable
          HTTP hxt network network-uri parsec text text-binary
          unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary bytestring containers deepseq hashable HTTP hxt network
+         network-uri parsec text text-binary
+       ];
+       testHaskellDepends = [
          base binary bytestring containers deepseq fgl hashable HTTP HUnit
          hxt knob network network-uri parsec QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text text-binary
@@ -107241,7 +109998,11 @@ self: {
        sha256 = "1k0djlhabycj4q7x85bj7n3k0rcyxn9b3k3ijb4za2vxj081qdj0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers hoauth json MissingH mtl
+         transformers urlencoded
+       ];
+       executableHaskellDepends = [
          aeson base bytestring containers hoauth hspec json MissingH mtl
          transformers urlencoded
        ];
@@ -107256,7 +110017,7 @@ self: {
        pname = "rdtsc";
        version = "1.3.0.1";
        sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mgrabmueller/rdtsc";
        description = "Binding for the rdtsc machine instruction";
        license = stdenv.lib.licenses.bsd3;
@@ -107268,7 +110029,7 @@ self: {
        pname = "rdtsc-enolan";
        version = "0.1";
        sha256 = "0v3x7ga4gx5q4gwh8xdhb2arlmjyilr9igz28wysy9qqlcdw775q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/rdtsc";
        description = "Binding to sources of high-efficiency, high-precision, monotonically increasing relative time";
        license = stdenv.lib.licenses.bsd3;
@@ -107280,8 +110041,8 @@ self: {
        pname = "re2";
        version = "0.1";
        sha256 = "08mmbxj9dpnb56b6vh0lz7nimp3w3v9g2c6ypxgz8ahvlia0a4f5";
-       buildDepends = [ base bytestring vector ];
-       testDepends = [ base bytestring chell vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
+       testHaskellDepends = [ base bytestring chell vector ];
        homepage = "https://john-millikin.com/software/haskell-re2/";
        description = "Bindings to the re2 regular expression library";
        license = stdenv.lib.licenses.mit;
@@ -107295,14 +110056,13 @@ self: {
        pname = "react-haskell";
        version = "2.0.1";
        sha256 = "0kjbicrvriliy50gy82b7rsrfk5p3iv20wwnhiaq9i16mbh2zj8j";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base deepseq lens-family monads-tf text transformers
          unordered-containers void
        ];
        homepage = "https://github.com/joelburget/react-haskell";
        description = "Haskell React bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reaction-logic" = callPackage
@@ -107313,7 +110073,8 @@ self: {
        sha256 = "0g1lbr0lsx71ddmd64q9lxx3gj63ncc7nqd12l4739wq495q57r0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl QuickCheck ];
+       executableHaskellDepends = [ base mtl QuickCheck ];
        homepage = "http://wiki.github.com/paolino/realogic";
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
@@ -107328,7 +110089,7 @@ self: {
        pname = "reactive";
        version = "0.11.5";
        sha256 = "1axhgggl1g8yjdvp817bnkj4xc23scc3i2k224k43942255sf71j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base category-extras checkers old-time QuickCheck random Stream
          TypeCompose unamb vector-space
        ];
@@ -107344,8 +110105,8 @@ self: {
        pname = "reactive-bacon";
        version = "0.4.1";
        sha256 = "0cic01yikwgalbprz8y0fs7i7c0pynxl7aivsfjgsl75wdpjsj3m";
-       buildDepends = [ base old-time stm ];
-       testDepends = [ base containers HUnit old-time stm ];
+       libraryHaskellDepends = [ base old-time stm ];
+       testHaskellDepends = [ base containers HUnit old-time stm ];
        homepage = "http://github.com/raimohanska/reactive-bacon";
        description = "FRP (functional reactive programming) framework";
        license = stdenv.lib.licenses.bsd3;
@@ -107362,7 +110123,7 @@ self: {
        pname = "reactive-balsa";
        version = "0.1.1";
        sha256 = "14k65rjvyxwb4psa53qcz89jllabqv76vh4xwx2k6k5ssl6qfr3n";
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core alsa-seq base containers data-accessor
          data-accessor-transformers event-list extensible-exceptions midi
          midi-alsa non-negative random reactive-banana transformers
@@ -107384,11 +110145,11 @@ self: {
        pname = "reactive-banana";
        version = "0.8.1.2";
        sha256 = "1ak3i0r7y9d5pyb4q6jag804bkgiqj3az7cckj50ffvra2v37nga";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable psqueues transformers unordered-containers
          vault
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hashable HUnit psqueues test-framework
          test-framework-hunit transformers unordered-containers vault
        ];
@@ -107405,7 +110166,7 @@ self: {
        pname = "reactive-banana-sdl";
        version = "0.2.0";
        sha256 = "067g8v7xhll416f47prifv0l2i8vr6aywbahhci8kwci75a1al6m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-lens data-lens-template reactive-banana SDL SDL-image
          SDL-ttf
        ];
@@ -107423,7 +110184,7 @@ self: {
        sha256 = "1fb0bq7rcxsnga2hxh94h2rpp4kjh383z06qgk36m49pyvnbnl9a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base reactive-banana threepenny-gui ];
+       libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using threepenny-gui";
@@ -107437,10 +110198,12 @@ self: {
        pname = "reactive-banana-wx";
        version = "0.8.0.4";
        sha256 = "1r000r9svkf1sqxhg5mpawg9a7dkfndsyz242sbmfaxf94nrrscg";
+       configureFlags = [ "-f-buildexamples" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cabal-macosx reactive-banana wx wxcore ];
-       configureFlags = [ "-f-buildexamples" ];
+       libraryHaskellDepends = [
+         base cabal-macosx reactive-banana wx wxcore
+       ];
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -107454,7 +110217,7 @@ self: {
        pname = "reactive-fieldtrip";
        version = "0.0.9";
        sha256 = "092bxjnhbcyqlij8jc014c56k67ncp5wjm8kmwvn8argfplyscxg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base FieldTrip InfixApplicative reactive reactive-glut unamb
          vector-space
        ];
@@ -107472,7 +110235,9 @@ self: {
        pname = "reactive-glut";
        version = "0.1.10";
        sha256 = "164ivzgrnvqvx7r1jagsng9m47ql0jkayzahhcvs8wd78ksbbsfh";
-       buildDepends = [ base GLUT old-time OpenGL reactive vector-space ];
+       libraryHaskellDepends = [
+         base GLUT old-time OpenGL reactive vector-space
+       ];
        homepage = "http://haskell.org/haskellwiki/reactive-glut";
        description = "Connects Reactive and GLUT";
        license = stdenv.lib.licenses.bsd3;
@@ -107485,7 +110250,7 @@ self: {
        pname = "reactive-haskell";
        version = "0.0.1";
        sha256 = "115zjaymcx1dm7lwdqjq810j664a2kj8phrvjkhfkdsl95srqc85";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "minimal fork of io-reactive";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107496,7 +110261,7 @@ self: {
        pname = "reactive-io";
        version = "0.1";
        sha256 = "0s7a29cfzb2j5xvqykx1n5naci2np36zjs3qyq0i4yzjf3qprr63";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "IO-oriented FRP library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -107509,7 +110274,10 @@ self: {
        sha256 = "1mydwb3p2c4xm7zfv7cwcyscq1wdcvs2az743s3j8gl8ggc1zs50";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base monad-parallel SDL stm transformers ];
+       libraryHaskellDepends = [ base monad-parallel stm transformers ];
+       executableHaskellDepends = [
+         base monad-parallel SDL stm transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/strager/reactive-thread";
        description = "Reactive programming via imperative threads";
@@ -107525,7 +110293,7 @@ self: {
        pname = "reactor";
        version = "0.1.3";
        sha256 = "0g57vkq8cgigy6383p5jk6bbp3l1vcihryz8sjwvr8hs4y96642f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bits-atomic comonad contravariant mtl semigroupoids
          transformers
        ];
@@ -107542,7 +110310,7 @@ self: {
        pname = "read-bounded";
        version = "0.1.1.0";
        sha256 = "19ynv5vxa5dnphv9kby0nfvq3wn6qpk7n5qv1x22ipkfxnxdw47k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/read-bounded";
        description = "Class for reading bounded values";
@@ -107555,7 +110323,7 @@ self: {
        pname = "readable";
        version = "0.3.1";
        sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/mightybyte/readable";
        description = "Reading from Text and ByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -107567,8 +110335,8 @@ self: {
        pname = "readline";
        version = "1.0.3.0";
        sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0";
-       buildDepends = [ base process ];
-       extraLibraries = [ ncurses readline ];
+       libraryHaskellDepends = [ base process ];
+       librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
        license = "GPL";
      }) { inherit (pkgs) ncurses;  inherit (pkgs) readline;};
@@ -107579,7 +110347,7 @@ self: {
        pname = "readline-statevar";
        version = "1.0.1.0";
        sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8";
-       buildDepends = [ base readline StateVar ];
+       libraryHaskellDepends = [ base readline StateVar ];
        jailbreak = true;
        description = "Readline with variables (setX/getY) wrapped in state vars";
        license = stdenv.lib.licenses.bsd3;
@@ -107593,7 +110361,7 @@ self: {
        sha256 = "1icb7w3hgfczrr48x48lwvln05yaw3c9bxwrrfxc92h3q73v1rpp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bliplib parseargs ];
+       executableHaskellDepends = [ base bliplib parseargs ];
        homepage = "https://github.com/bjpop/blip";
        description = "Read and pretty print Python bytecode (.pyc) files.";
        license = stdenv.lib.licenses.bsd3;
@@ -107605,7 +110373,7 @@ self: {
        pname = "really-simple-xml-parser";
        version = "0.4.0.0";
        sha256 = "1qmrfisnvm9a25a9ssg4r466yna69vzbwn7s7f4zql28cndg3syy";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "http://website-ckkashyap.rhcloud.com";
        description = "A really simple XML parser";
@@ -107619,7 +110387,7 @@ self: {
        pname = "reasonable-lens";
        version = "0.2.1.1";
        sha256 = "0ic239ikxqsk4qjnyraka3jn4pjmmsgwqyga6zmqlw7z1kpgaxam";
-       buildDepends = [ base mtl split template-haskell ];
+       libraryHaskellDepends = [ base mtl split template-haskell ];
        homepage = "https://github.com/tokiwoousaka/reasonable-lens";
        description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
@@ -107631,10 +110399,10 @@ self: {
      mkDerivation {
        pname = "reasonable-operational";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "18d49rzpygbsd17d9hz79bbgj6jznlx2jzhkw43gzw3rhvklwyh9";
+       revision = "1";
        editedCabalFile = "963ed294ec0f951858022c25b9713b06e65d2a05098068a1183110e298b5c8cf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tokiwoousaka/reasonable-operational";
        description = "Just size Operational Monad implementation";
        license = stdenv.lib.licenses.mit;
@@ -107646,7 +110414,7 @@ self: {
        pname = "recaptcha";
        version = "0.1.0.3";
        sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
-       buildDepends = [ base HTTP network network-uri xhtml ];
+       libraryHaskellDepends = [ base HTTP network network-uri xhtml ];
        homepage = "http://github.com/jgm/recaptcha/tree/master";
        description = "Functions for using the reCAPTCHA service in web applications";
        license = stdenv.lib.licenses.bsd3;
@@ -107660,7 +110428,7 @@ self: {
        pname = "record";
        version = "0.4.0.2";
        sha256 = "18j30j7dppm0lqf9p345bfz65cls15ka6jyflamwgig5h0dzz5mw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude basic-lens template-haskell transformers
        ];
        homepage = "https://github.com/nikita-volkov/record";
@@ -107676,8 +110444,10 @@ self: {
        pname = "record-aeson";
        version = "0.1.0.0";
        sha256 = "023g63y478k7mq8kk5xcxa3civs3hdhlvdb0qh3amvvybpj3g4av";
-       buildDepends = [ aeson base base-prelude record template-haskell ];
-       testDepends = [ aeson base-prelude hspec record ];
+       libraryHaskellDepends = [
+         aeson base base-prelude record template-haskell
+       ];
+       testHaskellDepends = [ aeson base-prelude hspec record ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record-aeson";
        description = "Instances of \"aeson\" classes for the \"record\" types";
@@ -107693,14 +110463,14 @@ self: {
      mkDerivation {
        pname = "record-gl";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0z0qwnzayarwlamig9g4zngq3mcddhl3pgalir811lxf3a3g1dqq";
+       revision = "1";
        editedCabalFile = "6d2017f9112690ce717a1bb7dad9d2d4272b01b4bce8ee3ae79247f97f277d85";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude containers GLUtil linear OpenGL record tagged
          template-haskell vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit linear OpenGL record tagged test-framework
          test-framework-hunit
        ];
@@ -107719,7 +110489,7 @@ self: {
        sha256 = "0vfij2kj4lg9pvyrcq3x33vnibq441fc80cpd67c9ik9axgf0r3y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-prelude conversion conversion-text record-syntax text
        ];
        homepage = "https://github.com/nikita-volkov/record-preprocessor";
@@ -107737,18 +110507,17 @@ self: {
        pname = "record-syntax";
        version = "0.1.0.2";
        sha256 = "177zy0j05yvpalflja5wpp0a45nplhpa9vq8ssfxw2nw9ydam637";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude conversion conversion-text haskell-src-exts
          parsec record template-haskell text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-prelude directory doctest filepath hspec record
        ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record-syntax";
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records" = callPackage
@@ -107757,7 +110526,7 @@ self: {
        pname = "records";
        version = "0.1.1.6";
        sha256 = "1nzqqbqwgsr066ykmanyzmlv5nzdzpkkcla0lg8klyw6ck9ddk69";
-       buildDepends = [ base kinds type-functions ];
+       libraryHaskellDepends = [ base kinds type-functions ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/records";
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
@@ -107772,7 +110541,7 @@ self: {
        pname = "records-th";
        version = "0.1.1.0";
        sha256 = "1m6v52kmh1clcgah07jjjxvsfpbp6z8lkdd78wap0v3mqiv8mdcg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default kinds records template-haskell text
          type-functions unordered-containers
        ];
@@ -107789,11 +110558,10 @@ self: {
        pname = "recursion-schemes";
        version = "4.1.2";
        sha256 = "1z64r20qgf7n5c2529cpwhklb3nkmw01p2llq903dqkplmbi7z9n";
-       buildDepends = [ base comonad free transformers ];
+       libraryHaskellDepends = [ base comonad free transformers ];
        homepage = "http://github.com/ekmett/recursion-schemes/";
        description = "Generalized bananas, lenses and barbed wire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursive-line-count" = callPackage
@@ -107806,7 +110574,7 @@ self: {
        sha256 = "0iyacn4gb7v6ly0bdci34mrjkjc29mbplqc6bhfv8ksz74aaafyn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers filepath gtk mtl process
        ];
        homepage = "https://github.com/joeyadams/haskell-recursive-line-count";
@@ -107823,7 +110591,7 @@ self: {
        pname = "redHandlers";
        version = "0.1";
        sha256 = "1llb81aqr0jlsajsmy20br5vqd6ap54bk17ipg8z3gmzd0wcf9c9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cgi containers haskell98 MaybeT mtl network
          old-time parsec stm unix xhtml
        ];
@@ -107842,12 +110610,12 @@ self: {
        pname = "reddit";
        version = "0.1.1.0";
        sha256 = "1flsawdld5a4bs5crs352zc1r9ag3yn1indbzw7vgs2mmyiavg7k";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson api-builder base bytestring data-default http-conduit
          http-types network stm text time transformers unordered-containers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          api-builder base bytestring Cabal hspec http-conduit text time
          transformers
        ];
@@ -107865,7 +110633,7 @@ self: {
        pname = "redis";
        version = "0.14.1";
        sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring concurrent-extra containers exceptions mtl network
          old-time utf8-string
        ];
@@ -107880,7 +110648,7 @@ self: {
        pname = "redis-hs";
        version = "0.1.2";
        sha256 = "1irayxwkdksc9v70g7il7zl7pmkrim2admcgjwcm9inyca7618wg";
-       buildDepends = [ base bytestring network utf8-string ];
+       libraryHaskellDepends = [ base bytestring network utf8-string ];
        homepage = "http://ohloh.net/p/redis-hs";
        description = "A simple Redis library for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -107897,13 +110665,13 @@ self: {
        pname = "redis-io";
        version = "0.5.1";
        sha256 = "13zj3d89drqdfq8202y982l7jp0nc3mmnmhwpxxfap0pb69n2s5m";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec auto-update base bytestring containers exceptions
          iproute monad-control mtl network operational redis-resp
          resource-pool semigroups stm time tinylog transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring bytestring-conversion containers redis-resp
          tasty tasty-hunit tinylog transformers
        ];
@@ -107920,10 +110688,10 @@ self: {
      mkDerivation {
        pname = "redis-resp";
        version = "0.3.2";
-       revision = "2";
        sha256 = "07lvgq2l2fahhc9z3hjjjpx3n4rzdxl2l2ww9brxnv23432xpz97";
+       revision = "2";
        editedCabalFile = "6375e871f3ad78efa6e4780c4e5c026fa4694f27e32f3837679fff42f488877f";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion containers dlist
          double-conversion operational semigroups split transformers
        ];
@@ -107938,7 +110706,7 @@ self: {
        pname = "redis-simple";
        version = "0.1.1";
        sha256 = "0kzs5lc2y40dzx57k0klz0k9zijhi7mh0awi6rzhzd3h5z1gdr43";
-       buildDepends = [ base binary bytestring redis ];
+       libraryHaskellDepends = [ base binary bytestring redis ];
        homepage = "http://github.com/jaspervdj/redis-simple";
        description = "Simple redis bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -107954,7 +110722,7 @@ self: {
        sha256 = "18951sri8wix8aazd8hy8g2gzcpxw2x1ihzmn2prlf10zy1jcy4d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath process pureMD5
        ];
        homepage = "https://github.com/jekor/redo";
@@ -107971,7 +110739,7 @@ self: {
        pname = "reducers";
        version = "3.10.3.2";
        sha256 = "1zfryrmz5ajahs4d6dj3fzzkqbgdzqz358jvj4rhqiwa61ylhb42";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers fingertree hashable semigroupoids
          semigroups text transformers unordered-containers
        ];
@@ -107986,7 +110754,9 @@ self: {
        pname = "reenact";
        version = "0.9";
        sha256 = "19xw0w15ja8h5wxpz4x65vzvc7qxpn3k33p82pa2g3w9l9hlj2xw";
-       buildDepends = [ base hamid HCodecs stm time vector-space ];
+       libraryHaskellDepends = [
+         base hamid HCodecs stm time vector-space
+       ];
        description = "A reimplementation of the Reactive library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107997,7 +110767,7 @@ self: {
        pname = "reexport-crypto-random";
        version = "0.1.0.0";
        sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9";
-       buildDepends = [ base crypto-api ];
+       libraryHaskellDepends = [ base crypto-api ];
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
@@ -108007,7 +110777,7 @@ self: {
        pname = "ref";
        version = "0.1.1.2";
        sha256 = "109illgbz4g4a6qavgc4wvyxfjvjhyrxa2gpps67avmr1v90gihr";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
@@ -108021,7 +110791,7 @@ self: {
        pname = "ref-fd";
        version = "0.4";
        sha256 = "1r8cj6v798chr3bp7x6qvsiz04xsj2iicpa6824b4fzzy5ixkj96";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A type class for monads with references using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -108033,7 +110803,7 @@ self: {
        pname = "ref-mtl";
        version = "0.3";
        sha256 = "0wijkaf3qyp6qjz0cwyhb89z5jrcz792hx8m9a43xrp7v2f84080";
-       buildDepends = [ base mtl stm transformers ];
+       libraryHaskellDepends = [ base mtl stm transformers ];
        jailbreak = true;
        homepage = "http://www.eecs.harvard.edu/~mainland/";
        description = "A type class for monads with references compatible with the mtl2 library";
@@ -108046,7 +110816,7 @@ self: {
        pname = "ref-tf";
        version = "0.4";
        sha256 = "049xpdn14py3r7hs4ikqdz7jgfsxi6vdsxgq0jfz69gzg4binc25";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A type class for monads with references using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -108058,7 +110828,7 @@ self: {
        pname = "refact";
        version = "0.3.0.1";
        sha256 = "0nmlhx35g3kb5if6qnkmabgi5dj4b446vkd1n5df1vsiyaf65w11";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Specify refactorings to perform with apply-refact";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108072,8 +110842,10 @@ self: {
        pname = "refcount";
        version = "0.1.2";
        sha256 = "1h1gprc4c784pf3wi2ri2hxk7pbh9y8bqc0xcryjcyjk3519ig16";
-       buildDepends = [ base hashable QuickCheck unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base hashable QuickCheck unordered-containers
+       ];
+       testHaskellDepends = [
          base Cabal hashable HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          unordered-containers
@@ -108090,7 +110862,7 @@ self: {
        pname = "reference";
        version = "0.1";
        sha256 = "1gqbbiwhx5wq1g73m3apwyrrpapqzimincmw2b64fpkkykq66dq1";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "A class for references in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -108104,7 +110876,7 @@ self: {
        pname = "references";
        version = "0.3.0.0";
        sha256 = "0rw3r9sz39f3pw2zxq7n9ca9jccfrj6lnjs3frimh0xrmdi9bmjk";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory either filepath instance-control
          mtl template-haskell text transformers
        ];
@@ -108125,7 +110897,7 @@ self: {
        sha256 = "1fhvn4cjfq92hi422mcdq4xwb405cc4pvlax0bqvyw3bg9ngqz9m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base clippard cmdargs directory filepath haskheap network
        ];
        jailbreak = true;
@@ -108141,7 +110913,7 @@ self: {
        pname = "refined";
        version = "0.1.0.0";
        sha256 = "0072zc4x8v6b8vdfgxnm1k6hbhzvf1m4cdb65v8df3qngb603r5n";
-       buildDepends = [ base base-prelude template-haskell ];
+       libraryHaskellDepends = [ base base-prelude template-haskell ];
        homepage = "https://github.com/nikita-volkov/refined";
        description = "Refinement types with static and runtime checking";
        license = stdenv.lib.licenses.mit;
@@ -108153,7 +110925,7 @@ self: {
        pname = "reflection";
        version = "2";
        sha256 = "1hlrji6wyqr892a78px7wilhywyiqdfdmnr7zp4c641qks4rw6gf";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
        license = stdenv.lib.licenses.bsd3;
@@ -108166,7 +110938,9 @@ self: {
        pname = "reflection-extras";
        version = "0.1.1.0";
        sha256 = "1cnqd8hrcvjvcdrida0q3dxkkmp36qsfqhv0a5zr94b1y5zfrj4k";
-       buildDepends = [ aeson base constraints lens reflection tagged ];
+       libraryHaskellDepends = [
+         aeson base constraints lens reflection tagged
+       ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/reflection-extras";
        description = "Utilities for the reflection package";
@@ -108180,7 +110954,7 @@ self: {
        pname = "reflection-without-remorse";
        version = "0.9.5";
        sha256 = "1iz4k42hc8f11a6kg2db847zmq5qpfiwns1448s62jswc2xm0x0r";
-       buildDepends = [ base type-aligned ];
+       libraryHaskellDepends = [ base type-aligned ];
        homepage = "https://github.com/atzeus/reflection-without-remorse";
        description = "Efficient free and operational monads";
        license = stdenv.lib.licenses.bsd3;
@@ -108196,12 +110970,12 @@ self: {
        pname = "reflex";
        version = "0.3";
        sha256 = "1aw4pz0y0rpf7klsb232q0zi4zqcpkwrw0s3zrkq5iyhzaswfnyd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dependent-map dependent-sum exception-transformers
          mtl primitive ref-tf semigroups template-haskell these transformers
          transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers dependent-map MemoTrie mtl ref-tf
        ];
        homepage = "https://github.com/ryantrinkle/reflex";
@@ -108221,7 +110995,7 @@ self: {
        pname = "reflex-dom";
        version = "0.2";
        sha256 = "1pc6mz9c6nr4s5b2mhlyxjzzffh85cv1bgvyycmq04s6dmg0ndgx";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default
          dependent-map dependent-sum dependent-sum-template directory
          exception-transformers ghcjs-dom glib gtk3 lens mtl ref-tf reflex
@@ -108242,7 +111016,7 @@ self: {
        pname = "reflex-dom-contrib";
        version = "0.1";
        sha256 = "1xqw1i5wldfamjyav7fbw3001hdnbj4x3phlr216ybw3ndxrjklc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default ghcjs-base
          ghcjs-dom http-types lens mtl readable reflex reflex-dom
          string-conv text time
@@ -108261,7 +111035,9 @@ self: {
        pname = "reflex-gloss";
        version = "0.1.0.2";
        sha256 = "18sbqryf6kxadgbvr6nh0f07897fq9fjj0h2w07xcdpp1ygg1nfg";
-       buildDepends = [ base dependent-sum gloss reflex transformers ];
+       libraryHaskellDepends = [
+         base dependent-sum gloss reflex transformers
+       ];
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
@@ -108273,7 +111049,7 @@ self: {
        pname = "reform";
        version = "0.2.7";
        sha256 = "0jjbcc88ffv6nqj0jbgb54bin0k5hh4w1i44xh3vdv00s7aj3abm";
-       buildDepends = [ base containers mtl text ];
+       libraryHaskellDepends = [ base containers mtl text ];
        homepage = "http://www.happstack.com/";
        description = "reform is an HTML form generation and validation library";
        license = stdenv.lib.licenses.bsd3;
@@ -108285,7 +111061,9 @@ self: {
        pname = "reform-blaze";
        version = "0.2.4";
        sha256 = "124hvgjhb2x6769qnwwjw30qmramh54pmggpqmj0dc8m473psfjy";
-       buildDepends = [ base blaze-html blaze-markup reform text ];
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup reform text
+       ];
        homepage = "http://www.happstack.com/";
        description = "Add support for using blaze-html with Reform";
        license = stdenv.lib.licenses.bsd3;
@@ -108297,7 +111075,9 @@ self: {
        pname = "reform-hamlet";
        version = "0.0.4";
        sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg";
-       buildDepends = [ base blaze-markup reform shakespeare text ];
+       libraryHaskellDepends = [
+         base blaze-markup reform shakespeare text
+       ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Add support for using Hamlet with Reform";
@@ -108312,7 +111092,7 @@ self: {
        pname = "reform-happstack";
        version = "0.2.5";
        sha256 = "12asmp1bklk33rpbhwhpbvmnkssjll92l47qxywibnpdf0zc6xsc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring happstack-server mtl random reform text utf8-string
        ];
        homepage = "http://www.happstack.com/";
@@ -108326,7 +111106,7 @@ self: {
        pname = "reform-hsp";
        version = "0.2.6";
        sha256 = "0aigsrax7s5ys0w2kd52jqi3453q81f4yp6c1s84a383yqndyq1j";
-       buildDepends = [ base hsp hsx2hs reform text ];
+       libraryHaskellDepends = [ base hsp hsx2hs reform text ];
        homepage = "http://www.happstack.com/";
        description = "Add support for using HSP with Reform";
        license = stdenv.lib.licenses.bsd3;
@@ -108340,8 +111120,8 @@ self: {
        pname = "regex-applicative";
        version = "0.3.2.1";
        sha256 = "19swnf6mqjxg7d1wxr4h9drjm51af4hj4ax712n8702xfvfb4jmz";
-       buildDepends = [ base containers transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [
          base containers smallcheck tasty tasty-hunit tasty-smallcheck
          transformers
        ];
@@ -108356,7 +111136,7 @@ self: {
        pname = "regex-base";
        version = "0.93.2";
        sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
-       buildDepends = [ array base bytestring containers mtl ];
+       libraryHaskellDepends = [ array base bytestring containers mtl ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108368,7 +111148,7 @@ self: {
        pname = "regex-compat";
        version = "0.95.1";
        sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
-       buildDepends = [ array base regex-base regex-posix ];
+       libraryHaskellDepends = [ array base regex-base regex-posix ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108380,7 +111160,7 @@ self: {
        pname = "regex-compat-tdfa";
        version = "0.95.1.4";
        sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
-       buildDepends = [ array base regex-base regex-tdfa ];
+       libraryHaskellDepends = [ array base regex-base regex-tdfa ];
        homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa";
        description = "Unicode Support version of Text.Regex, using regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
@@ -108395,7 +111175,7 @@ self: {
        pname = "regex-deriv";
        version = "0.0.4";
        sha256 = "0anj0az7q3fzdxknc83vci3nm5w0wj54w77xz2jphcbmn9ix9s4c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitset bytestring containers deepseq dequeue ghc-prim hashable
          hashtables mtl parallel parsec regex-base
        ];
@@ -108411,7 +111191,7 @@ self: {
        pname = "regex-dfa";
        version = "0.91";
        sha256 = "1f846d86wg7yha29qinchpi3r5gv9795f384pqahbyc13wfky7dp";
-       buildDepends = [ base mtl parsec regex-base ];
+       libraryHaskellDepends = [ base mtl parsec regex-base ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108426,7 +111206,7 @@ self: {
        pname = "regex-easy";
        version = "0.1.0.0";
        sha256 = "1062h3zd0bxak7rins7kk8n95ic04z5l9zqhg22h0iq5csapllf9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring regex-pcre string-conversions
        ];
        homepage = "https://github.com/zerobuzz/regex-easy";
@@ -108444,9 +111224,10 @@ self: {
        sha256 = "1816zmlh1bmxykvjp1q2viqckjvcj2g9b11ggz31ja5xi2mwc9iq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers logict mtl regex-tdfa sbv stream-monad text
        ];
+       executableHaskellDepends = [ base containers mtl regex-tdfa sbv ];
        jailbreak = true;
        homepage = "https://github.com/audreyt/regex-genex";
        description = "From a regex, generate all possible strings it can match";
@@ -108460,7 +111241,7 @@ self: {
        pname = "regex-parsec";
        version = "0.90";
        sha256 = "0zf5cr10mxlxxd8fp4q4ix6ibxc5xx3ml3k043kx28f9vfdh2xnx";
-       buildDepends = [ base parsec regex-base ];
+       libraryHaskellDepends = [ base parsec regex-base ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108475,8 +111256,10 @@ self: {
        pname = "regex-pcre";
        version = "0.94.4";
        sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf";
-       buildDepends = [ array base bytestring containers regex-base ];
-       extraLibraries = [ pcre ];
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base
+       ];
+       librarySystemDepends = [ pcre ];
        homepage = "http://hackage.haskell.org/package/regex-pcre";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108488,7 +111271,9 @@ self: {
        pname = "regex-pcre-builtin";
        version = "0.94.4.8.8.35";
        sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b";
-       buildDepends = [ array base bytestring containers regex-base ];
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base
+       ];
        homepage = "http://hackage.haskell.org/package/regex-pcre";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108502,7 +111287,7 @@ self: {
        pname = "regex-pderiv";
        version = "0.1.3";
        sha256 = "1jh7ksv3cgsjd0f51yyrs2kvji1wyi9qk2ysavh3w34nkgyxmg55";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitset bytestring containers deepseq ghc-prim mtl parallel
          parsec regex-base
        ];
@@ -108518,7 +111303,9 @@ self: {
        pname = "regex-posix";
        version = "0.95.2";
        sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an";
-       buildDepends = [ array base bytestring containers regex-base ];
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base
+       ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108534,7 +111321,7 @@ self: {
        sha256 = "0kcxsdn5lgmpfrkpkygr54jrnjqd93b12shb00n6j00rg7p755vx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers mtl regex-base regex-posix
        ];
        description = "Unit tests for the plaform's Posix regex library";
@@ -108548,10 +111335,10 @@ self: {
      mkDerivation {
        pname = "regex-tdfa";
        version = "1.2.0";
-       revision = "1";
        sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw";
+       revision = "1";
        editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
        homepage = "http://hackage.haskell.org/package/regex-tdfa";
@@ -108567,7 +111354,7 @@ self: {
        pname = "regex-tdfa-rc";
        version = "1.1.8.3";
        sha256 = "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
        homepage = "http://hackage.haskell.org/package/regex-tdfa";
@@ -108580,13 +111367,12 @@ self: {
      mkDerivation {
        pname = "regex-tdfa-text";
        version = "1.0.0.2";
-       revision = "2";
        sha256 = "1p17xv3j2xd74iilyqwlqhkmyp26asq4k1pb0h2f0wdqqfr87bfd";
+       revision = "2";
        editedCabalFile = "4b0e54f79540143c88adb071ea8e0aa3734a625db026a6a44ca2ef45b870b07c";
-       buildDepends = [ array base regex-base regex-tdfa text ];
+       libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tdfa-unittest" = callPackage
@@ -108599,7 +111385,7 @@ self: {
        sha256 = "1b9cca3l46qxvc5ck3z27dg6w1888pabkk0q752bzjqr3fc4nidc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers mtl regex-base regex-tdfa
        ];
        description = "Unit tests for the regex-tdfa";
@@ -108614,7 +111400,7 @@ self: {
        pname = "regex-tdfa-utf8";
        version = "1.0";
        sha256 = "0i5di03v9dsvvhz8mdfx5qba8zcpim0fpx1cjg9gvz4gh0yhqf4k";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring regex-base regex-tdfa utf8-string
        ];
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
@@ -108628,8 +111414,8 @@ self: {
        pname = "regex-tre";
        version = "0.91";
        sha256 = "1b7x0y8q1fvipnzh06by48f8l9l5ypm6yblpl35fzf641z3m9b7j";
-       buildDepends = [ base regex-base ];
-       extraLibraries = [ tre ];
+       libraryHaskellDepends = [ base regex-base ];
+       librarySystemDepends = [ tre ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108642,7 +111428,7 @@ self: {
        pname = "regex-xmlschema";
        version = "0.1.5";
        sha256 = "1dmhvnz6sj80kdnm2v7n0lvx8g9arhf9pqqzkn0rwzfhr2by0ss4";
-       buildDepends = [ base haskell98 parsec ];
+       libraryHaskellDepends = [ base haskell98 parsec ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
@@ -108660,9 +111446,11 @@ self: {
        sha256 = "1f1yb3h43pr38c7j3zs2jmph33arc828q1hbsmlz2xh4krdrc0vc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal containers parallel parsec QuickCheck regex-base
-         regex-posix regexdot toolshed
+       libraryHaskellDepends = [
+         base containers parsec regexdot toolshed
+       ];
+       executableHaskellDepends = [
+         array Cabal parallel QuickCheck regex-base regex-posix
        ];
        homepage = "http://functionalley.eu";
        description = "A POSIX, extended regex-engine";
@@ -108675,7 +111463,7 @@ self: {
        pname = "regexdot";
        version = "0.11.1.1";
        sha256 = "1nrbqlxlkppi6q7w7ypq47saskxdx9a127dcwkl2azzz5082yf8j";
-       buildDepends = [ base deepseq parallel parsec toolshed ];
+       libraryHaskellDepends = [ base deepseq parallel parsec toolshed ];
        homepage = "http://functionalley.eu";
        description = "A polymorphic, POSIX, extended regex-engine";
        license = "GPL";
@@ -108689,7 +111477,7 @@ self: {
        pname = "regexp-tries";
        version = "0.2";
        sha256 = "16spdq22dsblksvpd85cm6bmjd9053znphw6na1iy9pkmc491v1l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers derive-trie template-haskell weighted-regexp
        ];
        jailbreak = true;
@@ -108705,7 +111493,7 @@ self: {
        pname = "regexpr";
        version = "0.5.4";
        sha256 = "0136wp6hrnmj6pbdhp3a131dzz8bp1pbd92bpagpv1r6gwj16y5z";
-       buildDepends = [ base HUnit mtl mtlparse ];
+       libraryHaskellDepends = [ base HUnit mtl mtlparse ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/regexpr/";
        description = "regular expression like Perl/Ruby in Haskell";
        license = "LGPL";
@@ -108717,7 +111505,7 @@ self: {
        pname = "regexpr-symbolic";
        version = "0.5";
        sha256 = "1cpwvb5mmcaqwy617m6cr25pcb4v4yxwzxng82bcrwkhjfdklsdr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://sulzmann.blogspot.com/2008/12/equality-containment-and-intersection.html";
        description = "Regular expressions via symbolic manipulation";
@@ -108730,7 +111518,9 @@ self: {
        pname = "regexqq";
        version = "0.6";
        sha256 = "10vh4i7q9vf6b716hf2i9pv1dy6vlyrh8bybqh91i704a55m40f3";
-       buildDepends = [ base bytestring pcre-light template-haskell ];
+       libraryHaskellDepends = [
+         base bytestring pcre-light template-haskell
+       ];
        homepage = "http://code.haskell.org/~morrow/code/haskell/regexqq";
        description = "A quasiquoter for PCRE regexes";
        license = stdenv.lib.licenses.bsd3;
@@ -108744,7 +111534,9 @@ self: {
        pname = "regional-pointers";
        version = "0.7";
        sha256 = "1v71k64is86yc19n96062wl8f382xna1vnm0spcmr9jx6x3wyqv2";
-       buildDepends = [ base base-unicode-symbols regions transformers ];
+       libraryHaskellDepends = [
+         base base-unicode-symbols regions transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/regional-pointers/";
        description = "Regional memory pointers";
@@ -108760,7 +111552,7 @@ self: {
        pname = "regions";
        version = "0.11";
        sha256 = "1l4wi4vziw0d0vaagbknf8bsvh4irqxls6qbhcg8ngpn62a0fa7p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols monad-control transformers
        ];
        jailbreak = true;
@@ -108778,7 +111570,7 @@ self: {
        pname = "regions-monadsfd";
        version = "0.3.1.3";
        sha256 = "13xyigw1f92bzppqrl96wbz36j9cwrsaxdb2vkg8sjjvnirly3h9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-unicode-symbols monads-fd regions transformers
        ];
        jailbreak = true;
@@ -108795,7 +111587,7 @@ self: {
        pname = "regions-monadstf";
        version = "0.3.1.7";
        sha256 = "0r4fr3p2k4k8r1lw6la7h4al068xf5kzb8cgq5864rlkrgf53fxb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-unicode-symbols monads-tf regions transformers
        ];
        jailbreak = true;
@@ -108811,7 +111603,7 @@ self: {
        pname = "regions-mtl";
        version = "0.3.1.7";
        sha256 = "1s0sr42k1kmwgmrnj5zcan0j9br8xrrm1vdnj6yhliqdfz41ifc0";
-       buildDepends = [ base-unicode-symbols mtl regions ];
+       libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/regions-mtl/";
        description = "mtl instances for the RegionT monad transformer";
@@ -108825,7 +111617,7 @@ self: {
        pname = "regress";
        version = "0.1.1";
        sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj";
-       buildDepends = [ ad base vector ];
+       libraryHaskellDepends = [ ad base vector ];
        homepage = "https://github.com/alpmestan/regress";
        description = "Linear and logistic regression through automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
@@ -108837,7 +111629,7 @@ self: {
        pname = "regular";
        version = "0.3.4.4";
        sha256 = "112n3j27ac9lzs0lc3q12r6wmpkmfgdalv18h1qklhd5nh4j9wl5";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Generic programming library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108848,7 +111640,7 @@ self: {
        pname = "regular-extras";
        version = "0.2.3";
        sha256 = "0x1sbps0ccwpvf6fx1jnbjxylqsvvfzkkynliip9jyh6gkhm44vx";
-       buildDepends = [ base binary deepseq QuickCheck regular ];
+       libraryHaskellDepends = [ base binary deepseq QuickCheck regular ];
        jailbreak = true;
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
        license = stdenv.lib.licenses.bsd3;
@@ -108863,7 +111655,7 @@ self: {
        pname = "regular-web";
        version = "0.1.1";
        sha256 = "0f4lsly4497p7szibasin27hf2xy5cs8gp87vsbg6mlkk07bvysz";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base fclabels formlets json mtl regular xhtml
        ];
        jailbreak = true;
@@ -108879,7 +111671,7 @@ self: {
        pname = "regular-xmlpickler";
        version = "0.2";
        sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f";
-       buildDepends = [ base hxt regular text ];
+       libraryHaskellDepends = [ base hxt regular text ];
        homepage = "http://github.com/silkapp/regular-xmlpickler";
        description = "Generic generation of HXT XmlPickler instances using Regular";
        license = stdenv.lib.licenses.bsd3;
@@ -108893,8 +111685,8 @@ self: {
        sha256 = "0m6s6r2d39g3qkjylsrhixk9l9sb2jv0ihxwjn7b0wz7585g2bdv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory text vty vty-ui ];
-       testDepends = [ base directory QuickCheck text vty vty-ui ];
+       executableHaskellDepends = [ base directory text vty vty-ui ];
+       testHaskellDepends = [ base directory QuickCheck text vty vty-ui ];
        homepage = "https://github.com/mrVanDalo/reheat";
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
@@ -108911,7 +111703,7 @@ self: {
        sha256 = "0pwmz1q2866yj8hxbvha4v1smhppkd3jsrrhbhmbxw137l54ijgf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs parallel-io shelly split system-filepath text
        ];
        homepage = "https://github.com/jwiegley/rehoo";
@@ -108929,13 +111721,14 @@ self: {
        sha256 = "17ldmx351b54fxmiw3z89v7cs6p33x09k2aav7jphqgv2520phyv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring containers directory regex-posix split
        ];
        jailbreak = true;
        homepage = "https://github.com/kerkomen/rei";
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reified-records" = callPackage
@@ -108944,7 +111737,7 @@ self: {
        pname = "reified-records";
        version = "0.2.2";
        sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jozefg/reified-records";
        description = "Reify records to Maps and back again";
@@ -108960,7 +111753,8 @@ self: {
        sha256 = "1bl4yv77i8c4w1y5lqr6b8xi1m4ym2phvdjwc9l95rx1vrxkqpk1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
+       executableHaskellDepends = [ base ghc ];
        jailbreak = true;
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Serialize data";
@@ -108974,8 +111768,8 @@ self: {
        pname = "reinterpret-cast";
        version = "0.1.0";
        sha256 = "1r2k2fyfm5lknfdfs282l274bgaxf4j4dikk4hpwchjbj0n64m2n";
-       buildDepends = [ array base ];
-       testDepends = [ base data-binary-ieee754 hspec loop ];
+       libraryHaskellDepends = [ array base ];
+       testHaskellDepends = [ base data-binary-ieee754 hspec loop ];
        homepage = "https://github.com/nh2/reinterpret-cast";
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
        license = stdenv.lib.licenses.mit;
@@ -108987,7 +111781,7 @@ self: {
        pname = "relacion";
        version = "0.1";
        sha256 = "1jq3ii9j8s7q8fr7ac2pdr2l33jvzsyyq70cjd9q1spqa1v6k976";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        homepage = "not available";
        description = "A relation data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -108999,7 +111793,7 @@ self: {
        pname = "relation";
        version = "0.2.1";
        sha256 = "03h6l8v3ppxbwg9ddgg121yx3i2v4vbcpwrv1vg3mgbw5pwq7x4c";
-       buildDepends = [ array base containers groom ];
+       libraryHaskellDepends = [ array base containers groom ];
        jailbreak = true;
        homepage = "https://www.github.com/d-day/relation/";
        description = "A data structure representing Relations on Sets";
@@ -109015,14 +111809,13 @@ self: {
        pname = "relational-postgresql8";
        version = "0.1.0.0";
        sha256 = "1fmgb7qbcbyr5simy5x6fqnib3v3cq0vsz9i720snszs7a2k1z8f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HDBC names-th persistable-record relational-query
          relational-query-HDBC template-haskell time
        ];
        homepage = "https://github.com/yuga/haskell-relational-record-driver-postgresql8";
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query" = callPackage
@@ -109034,16 +111827,17 @@ self: {
        pname = "relational-query";
        version = "0.5.1.1";
        sha256 = "1gs2ip483paqw01wipd5x5vf27l1w887dv7ah0icgjshwg84ff1p";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
          transformers
        ];
-       testDepends = [ base containers quickcheck-simple transformers ];
+       testHaskellDepends = [
+         base containers quickcheck-simple transformers
+       ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Typeful, Modular, Relational, algebraic query engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query-HDBC" = callPackage
@@ -109055,7 +111849,7 @@ self: {
        pname = "relational-query-HDBC";
        version = "0.1.0.0";
        sha256 = "1r5lj96w8cqcmma2kh46g8xyw0zz161nv1h9bwqia21vvis396vj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers convertible HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
          template-haskell
@@ -109063,7 +111857,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "HDBC instance of relational join and typed query for HDBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record" = callPackage
@@ -109072,11 +111865,12 @@ self: {
        pname = "relational-record";
        version = "0.1.2.0";
        sha256 = "00cb3yb4gin6kq7yz3jbkhm372z3vhq97h2l1xk0xja8xi8mfhn6";
-       buildDepends = [ base relational-query relational-query-HDBC ];
+       libraryHaskellDepends = [
+         base relational-query relational-query-HDBC
+       ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Meta package of Relational Record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record-examples" = callPackage
@@ -109090,13 +111884,12 @@ self: {
        sha256 = "0jpzn739xl1ylz6aja1czvkg4gjbgkag56pcja31mfx9xiv5jnmf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HDBC HDBC-session HDBC-sqlite3 names-th persistable-record
          relational-query relational-query-HDBC template-haskell time
        ];
        description = "Examples of Haskell Relationa Record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-schemas" = callPackage
@@ -109107,14 +111900,13 @@ self: {
        pname = "relational-schemas";
        version = "0.1.0.2";
        sha256 = "1267bv92z2k8s2cmn8sgw0i0vs3y2m8jyvnv969v15lrpsid1vvw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers persistable-record relational-query
          template-haskell time
        ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "RDBMSs' schema templates for relational-query";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relative-date" = callPackage
@@ -109124,11 +111916,12 @@ self: {
        pname = "relative-date";
        version = "0.0.1";
        sha256 = "052rk17flm5zp70wcl7ki3ys47hnaa2d5c1vjsap7bfkcg4lff66";
-       buildDepends = [ base concatenative datetime mtl parsec time ];
+       libraryHaskellDepends = [
+         base concatenative datetime mtl parsec time
+       ];
        jailbreak = true;
        description = "Durations and generalized time parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relit" = callPackage
@@ -109137,7 +111930,7 @@ self: {
        pname = "relit";
        version = "0.1.3";
        sha256 = "03cnra0yfpijp65p1x0wv4fvc1p1l27lcb00k22ijrcy2mxqr9cg";
-       buildDepends = [ base regex-base template-haskell ];
+       libraryHaskellDepends = [ base regex-base template-haskell ];
        description = "Literal for regular expression";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -109148,8 +111941,8 @@ self: {
        pname = "rematch";
        version = "0.2.0.0";
        sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr";
-       buildDepends = [ base ];
-       testDepends = [ base hspec HUnit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit ];
        description = "A simple api for matchers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -109160,8 +111953,8 @@ self: {
        pname = "rematch-text";
        version = "0.1.0.2";
        sha256 = "0q8jf7128360waq6k369ykp0hfjwydkm7f8ykwzd8xflmgfiywfd";
-       buildDepends = [ base rematch text ];
-       testDepends = [ base hspec HUnit rematch text ];
+       libraryHaskellDepends = [ base rematch text ];
+       testHaskellDepends = [ base hspec HUnit rematch text ];
        description = "`rematch` matchers for Data.Text";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -109175,7 +111968,7 @@ self: {
        pname = "remote";
        version = "0.1.1";
        sha256 = "14awzhpc21pp4iq53vz4ib81ygxsnlnfppv723zy77z6jja08gf0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath mtl network
          pureMD5 stm syb template-haskell time utf8-string
        ];
@@ -109192,7 +111985,9 @@ self: {
        sha256 = "0mgq2n92d4xk6yqzrbghlp0h18nmkyhxnv5zynrqykfw5h9xl0f8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base ghc ghc-paths json network ];
+       executableHaskellDepends = [
+         array base ghc ghc-paths json network
+       ];
        jailbreak = true;
        homepage = "https://github.com/octomarat/HaskellDebugger";
        description = "Interface to ghci debugger";
@@ -109213,14 +112008,14 @@ self: {
        pname = "remotion";
        version = "0.2.0";
        sha256 = "0m7x5i00i6ai39yii6h5vzlsp1rnmprmddqllqja57kdy3q7v7na";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring concurrent-extra containers directory errors
          filelock hashable hashtables lifted-async loch-th monad-control mtl
          network network-simple old-locale pipes pipes-bytestring
          pipes-cereal-plus pipes-network pipes-parse placeholders stm
          system-fileio system-filepath text time transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring concurrent-extra containers directory errors
          filelock hashable hashtables HTF HUnit lifted-async loch-th
          monad-control mtl network network-simple old-locale pipes
@@ -109241,7 +112036,7 @@ self: {
        pname = "reord";
        version = "0.0.0.2";
        sha256 = "07lxnfj0q565ydjzgcnb9dhjlrs7s1h6ybam7aic68lfd4p0hr7y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Ad-hoc Ord instances";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -109254,7 +112049,7 @@ self: {
        pname = "reorderable";
        version = "0.3.1";
        sha256 = "1i81yran553jdsyx0bx5g72dg6v24yk3g6l40m1cd430f8yy8a6f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints haskell-src-exts haskell-src-meta template-haskell
        ];
        jailbreak = true;
@@ -109271,7 +112066,7 @@ self: {
        pname = "repa";
        version = "3.4.0.1";
        sha256 = "197ab7z0fi50n3i8lkcxqazgnv39dv8dhndzihppsmfkil5y58l4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
        homepage = "http://repa.ouroborus.net";
@@ -109280,17 +112075,16 @@ self: {
      }) {};
 
   "repa-algorithms" = callPackage
-    ({ mkDerivation, base, llvm, repa, vector }:
+    ({ mkDerivation, base, repa, vector }:
      mkDerivation {
        pname = "repa-algorithms";
        version = "3.4.0.1";
        sha256 = "0q8jwp1msg5icvcqxszh5c1190llwz17gxc7nmd1bkyca59j8w0l";
-       buildDepends = [ base repa vector ];
-       extraLibraries = [ llvm ];
+       libraryHaskellDepends = [ base repa vector ];
        homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {};
 
   "repa-array" = callPackage
     ({ mkDerivation, base, bytestring, double-conversion, mtl
@@ -109300,7 +112094,7 @@ self: {
        pname = "repa-array";
        version = "4.1.0.1";
        sha256 = "04bi2j2y5rrpkfzys6ma0d5fhsrapip0xb43gqsgcqz3rk89lank";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring double-conversion mtl primitive repa-convert
          repa-eval repa-stream text vector
        ];
@@ -109317,7 +112111,7 @@ self: {
        pname = "repa-bytestring";
        version = "3.0.0.1";
        sha256 = "1q7kvm39iqabanrgyi438n8mfn1ikvpygralyakfc02rm2gpl0gb";
-       buildDepends = [ base repa ];
+       libraryHaskellDepends = [ base repa ];
        jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "(deprecated)";
@@ -109333,7 +112127,7 @@ self: {
        pname = "repa-convert";
        version = "4.2.0.1";
        sha256 = "0y7xjcbrm2g3rgppb9lqbj4m1l7bvir12gjg11a18fkl1mzdh89l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring double-conversion primitive repa-scalar vector
        ];
        homepage = "http://repa.ouroborus.net";
@@ -109347,8 +112141,8 @@ self: {
        pname = "repa-devil";
        version = "0.3.2.6";
        sha256 = "0f7xawg4qlfbf24lrjbpqzl3f3zf63f8g5b2gi17h0rpyw3cxhzy";
-       buildDepends = [ base repa transformers ];
-       extraLibraries = [ libdevil ];
+       libraryHaskellDepends = [ base repa transformers ];
+       librarySystemDepends = [ libdevil ];
        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;
@@ -109360,7 +112154,7 @@ self: {
        pname = "repa-eval";
        version = "4.0.0.1";
        sha256 = "0vng0y835gma937q1996qghfzx06wabxf7ln8ckrwy5djzza8h9y";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Low-level parallel operators on bulk random-accessble arrays";
@@ -109368,8 +112162,8 @@ self: {
      }) {};
 
   "repa-examples" = callPackage
-    ({ mkDerivation, base, llvm, QuickCheck, random, repa
-     , repa-algorithms, repa-io, template-haskell, vector
+    ({ mkDerivation, base, QuickCheck, random, repa, repa-algorithms
+     , repa-io, template-haskell, vector
      }:
      mkDerivation {
        pname = "repa-examples";
@@ -109377,15 +112171,14 @@ self: {
        sha256 = "00v1z4kscvmnd4k7lsswzaxafkk7mbsy4ghdd503wpvr4fvslgaz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base QuickCheck random repa repa-algorithms repa-io
          template-haskell vector
        ];
-       extraLibraries = [ llvm ];
        homepage = "http://repa.ouroborus.net";
        description = "Examples using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {};
 
   "repa-fftw" = callPackage
     ({ mkDerivation, base, carray, fft, repa, storable-complex, tasty
@@ -109395,8 +112188,10 @@ self: {
        pname = "repa-fftw";
        version = "3.2.3.2";
        sha256 = "0y05hjysf484nfdr2qs1mbs7znxi58q9f0kxfnkcbskijwxnj320";
-       buildDepends = [ base carray fft repa storable-complex ];
-       testDepends = [ base repa tasty tasty-hunit tasty-quickcheck ];
+       libraryHaskellDepends = [ base carray fft repa storable-complex ];
+       testHaskellDepends = [
+         base repa tasty tasty-hunit tasty-quickcheck
+       ];
        description = "Perform fft with repa via FFTW";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -109409,7 +112204,7 @@ self: {
        pname = "repa-flow";
        version = "4.1.0.1";
        sha256 = "0d3j4wc3f0rbxmmj2hq9m8m9hjnad6siard279xs7sd4qzwkcpg7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath primitive repa-array
          repa-eval repa-stream text vector
        ];
@@ -109428,7 +112223,9 @@ self: {
        pname = "repa-io";
        version = "3.4.0.1";
        sha256 = "06ks4gxsajnalxh9mpnl4pckxnyfc59823war3m74anb0pqcrbbl";
-       buildDepends = [ base binary bmp bytestring old-time repa vector ];
+       libraryHaskellDepends = [
+         base binary bmp bytestring old-time repa vector
+       ];
        homepage = "http://repa.ouroborus.net";
        description = "Read and write Repa arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
@@ -109440,7 +112237,7 @@ self: {
        pname = "repa-linear-algebra";
        version = "0.0.0.0";
        sha256 = "1y16rmdygxay46xbm617g944aazml48izzmkx46avvqvjyql96w1";
-       buildDepends = [ base hmatrix repa vector ];
+       libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
        description = "HMatrix operations for Repa";
        license = stdenv.lib.licenses.bsd3;
@@ -109454,7 +112251,7 @@ self: {
        pname = "repa-plugin";
        version = "1.0.0.1";
        sha256 = "0s644rlk6sqz8sb2rwak42153xxsp5vjpqhlxnmbic0b7r67s8y9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ddc-base ddc-core ddc-core-flow ddc-core-simpl ghc
          mtl
        ];
@@ -109472,7 +112269,7 @@ self: {
        pname = "repa-scalar";
        version = "4.2.0.1";
        sha256 = "1mby4xa0i2jrzhiyvayif6bwxsmfz1ibvigxw8kwxjd5hqc0y6f6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring double-conversion primitive vector
        ];
        homepage = "http://repa.ouroborus.net";
@@ -109486,7 +112283,7 @@ self: {
        pname = "repa-series";
        version = "1.0.0.1";
        sha256 = "1kldz4d4cv0vliqw78ywbcfgh0mw4i5cd93j0jdagvhsbhlxlp5k";
-       buildDepends = [ base ghc ghc-prim vector ];
+       libraryHaskellDepends = [ base ghc ghc-prim vector ];
        jailbreak = true;
        description = "Series Expressionss API";
        license = stdenv.lib.licenses.bsd3;
@@ -109503,8 +112300,11 @@ self: {
        sha256 = "0pgrdhi7s1capainmd6hq1h8wjzppyr8fn93fzygwjpvnnhfggk8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hsndfile hsndfile-vector repa vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base hsndfile repa ];
+       executableHaskellDepends = [
+         base hsndfile hsndfile-vector repa vector
+       ];
+       testHaskellDepends = [
          base directory filepath hsndfile hsndfile-vector repa vector
        ];
        description = "Reading and writing sound files with repa arrays";
@@ -109517,7 +112317,7 @@ self: {
        pname = "repa-stream";
        version = "4.1.0.1";
        sha256 = "17n48ixypx5a3anj212h4vxa6sqwk5yssjqyprb8lb3mnqfdlxmm";
-       buildDepends = [ base mtl primitive vector ];
+       libraryHaskellDepends = [ base mtl primitive vector ];
        jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Stream functions not present in the vector library";
@@ -109534,10 +112334,11 @@ self: {
        sha256 = "1d8spppfjbcb9smk735zxgpz1v1f5p1sm50nfzry68bdb1p29xnz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bmp bytestring containers deepseq gloss mtl repa transformers
-         v4l2 vector
+       libraryHaskellDepends = [
+         base bmp bytestring containers deepseq mtl repa transformers v4l2
+         vector
        ];
+       executableHaskellDepends = [ base gloss repa ];
        homepage = "https://github.com/cgo/hsimage";
        description = "Provides high-level access to webcams";
        license = "LGPL";
@@ -109550,7 +112351,9 @@ self: {
        pname = "repl";
        version = "1.1";
        sha256 = "0q9gk76r9n8gyn8fwqfmywbrjhyqy0gz8blmmvrvwghyfscabnh9";
-       buildDepends = [ base ghc ghc-paths haskell-src-exts parsec ];
+       libraryHaskellDepends = [
+         base ghc ghc-paths haskell-src-exts parsec
+       ];
        jailbreak = true;
        homepage = "https://github.com/mikeplus64/repl";
        description = "IRC friendly REPL library";
@@ -109568,7 +112371,7 @@ self: {
        pname = "repl-toolkit";
        version = "0.5.0.0";
        sha256 = "0m0jh734zfmxc2bfilb1ka12y3nhsm94hxcg0q6wwf6bxkl564vq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default directory exceptions filepath
          functor-monadic ListLike listsafe monad-loops mtl numericpeano
          parsec semigroupoids text transformers
@@ -109586,7 +112389,8 @@ self: {
        sha256 = "16qi3lpgymn61nssv9k21v889xszycimp6i5602llnry6ks77bij";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers haskeline mtl process ];
+       libraryHaskellDepends = [ base containers haskeline mtl ];
+       executableHaskellDepends = [ base containers mtl process ];
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -109603,12 +112407,13 @@ self: {
        sha256 = "0ada0xqpkp6ch71sizf8fscvz6rjq95asmfgdvg8jj8gwpzvlncs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html containers data-default directory dyre filepath
          filestore ixset lens mtl old-locale pandoc parsec stm text time
          transformers transformers-base transformers-compat
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base blaze-html containers directory filepath filestore hspec
          hspec-discover ixset lens mtl old-locale parsec QuickCheck stm text
          time transformers transformers-base transformers-compat
@@ -109627,7 +112432,7 @@ self: {
        pname = "repr";
        version = "0.4.1.3";
        sha256 = "1y1zl81yjc9jrci83bm6bn8hrfqf6x25vxzkhrkydhhwcwqfqaj5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols dstring random string-combinators
        ];
        jailbreak = true;
@@ -109643,7 +112448,7 @@ self: {
        pname = "repr-tree-syb";
        version = "0.1.0";
        sha256 = "1kpxfvbmfv3zhn0fx7fznnppqxjz2f70g5n89hzkiqjz2am0ls5s";
-       buildDepends = [ base containers syb text ];
+       libraryHaskellDepends = [ base containers syb text ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/repr-tree-syb";
        description = "Tree representation and pretty-printing of data structures based on SYB";
@@ -109659,7 +112464,7 @@ self: {
        pname = "representable-functors";
        version = "3.2.0.2";
        sha256 = "156rhm9hqxkwpv4ppg6647gz2q95mp61rx6ii0nk6i0ygmjvw1l2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad comonad-transformers comonads-fd containers
          contravariant distributive free keys mtl semigroupoids semigroups
          transformers
@@ -109677,7 +112482,7 @@ self: {
        pname = "representable-profunctors";
        version = "3.2";
        sha256 = "0bly94xix00krgl7iaxwb0l0bvykrm0zqz57m78p8j7pdmkr89wc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/representable-profunctors/";
        description = "This package has been absorbed into profunctor-extras";
        license = stdenv.lib.licenses.bsd3;
@@ -109693,7 +112498,7 @@ self: {
        pname = "representable-tries";
        version = "3.0.2";
        sha256 = "07qjm04xf9qndyybph4mhjp65yjvz54pia4y8kj7wps75gjail2m";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base bifunctors comonad comonad-transformers containers
          distributive keys mtl representable-functors semigroupoids
          semigroups transformers
@@ -109711,7 +112516,7 @@ self: {
        pname = "request-monad";
        version = "0.3.0.1";
        sha256 = "1aqcsm9a3zd11k7d4nbvxsy7l35fr77z7gyhrl7rvflnixid29ws";
-       buildDepends = [ base free mtl transformers ];
+       libraryHaskellDepends = [ base free mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/nahiluhmot/request-monad";
        description = "A transformer for generic requests";
@@ -109727,11 +112532,11 @@ self: {
        pname = "reroute";
        version = "0.3.0.2";
        sha256 = "14xkkcgqbg7bddln849h2k0xrrj9hfvw2ikai81snz7dsf3mcnb8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq graph-core hashable hvect mtl path-pieces regex-compat
          text transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hvect mtl text unordered-containers vector
        ];
        homepage = "http://github.com/agrafix/reroute";
@@ -109750,11 +112555,11 @@ self: {
        sha256 = "152pngw3xrlyrq905a231hi9hg3pf5ddpcihwic496rng5hd5hj2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-compat bytestring directory http-kit http-types network
          process unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-compat bytestring directory hspec http-conduit http-kit
          http-types network process QuickCheck unix warp
        ];
@@ -109772,7 +112577,7 @@ self: {
        sha256 = "1d64hg2nwhqzm720w25xgb4wv2akg0kv3iwwh2ivc57zp525xpcq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base Diff directory filepath mtl process unix
        ];
        homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
@@ -109789,8 +112594,8 @@ self: {
        pname = "resource-effect";
        version = "0.1.1";
        sha256 = "085ila27irk7pflx4kgn1p364wx2hj9wlm2lvdq0ix25hv8afxnb";
-       buildDepends = [ base containers extensible-effects ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers extensible-effects ];
+       testHaskellDepends = [
          base containers extensible-effects HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -109808,7 +112613,7 @@ self: {
        sha256 = "1i33z3rr72s5z2k6j5c10vjy7nslgfn3xqgwf8w05n9m2pwhn2fv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory ];
+       executableHaskellDepends = [ base bytestring directory ];
        homepage = "https://bitbucket.org/tdammers/resource-embed";
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
@@ -109823,7 +112628,7 @@ self: {
        pname = "resource-pool";
        version = "0.2.3.2";
        sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable monad-control stm time transformers transformers-base
          vector
        ];
@@ -109840,7 +112645,7 @@ self: {
        pname = "resource-pool-catchio";
        version = "0.2.1.0";
        sha256 = "0g9r6hnn01n3p2ikcfkfc4afh83pzam29zal3k2ivajpl3kramsw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable MonadCatchIO-transformers stm time transformers
          transformers-base vector
        ];
@@ -109857,7 +112662,7 @@ self: {
        pname = "resource-simple";
        version = "0.2";
        sha256 = "0m6jdhnq0f9anjm9bqmz3v8d0k12nkp4nks7mvhw7hjbjnkgscni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers monad-control monad-fork mtl-evil-instances
          transformers transformers-base
        ];
@@ -109876,11 +112681,11 @@ self: {
        pname = "resourcet";
        version = "1.1.6";
        sha256 = "0zhsaaa4n8ry76vjih519a8npm2hrzk10d5asrgllcwpzmifl41y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat
        ];
-       testDepends = [ base hspec lifted-base transformers ];
+       testHaskellDepends = [ base hspec lifted-base transformers ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
@@ -109900,13 +112705,16 @@ self: {
        sha256 = "0j2xafk6rrspffmd0fxsmmz8gnmxxn3dxngh684nwj4030cg9m3r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default-class
          exceptions fast-logger formatting HList http-media http-types lens
          monad-control monad-logger mtl path-pieces safe scientific
          template-haskell text time transformers transformers-base
          unordered-containers vector wai wai-extra warp
        ];
+       executableHaskellDepends = [
+         aeson base fast-logger http-types text wai
+       ];
        jailbreak = true;
        homepage = "https://github.com/raptros/respond";
        description = "process and route HTTP requests and generate responses on top of WAI";
@@ -109925,7 +112733,7 @@ self: {
        pname = "rest-client";
        version = "0.5.0.3";
        sha256 = "02lgdjn4800301w8cki2wyl65jzc4yp4gxrhz5lwv9jcy69gbkkb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson-utils base bytestring case-insensitive data-default
          exceptions http-conduit http-types hxt hxt-pickle-utils
          monad-control mtl resourcet rest-types tostring transformers
@@ -109947,14 +112755,14 @@ self: {
        pname = "rest-core";
        version = "0.36.0.5";
        sha256 = "1xvhhj03kyv39w8s330gn3pxz4431xmcbiacf6y8a4d0nd6fw8qf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
          rest-stringmap rest-types safe split text transformers
          transformers-compat unordered-containers uri-encode utf8-string
          uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit mtl test-framework test-framework-hunit
          transformers transformers-compat unordered-containers
        ];
@@ -109974,11 +112782,14 @@ self: {
        sha256 = "13mq7zhjwp57rials06kkj8aq400wapldl5mc35h1xynm396xmpi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers filepath generic-aeson generic-xmlpickler hxt
-         json-schema mtl rest-core rest-gen safe stm text time transformers
+         json-schema mtl rest-core safe stm text time transformers
          transformers-base transformers-compat unordered-containers
        ];
+       executableHaskellDepends = [
+         base mtl rest-core rest-gen transformers-compat
+       ];
        jailbreak = true;
        homepage = "http://www.github.com/silkapp/rest";
        description = "Example project for rest";
@@ -109997,13 +112808,13 @@ self: {
        pname = "rest-gen";
        version = "0.17.1.2";
        sha256 = "05imgbal0b6ab1i8b1896y1qm956ci7r0xx3qnkjbb6vxdl51vaa";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
          pretty process rest-core safe scientific semigroups split text
          uniplate unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
@@ -110019,7 +112830,7 @@ self: {
        pname = "rest-happstack";
        version = "0.2.10.8";
        sha256 = "0n1rc1b9vdq83ilm2s9ac96jln89g0g0img1pwg991dbm30k3v7y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
        description = "Rest driver for Happstack";
@@ -110034,7 +112845,7 @@ self: {
        pname = "rest-snap";
        version = "0.1.17.18";
        sha256 = "0g8srn4b7nxyi98vn28q27li4mk7ypdgg9l66ba7z5h0bg8w2766";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive rest-core safe snap-core
          unordered-containers uri-encode utf8-string
        ];
@@ -110050,7 +112861,7 @@ self: {
        pname = "rest-stringmap";
        version = "0.2.0.6";
        sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
        ];
@@ -110066,7 +112877,7 @@ self: {
        pname = "rest-types";
        version = "1.14.0.1";
        sha256 = "0chb91gb3xvfp7k4sbsp07ri2m5x26qj4q2bq0ldkxpk06jicmb4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base case-insensitive generic-aeson generic-xmlpickler hxt
          json-schema rest-stringmap text uuid
        ];
@@ -110083,7 +112894,7 @@ self: {
        pname = "rest-wai";
        version = "0.1.0.8";
        sha256 = "0r11y2rl0h2axnlqcqhdy7w0b3c207qbyhg60rr0rnm9vsqj5l5d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
        ];
@@ -110101,7 +112912,7 @@ self: {
        pname = "restful-snap";
        version = "0.2";
        sha256 = "16gqbk9wl2a1ivhq30yh584h7p2vd7qvwx1rprin47amqzn5b6gc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers data-default
          digestive-functors errors heist lens mtl old-locale readable snap
          snap-core snap-extras template-haskell text time xmlhtml
@@ -110121,7 +112932,7 @@ self: {
        pname = "restricted-workers";
        version = "0.1.1";
        sha256 = "0lxipqp8nsgw07hmb4b8rfxlfmfhj0l7sg8k0042qscys92rzg9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring cereal data-default directory either filepath
          monad-control mtl network selinux stm text transformers
          transformers-base unix
@@ -110141,7 +112952,8 @@ self: {
        sha256 = "0hzkdg4f5h96zqznnrbjbxrzv17gz1zvd5g4a51rrpsgpngkax7x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath utf8-string ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base directory filepath utf8-string ];
        jailbreak = true;
        description = "Convert between camel case and separated words style";
        license = stdenv.lib.licenses.mit;
@@ -110154,7 +112966,7 @@ self: {
        pname = "resumable-exceptions";
        version = "0.0.0.20100920";
        sha256 = "06lzjf8dcbxks57x434n27146whryzzpwcn8bq2mclwfcrv9g3gs";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "A monad transformer for resumable exceptions";
        license = "unknown";
@@ -110172,16 +112984,16 @@ self: {
        sha256 = "09digdn4a9vsmanpj6d2wn6kh59r05cfwjk4xq22iszzjrxami6d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base base64-bytestring binary bytestring
-         containers data-default mtl network scientific text time
-         unordered-containers utf8-string vector
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary bytestring containers
+         data-default mtl network scientific text time unordered-containers
+         utf8-string vector
        ];
-       testDepends = [ base doctest ];
+       executableHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.0";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb-client-driver" = callPackage
@@ -110194,11 +113006,11 @@ self: {
        pname = "rethinkdb-client-driver";
        version = "0.0.19";
        sha256 = "0yzmypflg133dzy5yj2jmdk450zmr237prjvnaf9343jiy143nyi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hspec-smallcheck smallcheck text time
          unordered-containers vector
        ];
@@ -110216,7 +113028,7 @@ self: {
        pname = "rethinkdb-model";
        version = "0.1.0.2";
        sha256 = "15993912bw3v09c6fiqnjcjcpd77px61kq276v1aaqdbahzpzw2q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base mtl rethinkdb text transformers unordered-containers
        ];
        jailbreak = true;
@@ -110236,7 +113048,7 @@ self: {
        pname = "rethinkdb-wereHamster";
        version = "1.8.0.5";
        sha256 = "0wkxf1iixy9rnl2rawima61qpjz77g4w08dd13q004g6c1n0h6kq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default ghc-prim
          mtl network protocol-buffers protocol-buffers-descriptor text time
          unordered-containers utf8-string vector
@@ -110244,7 +113056,6 @@ self: {
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "RethinkDB driver for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "retry" = callPackage
@@ -110255,8 +113066,10 @@ self: {
        pname = "retry";
        version = "0.6";
        sha256 = "1ry2zqs5361mg5ibnd6awjpl3nl3a6ha18m0v2f28hs9kw6dnsgj";
-       buildDepends = [ base data-default-class exceptions transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base data-default-class exceptions transformers
+       ];
+       testHaskellDepends = [
          base data-default-class exceptions hspec HUnit QuickCheck time
          transformers
        ];
@@ -110274,7 +113087,7 @@ self: {
        sha256 = "1rvblmzlsyfvvvjz71ngb8l412rrr943s7pp75gqjcxnklnlc97j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base optparse-applicative process ];
+       executableHaskellDepends = [ base optparse-applicative process ];
        jailbreak = true;
        homepage = "https://github.com/dgonyeo/retryer";
        description = "Retry failed commands";
@@ -110287,7 +113100,7 @@ self: {
        pname = "rev-state";
        version = "0.1";
        sha256 = "1lsq7b225v86rwm2rnrnhn28asjh6r3zwbvdm5vl4sp46cr5i4cf";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/DanBurton/rev-state#readme";
        description = "Reverse State monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -110301,7 +113114,7 @@ self: {
        sha256 = "0lbf7dclcdvy56b7wjyq3iam757wf4vic4b5qyxd4bffk66q3asm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base old-time ];
+       executableHaskellDepends = [ base old-time ];
        description = "A French revolutionary decimal time (metric) clock";
        license = "GPL";
      }) {};
@@ -110312,7 +113125,7 @@ self: {
        pname = "reverse-apply";
        version = "2.0.1";
        sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Standard version of the reverse apply operator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110325,7 +113138,7 @@ self: {
        pname = "reverse-geocoding";
        version = "0.2.1";
        sha256 = "089p1fv1ghznfsnhw1bdnwna3hcxmmqakw2qgzg91w5gifzaf18s";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
        jailbreak = true;
@@ -110342,7 +113155,7 @@ self: {
        sha256 = "1dddlldp55c6l7g5n2gi8r1r0f8r6r3ipq9mlx11d54j8wmvvlnz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base process ];
+       executableHaskellDepends = [ array base process ];
        jailbreak = true;
        description = "Text-only reversi (aka othelo) game";
        license = stdenv.lib.licenses.gpl3;
@@ -110356,7 +113169,9 @@ self: {
        sha256 = "10cbsjilc4nv4hi4ipb078hiy7afnjl20f9kcda15pmpmqxxywjg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory multiarg process ];
+       executableHaskellDepends = [
+         base bytestring directory multiarg process
+       ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/rewrite";
        description = "open file and rewrite it with new contents";
@@ -110370,7 +113185,7 @@ self: {
        pname = "rewriting";
        version = "0.2.2";
        sha256 = "0gnd8awqjnm905m29yldy3z7w7jvilj5svijz63lzmwbjknfh6bs";
-       buildDepends = [ base containers regular ];
+       libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110384,7 +113199,7 @@ self: {
        pname = "rex";
        version = "0.5.1";
        sha256 = "18g09pg7hhj052v72vncjvy900h3xhza8hl2g3akad8asn9k6jl6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers haskell-src-exts haskell-src-meta
          pcre-light template-haskell
        ];
@@ -110403,7 +113218,7 @@ self: {
        sha256 = "122hca6whzxqk3x7207k4clrrl2awy96pafq0gjwddqicny41jza";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers datetime HTTP json mtl nano-md5 xhtml
        ];
        jailbreak = true;
@@ -110418,7 +113233,7 @@ self: {
        pname = "rfc3339";
        version = "1.0.5";
        sha256 = "1p3nahcmsikrc5maf7qz45042h80m6xszx70154yq169rsqkvav0";
-       buildDepends = [ base timerep ];
+       libraryHaskellDepends = [ base timerep ];
        description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110432,7 +113247,8 @@ self: {
        sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       executableHaskellDepends = [ base bytestring containers ];
        description = "Simple unicode collation as per RFC5051";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110447,7 +113263,9 @@ self: {
        sha256 = "08ddm1pxi7qdjz2mgvjvwdgxyskvac4ahi3jp2fd8z1sh68c7x7s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base call containers lens mtl objective split ];
+       executableHaskellDepends = [
+         base call containers lens mtl objective split
+       ];
        homepage = "https://github.com/fumieval/rhythm-game-tutorial";
        description = "Haskell rhythm game tutorial";
        license = stdenv.lib.licenses.bsd3;
@@ -110464,12 +113282,12 @@ self: {
        pname = "riak";
        version = "0.8.0.0";
        sha256 = "16ncq22vhg62p1v1ch1jc1z3xds1qsr536fg3awvp7a0a8vyq528";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base binary blaze-builder bytestring containers
          monad-control network protocol-buffers-fork pureMD5 random
          resource-pool riak-protobuf text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
@@ -110487,7 +113305,7 @@ self: {
        pname = "riak-protobuf";
        version = "0.19.0.0";
        sha256 = "1954f8hgibmilqpf72pp2yf8nx9cm60gfk1ypmb99h69lf8d5x1y";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base parsec protocol-buffers-descriptor-fork
          protocol-buffers-fork
        ];
@@ -110503,7 +113321,7 @@ self: {
        pname = "richreports";
        version = "0.0.3.0";
        sha256 = "0mik0m6nziwm6z517wkxdmjp92nh3qz1m8yk3x5897zafgs1y5kk";
-       buildDepends = [ ascetic base MissingH ];
+       libraryHaskellDepends = [ ascetic base MissingH ];
        description = "Integrated pretty-printing and error/static analysis reporting";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -110518,11 +113336,11 @@ self: {
        pname = "riemann";
        version = "0.1.0.1";
        sha256 = "0d36ff839g7y1lm8dg5j5s1vdxr1hqbyjxh7gsfjca00a0cgy5xa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal containers data-default either errors lens network
          protobuf text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base either errors HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -110542,9 +113360,10 @@ self: {
        sha256 = "1970bsg1ngc6mzsyj8mapzar0h1wkdb4skfz64d0ccdfpipp5hdb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring either filepath transformers
+       libraryHaskellDepends = [
+         base binary bytestring either transformers
        ];
+       executableHaskellDepends = [ base bytestring filepath ];
        jailbreak = true;
        homepage = "https://bitbucket.org/robertmassaioli/riff/overview";
        description = "RIFF parser for Haskell";
@@ -110557,7 +113376,7 @@ self: {
        pname = "ring-buffer";
        version = "0.1.1";
        sha256 = "03v2xxj1gd35738qrhxcl0d3bx6pps4l1singb0yg1smrx5nkpp7";
-       buildDepends = [ base mtl primitive vector ];
+       libraryHaskellDepends = [ base mtl primitive vector ];
        homepage = "http://github.com/bgamari/ring-buffer";
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
@@ -110573,11 +113392,11 @@ self: {
        sha256 = "1dgdwr9d0jl3r78f4shx0ff22vqlq72n5w5whw3ppirm8ccxf0ms";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory haskell98 mtl old-locale packedstring
          process unix
        ];
-       extraLibraries = [ ncurses ];
+       executableSystemDepends = [ ncurses ];
        homepage = "http://modeemi.fi/~tuomov/riot/";
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
@@ -110594,7 +113413,7 @@ self: {
        pname = "ripple";
        version = "0.3";
        sha256 = "1y19kp63chg4ljcccq6cp9n3g26x6jyyhch3jqj04ya9c16cbypw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base58address binary bytestring cereal
          crypto-api crypto-pubkey-types cryptohash-cryptoapi ecdsa errors
          largeword text time transformers utility-ht websockets
@@ -110614,7 +113433,7 @@ self: {
        pname = "ripple-federation";
        version = "0.3";
        sha256 = "0m7mlv8qmw257hnk9lngxvq3nskninl88f5hl77r7w8r5hbymf0s";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base58address blaze-builder bytestring errors
          http-streams http-types io-streams network-uri text unexceptionalio
        ];
@@ -110633,8 +113452,8 @@ self: {
        sha256 = "0i0fkg4vys3n31jwazrajirywxmk7idjv2kz3nlb8kwriqc6d723";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl pretty ];
-       buildTools = [ alex happy ];
+       executableHaskellDepends = [ array base containers mtl pretty ];
+       executableToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://www2.tcs.ifi.lmu.de/~abel/";
        description = "Reduced instruction set i386 simulator";
@@ -110648,7 +113467,7 @@ self: {
        pname = "rivers";
        version = "0.1.0";
        sha256 = "0x7r04mwxwnqckfk865dckml4am11zx80a9k5kc91kz5ikq1ns64";
-       buildDepends = [ base lazysmallcheck oeis QuickCheck ];
+       libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/d-rive/rivers";
        description = "Rivers are like Streams, but different";
@@ -110664,7 +113483,7 @@ self: {
        sha256 = "1hiwgn0xyl42y9cmmc25464y42w7grf68xv8cvjznwzv0v1v63cg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base rivet-core rivet-simple-deploy ];
+       executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
        homepage = "https://github.com/dbp/rivet";
        description = "A project management tool for Haskell applications";
        license = stdenv.lib.licenses.bsd3;
@@ -110679,7 +113498,7 @@ self: {
        pname = "rivet-core";
        version = "0.1.0.1";
        sha256 = "102zgb1ryfl341h8r9hxm9zbmg8jq67bkn57hxhnfsjxv7952x21";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator directory directory-tree filepath
          postgresql-simple process shake template-haskell text time
          unordered-containers
@@ -110695,7 +113514,7 @@ self: {
        pname = "rivet-migration";
        version = "0.1.0.1";
        sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd";
-       buildDepends = [ base postgresql-simple text ];
+       libraryHaskellDepends = [ base postgresql-simple text ];
        homepage = "https://github.com/dbp/rivet";
        description = "Postgresql migration support for project management tool";
        license = stdenv.lib.licenses.bsd3;
@@ -110707,7 +113526,7 @@ self: {
        pname = "rivet-simple-deploy";
        version = "0.1.0.0";
        sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf";
-       buildDepends = [ base configurator mtl rivet-core text ];
+       libraryHaskellDepends = [ base configurator mtl rivet-core text ];
        homepage = "https://github.com/dbp/rivet";
        description = "Basic deployment support for project management tool";
        license = stdenv.lib.licenses.bsd3;
@@ -110723,9 +113542,13 @@ self: {
        sha256 = "0672j0xjlhyyfq2fbvnfc0gahihpkkcfh7nnbwh1salgy0ykzhq0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 exceptions network
-         network-simple parsec random transformers
+         network-simple parsec transformers
+       ];
+       executableHaskellDepends = [
+         base binary bytestring data-binary-ieee754 exceptions network
+         network-simple random transformers
        ];
        jailbreak = true;
        description = "A Haskell codec for RL-Glue";
@@ -110740,8 +113563,8 @@ self: {
        pname = "rmonad";
        version = "0.8.0.2";
        sha256 = "1pamp8n88f1y4q0q83vmvbqbfva03prcfdqfj3x888mjwxgh6h8l";
-       buildDepends = [ base containers suitable transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers suitable transformers ];
+       testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "Restricted monad library";
@@ -110759,10 +113582,13 @@ self: {
        sha256 = "086cq7b7x0l98q5di2bpbv9vjrhl7b62nlzwchdl8pqb5w83345m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cipher-aes io-streams mtl pbkdf QuickCheck random
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring cipher-aes io-streams
+       ];
+       testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        jailbreak = true;
@@ -110776,7 +113602,7 @@ self: {
        pname = "rng-utils";
        version = "0.2.1";
        sha256 = "11yy6v0dbdf0cn823vlyd90zc5q5aw0zjzylpz5s9c94wsd4pjfa";
-       buildDepends = [ base bytestring mwc-random vector ];
+       libraryHaskellDepends = [ base bytestring mwc-random vector ];
        description = "RNG within an MVar for convenient concurrent use";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110787,11 +113613,12 @@ self: {
        pname = "robot";
        version = "1.4";
        sha256 = "1vac4ks3kdyf9wdiiw224rz2nm5859np7cqjpl5mrb2h27bycv5c";
-       buildDepends = [ base containers exceptions transformers xhb ];
+       libraryHaskellDepends = [
+         base containers exceptions transformers xhb
+       ];
        homepage = "https://github.com/lfairy/robot";
        description = "Simulate keyboard and mouse events";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "robots-txt" = callPackage
@@ -110802,8 +113629,10 @@ self: {
        pname = "robots-txt";
        version = "0.4.1.3";
        sha256 = "051ibkbhqlpimajj8gl0m468rs6qhlgs15f5bcrhlngfs20jbfkq";
-       buildDepends = [ attoparsec base bytestring old-locale time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring old-locale time
+       ];
+       testHaskellDepends = [
          attoparsec base bytestring directory heredoc hspec QuickCheck
          transformers
        ];
@@ -110821,10 +113650,10 @@ self: {
        pname = "rocksdb-haskell";
        version = "0.1.0";
        sha256 = "1wi8mc0xzdd47r2vxa1x4gmbm4yikp4pyfj00ycnydvs4b2n3iad";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default filepath resourcet transformers
        ];
-       extraLibraries = [ rocksdb ];
+       librarySystemDepends = [ rocksdb ];
        homepage = "http://github.com/agrafix/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
@@ -110840,7 +113669,7 @@ self: {
        sha256 = "0xnpji131pva54drxjqra5nkciqljf4x6zylm3snzs8s4c7klak6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath old-time process
        ];
        homepage = "http://roguestar.downstairspeople.org/";
@@ -110860,7 +113689,7 @@ self: {
        sha256 = "056080bzdmrn6k0c9lx2d69l2ygal275xlkd6y31sj2ax9yizqkv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers data-memocombinators hslogger
          MaybeT MonadRandom mtl old-time parallel priority-sync PSQueue
          random stm
@@ -110881,7 +113710,7 @@ self: {
        pname = "roguestar-gl";
        version = "0.6.0.1";
        sha256 = "1lajrc6ay1vk9rbi3x8mx56rrsxkihmapzfm7l8aav2jx0wwryzs";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base bytestring containers filepath GLUT MonadRandom mtl
          OpenGL priority-sync random rsagl rsagl-frp rsagl-math stm
        ];
@@ -110900,7 +113729,7 @@ self: {
        sha256 = "13kg8mabh0y1a48zjx9f9k207i5qn0hkabjyg10ha5d0kf36xbyh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT roguestar-gl rsagl ];
+       executableHaskellDepends = [ base GLUT roguestar-gl rsagl ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
        description = "Sci-fi roguelike game. GLUT front-end.";
@@ -110916,7 +113745,7 @@ self: {
        pname = "rollbar";
        version = "0.3.1";
        sha256 = "0hv9i38c0c1bv36xy4inq6dghn79bmjw1x0xgi5mlwf5lzzp2fv1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base basic-prelude http-conduit monad-control network text
          vector
        ];
@@ -110935,7 +113764,10 @@ self: {
        sha256 = "07bicx83h66xmy3i2jszl5awkxw6fvy9y5r3v4hq2rz86z09zw0s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base optparse-applicative random regex-applicative
+       ];
+       executableHaskellDepends = [
          base optparse-applicative random regex-applicative
        ];
        jailbreak = true;
@@ -110950,7 +113782,7 @@ self: {
        pname = "rolling-queue";
        version = "0.1";
        sha256 = "1l39dlq8pn38b48iwqgrnh83h74qkmm34l5m9a0rbg76s2z04c43";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/joeyadams/haskell-rolling-queue";
        description = "Bounded channel for STM that discards old entries when full";
        license = stdenv.lib.licenses.bsd3;
@@ -110962,7 +113794,9 @@ self: {
        pname = "roman-numerals";
        version = "0.5.1.5";
        sha256 = "10da5vls9l5i255bapms4b2r7dnwmxgsaa1cdll2lrmid5dikixr";
-       buildDepends = [ base base-unicode-symbols bytestring text ];
+       libraryHaskellDepends = [
+         base base-unicode-symbols bytestring text
+       ];
        homepage = "https://github.com/roelvandijk/roman-numerals";
        description = "Parsing and pretty printing of Roman numerals";
        license = stdenv.lib.licenses.bsd3;
@@ -110976,8 +113810,8 @@ self: {
        pname = "romkan";
        version = "0.1.0.0";
        sha256 = "094z59jbkpy6gv51kf990q4fgmjyylifc63ij4kcdm0hlhmrmdc8";
-       buildDepends = [ attoparsec base containers text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base containers text ];
+       testHaskellDepends = [
          attoparsec base containers HUnit test-framework
          test-framework-hunit text
        ];
@@ -110992,7 +113826,7 @@ self: {
        pname = "roots";
        version = "0.1.1.2";
        sha256 = "0xzsz4w153mbkkkv07558xkv83fph4g98hvjf6iljwvbbp47l0j9";
-       buildDepends = [ base tagged ];
+       libraryHaskellDepends = [ base tagged ];
        homepage = "/dev/null";
        description = "Root-finding algorithms (1-dimensional)";
        license = stdenv.lib.licenses.publicDomain;
@@ -111004,7 +113838,9 @@ self: {
        pname = "rope";
        version = "0.6.4";
        sha256 = "1g77bv2mmfhy2mkb08k92m3f2jab6p2la2s7rfib2r1jy6lq5vhb";
-       buildDepends = [ base bytestring fingertree mtl utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring fingertree mtl utf8-string
+       ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/rope";
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
@@ -111022,7 +113858,7 @@ self: {
        sha256 = "0qnvv8vyijjgb51pw5zfcmxy96nnnfrsvbg8xrnmq3p34xc168gb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson argparser base bytestring lens process text
          unordered-containers vector wreq
        ];
@@ -111039,10 +113875,12 @@ self: {
        pname = "rose-trees";
        version = "0.0.1.1";
        sha256 = "0ii9jxyd7q0x30zyp1gal29msd81n5vj613mkxxavjlz9ar9gvgx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default pseudo-trie semigroups transformers
        ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "A collection of rose tree structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111053,7 +113891,7 @@ self: {
        pname = "rosezipper";
        version = "0.2";
        sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Generic zipper implementation for Data.Tree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111072,14 +113910,17 @@ self: {
        sha256 = "12sa8ir9cl2gygayk3vhd00shv3wy3sqyhf4hh6arml5q7wz1f3m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base binary BoundedChan bytestring Cabal containers
-         data-default-generics deepseq directory filemanip filepath haxr mtl
-         network parsec process pureMD5 SafeSemaphore snap-core snap-server
-         stm storable-tuple template-haskell time transformers unix uri
-         utf8-string vector vector-space xml
+       libraryHaskellDepends = [
+         base binary BoundedChan bytestring Cabal containers directory
+         filemanip filepath haxr mtl network parsec process SafeSemaphore
+         snap-core snap-server stm storable-tuple template-haskell time
+         transformers unix uri utf8-string vector vector-space xml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         attoparsec base binary bytestring containers data-default-generics
+         deepseq directory filemanip filepath mtl process pureMD5 vector xml
+       ];
+       testHaskellDepends = [
          attoparsec base bytestring containers data-default-generics
          filepath mtl pureMD5 tasty tasty-hunit testpack transformers
        ];
@@ -111095,7 +113936,7 @@ self: {
        pname = "rosso";
        version = "1.0";
        sha256 = "0cz5kqpvq9qjkdy2x3y6aqia3armawjjsnv2pxifl0l6f9hhrvis";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111107,8 +113948,8 @@ self: {
        pname = "rot13";
        version = "0.1.0.2";
        sha256 = "0d9c0zfc92xfp5v5dp83w2897pg2gyz9n14xpggakwk6ynfmf6hd";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/kvanberendonck/codec-rot13";
        description = "Fast ROT13 cipher for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -111122,10 +113963,10 @@ self: {
        pname = "rotating-log";
        version = "0.2";
        sha256 = "1gqdfzdz3nwp6mjy61a49kwhcrykjl00aq9gq1v68li6z75zf85k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath old-locale time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath old-locale time
        ];
        license = stdenv.lib.licenses.bsd3;
@@ -111138,7 +113979,7 @@ self: {
        pname = "rounding";
        version = "0.3.0";
        sha256 = "1d2vaijcna8gwcrhsjpclqw4gjdvdpmnrlyszqzcxnqf0l206a6y";
-       buildDepends = [ array base numeric-extras ];
+       libraryHaskellDepends = [ array base numeric-extras ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/ekmett/rounding";
        description = "Explicit floating point rounding mode wrappers";
@@ -111154,7 +113995,7 @@ self: {
        pname = "roundtrip";
        version = "0.2.0.3";
        sha256 = "1q7n8fnlf9kg4647pm2a3s347dzj7qp29f6hkr0rqfmzp774zwhi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers pretty safe template-haskell text xml-types
        ];
        description = "Bidirectional (de-)serialization";
@@ -111171,17 +114012,18 @@ self: {
        pname = "roundtrip-aeson";
        version = "0.2.0.0";
        sha256 = "0m96447l2m0y4aapil077xpnzlkjla0yp2bzajfijik9gkjbiih4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers lens lens-aeson roundtrip
          scientific text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring lens-aeson roundtrip text vector
        ];
        jailbreak = true;
        homepage = "https://github.com/anchor/roundtrip-aeson";
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-string" = callPackage
@@ -111190,7 +114032,7 @@ self: {
        pname = "roundtrip-string";
        version = "0.1.0.1";
        sha256 = "1lad64y877rf36dgldkc7qcg5xagjc00z4cf2r1ahamv379df8d7";
-       buildDepends = [ base mtl parsec roundtrip ];
+       libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111208,7 +114050,7 @@ self: {
        sha256 = "1gl649saiaj1biqda64wmpbnv5f3njm3rmfgvf1iavyliqgrwn9m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-builder-enumerator bytestring containers
          enumerator mtl pretty reference roundtrip roundtrip-string safe
          text xml-enumerator xml-types
@@ -111226,7 +114068,9 @@ self: {
        sha256 = "0bfrb3mz9nxrl4l5pikrp3x4igq4w9jlmvwikyc71ph8ks6rghc6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ attoparsec base network text yesod-routes ];
+       executableHaskellDepends = [
+         attoparsec base network text yesod-routes
+       ];
        homepage = "http://github.com/singpolyma/route-generator";
        description = "Utility to generate routes for use with yesod-routes";
        license = "unknown";
@@ -111241,10 +114085,12 @@ self: {
        pname = "route-planning";
        version = "0.0.3";
        sha256 = "0l3z9hjd8xqnahffg930qi13pf8cpiq44diqmpmh1narcllcbgj7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers coordinate lens semigroupoids semigroups text xsd
        ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/route";
        description = "A library and utilities for creating a route";
        license = stdenv.lib.licenses.bsd3;
@@ -111257,7 +114103,7 @@ self: {
        pname = "rowrecord";
        version = "0.1";
        sha256 = "0gcrdy75f0rqfayn37frwcixb086x4s7dygphxhxbpvyl8sjnl0l";
-       buildDepends = [ base containers template-haskell ];
+       libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111271,7 +114117,7 @@ self: {
        pname = "rpc";
        version = "0.0.1";
        sha256 = "0bw92pmnkfq1azw08ygpmp1z856l3ybhmxkfhy4sfds769k2s4j9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers derive network-fancy
          template-haskell th-lift
        ];
@@ -111290,9 +114136,10 @@ self: {
        sha256 = "0avjbw9zsa6nsjlwmb1lll0n80j9ggniwpy9sllaam83r6jpxhqq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl network template-haskell transformers
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/mmirman/rpc-framework";
        description = "a remote procedure call framework";
@@ -111310,7 +114157,7 @@ self: {
        sha256 = "0x40j5rk8v61wzhcj730g75a97ikki7j22dfrh4z873b6mxwfh4k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          appar base blaze-builder bytestring c10k containers dns domain-auth
          hslogger iproute parsec unix
        ];
@@ -111327,7 +114174,7 @@ self: {
        sha256 = "1wvaf1llcw4xcp8hmd80scqlk490qfiv5sqncpjmafw7zanrab4z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath HaXml process ];
+       libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111343,7 +114190,7 @@ self: {
        pname = "rsagl";
        version = "0.6.0.1";
        sha256 = "0f1f6kksrz1ghn6jhbdqsh4rhpkp65ccc4ci2fn5kmmw7qxzal59";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base containers data-memocombinators deepseq mtl
          old-time OpenGL OpenGLRaw parallel parsec random rsagl-frp
          rsagl-math stm Vec Vec-OpenGLRaw
@@ -111363,7 +114210,7 @@ self: {
        pname = "rsagl-frp";
        version = "0.6.0.1";
        sha256 = "0lim4slnhy1sq449kmvs489xy4axryn6qkk32hkzmlwvw8hqpl01";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base containers mtl old-time random rsagl-math stm
        ];
        jailbreak = true;
@@ -111381,7 +114228,7 @@ self: {
        pname = "rsagl-math";
        version = "0.6.0.1";
        sha256 = "04i1l6zb1jm784gdr86jrfm5m999px7ymzwwr5nyh69dk1730znn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers deepseq OpenGL OpenGLRaw parallel parsec
          random Vec Vec-OpenGLRaw
        ];
@@ -111398,7 +114245,7 @@ self: {
        pname = "rspp";
        version = "0.1.0.0";
        sha256 = "1rlx6hzw987jng2wmm2igfqlfym06wk8wxvqpb4v1zgqb00rabpc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/AJChapman/rspp";
        description = "A Rational Street Performer Protocol solver";
@@ -111413,7 +114260,9 @@ self: {
        pname = "rss";
        version = "3000.2.0.5";
        sha256 = "0ydr6wqmac6bk3bn69fgay66rc2xap99jgz1gg5z09mhhv3bjmb1";
-       buildDepends = [ base HaXml network network-uri old-locale time ];
+       libraryHaskellDepends = [
+         base HaXml network network-uri old-locale time
+       ];
        homepage = "https://github.com/basvandijk/rss";
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
@@ -111431,7 +114280,7 @@ self: {
        sha256 = "0gflfr97y2ypm9h5alm5c851pc0171p8wckdqdhr4wb6r844g8dw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cabal-file-th cmdargs containers deepseq feed
          http-client http-conduit http-types io-storage irc network
          old-locale parsec regexpr resourcet safe split text time
@@ -111450,7 +114299,7 @@ self: {
        pname = "rtld";
        version = "0.0.2";
        sha256 = "18y55lv3vyl4kpwzphw5gb1jsvp1f6i4dqh9rs6i9fyvabndvfik";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kkardzis/rtld";
        description = "dynamic linker tools for Haskell";
        license = "unknown";
@@ -111462,9 +114311,9 @@ self: {
        pname = "rtlsdr";
        version = "0.1.0.4";
        sha256 = "090m8qsj9g0xr8ybyiik6vrc9j7bvgmgp42vznank3nklrmkxbgz";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ rtl-sdr ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ rtl-sdr ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
@@ -111478,7 +114327,7 @@ self: {
        pname = "rtorrent-rpc";
        version = "0.2.2.0";
        sha256 = "0k14m4r0zsalngb6c4dckr7z521mymabc0ihk0zz402l7s13n68s";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring deepseq haxr
          mtl network split utf8-string
        ];
@@ -111496,11 +114345,11 @@ self: {
        pname = "rtorrent-state";
        version = "0.1.0.1";
        sha256 = "0lh7plp9qwlya0dnfvz2sg8nhg42vnrypi2p8rh6i278glniwn90";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bencoding bytestring containers directory filepath lens
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bencoding bytestring containers directory filepath hspec
          QuickCheck temporary utf8-string
        ];
@@ -111515,11 +114364,10 @@ self: {
        pname = "rubberband";
        version = "0.1.0.2";
        sha256 = "15j402a7vwrx6sjn29jrby4qxc27c1aa4mkbalssn8jlpjhlpffm";
-       buildDepends = [ base vector ];
-       testDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ rubberband ];
-       pkgconfigDepends = [ rubberband ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ rubberband ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
@@ -111534,10 +114382,10 @@ self: {
        pname = "ruby-marshal";
        version = "0.1.0";
        sha256 = "1dmlgks7wfs82k9dxkgi35q4sa0a7ljpcw86j25k85vbclzpyp7j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers mtl string-conv vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal containers hspec mtl string-conv vector
        ];
        homepage = "https://github.com/filib/ruby-marshal";
@@ -111553,7 +114401,7 @@ self: {
        pname = "ruby-qq";
        version = "0.1.0.0";
        sha256 = "1d2a31kiiv0p8d2yygpg8mgrz0xy6zh5qnf49hz70yk2vavkcac1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring haskell-src-exts haskell-src-meta pcre-light
          process template-haskell trifecta
        ];
@@ -111569,7 +114417,7 @@ self: {
        pname = "ruff";
        version = "0.4";
        sha256 = "09gj31p5cbjdns7d2xs2s08kpaks0bqnhzbf93xypci6zr6gxvyl";
-       buildDepends = [ array base mtl parsec safe strict Vec ];
+       libraryHaskellDepends = [ array base mtl parsec safe strict Vec ];
        homepage = "https://gitorious.org/ruff";
        description = "relatively useful fractal functions";
        license = stdenv.lib.licenses.bsd3;
@@ -111586,7 +114434,7 @@ self: {
        sha256 = "1kcca2h3gvp63s9frnq4dmhaiw5pxhk5ji86bar0cwyrc9all8v5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl shuffle uhc-util uuagc uuagc-cabal uulib
        ];
        homepage = "https://github.com/UU-ComputerScience/ruler";
@@ -111604,7 +114452,7 @@ self: {
        sha256 = "06c55pdfkh9vcmmzlf485d0qxczgd2xj1ajkz277df72p29xvrgd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory fgl filepath haskell98 mtl uuagc
          uulib
        ];
@@ -111619,7 +114467,7 @@ self: {
        pname = "rungekutta";
        version = "1.0.2";
        sha256 = "07drd0xvkg06p2fsbncafnr7wzkrs4m6sfs1szbbscggw3pxh4fp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111635,7 +114483,7 @@ self: {
        sha256 = "1vn08xdisdf5l3ps6bcpg3rvl89209f3ig504w7ysqbjgdib96n0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory filepath old-time process
        ];
        homepage = "https://github.com/bacchanalia/runghc";
@@ -111649,7 +114497,7 @@ self: {
        pname = "runmemo";
        version = "1.0.0.1";
        sha256 = "12fn0lsil0rj0pj0ixzppsdw2fmj0cnzci4fh11z9rcggwbz6pms";
-       testDepends = [ base data-memocombinators time ];
+       testHaskellDepends = [ base data-memocombinators time ];
        homepage = "https://github.com/DanBurton/runmemo";
        description = "A simple memoization helper library";
        license = stdenv.lib.licenses.bsd3;
@@ -111663,7 +114511,9 @@ self: {
        pname = "rvar";
        version = "0.2.0.2";
        sha256 = "1n24fl27mrm7cndp8b646b9c5hjm3hf5m12y9ni0f850dd739jm4";
-       buildDepends = [ base MonadPrompt mtl random-source transformers ];
+       libraryHaskellDepends = [
+         base MonadPrompt mtl random-source transformers
+       ];
        homepage = "https://github.com/mokus0/random-fu";
        description = "Random Variables";
        license = stdenv.lib.licenses.publicDomain;
@@ -111675,7 +114525,7 @@ self: {
        pname = "rwlock";
        version = "0.0.0.3";
        sha256 = "0isx32ayaqh7vhcyl11ykdy8f1chs1fdw73h3c2r53k989yfkmba";
-       buildDepends = [ base monad-loops-stm stm syb ];
+       libraryHaskellDepends = [ base monad-loops-stm stm syb ];
        homepage = "https://github.com/mokus0/rwlock";
        description = "Multiple-read / single-write locks";
        license = stdenv.lib.licenses.publicDomain;
@@ -111691,8 +114541,8 @@ self: {
        sha256 = "1ildbmnpdh8x25m6kjdc6506cjgngjmjhvrdfkrcwg5cdqcqs266";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring parsec ];
-       testDepends = [
+       executableHaskellDepends = [ base binary bytestring parsec ];
+       testHaskellDepends = [
          base binary bytestring parsec QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -111710,7 +114560,7 @@ self: {
        pname = "s3-signer";
        version = "0.3.0.0";
        sha256 = "15647fs38blg37s0407ybxlmzwdhmxz3sk914p21g90i2bw5gsc9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring cryptohash http-types time utf8-string
        ];
        homepage = "https://github.com/dmjio/s3-signer";
@@ -111724,7 +114574,7 @@ self: {
        pname = "safe";
        version = "0.3.9";
        sha256 = "1jdnp5zhvalf1xy8i872n29nljfjz6lnl9ghj80ffisrnnkrwcfh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
        license = stdenv.lib.licenses.bsd3;
@@ -111736,7 +114586,7 @@ self: {
        pname = "safe-access";
        version = "0.2.1.1";
        sha256 = "0pijjy8ilq0spmanilmhqxkkrky7ldacxphz5ci8pvnw4g6y40z8";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/thoferon/safe-access";
        description = "A simple environment to control access to data";
@@ -111749,7 +114599,7 @@ self: {
        pname = "safe-failure";
        version = "0.5.0.2";
        sha256 = "102fjardfdf9zy0vyalgq6m1l64356b0a0xaam49j31lqgfldaw7";
-       buildDepends = [ base failure ];
+       libraryHaskellDepends = [ base failure ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/safe/";
        description = "Library for safe functions (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -111761,7 +114611,9 @@ self: {
        pname = "safe-failure-cme";
        version = "0.1.0";
        sha256 = "0np0gq6f9xvywdf2fz5cb43ji0r4c9aqk6gb5w80hwklxdy553gk";
-       buildDepends = [ base control-monad-exception safe-failure ];
+       libraryHaskellDepends = [
+         base control-monad-exception safe-failure
+       ];
        description = "control-monad-exception Instances for safe-failure";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -111772,7 +114624,7 @@ self: {
        pname = "safe-freeze";
        version = "0.2.1";
        sha256 = "12mqgak0rla20n9b4m6ynx64bwr06njcr849csc0z0r573xw2v33";
-       buildDepends = [ base indexed mtl vector ];
+       libraryHaskellDepends = [ base indexed mtl vector ];
        jailbreak = true;
        homepage = "https://github.com/reinerp/safe-freeze";
        description = "Support for safely freezing multiple arrays in the ST monad";
@@ -111786,7 +114638,7 @@ self: {
        pname = "safe-globals";
        version = "0.1.1";
        sha256 = "0an3hy28fpdw3v5gjx13fbszzp4r2p65l8mgks0pdflscf2cwwv5";
-       buildDepends = [ base stm template-haskell ];
+       libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111799,7 +114651,9 @@ self: {
        pname = "safe-lazy-io";
        version = "0.1";
        sha256 = "1hqw4i814sz94iqyj79jai8aa2mwmv0mrnfk8ggb0sdx4xqn784c";
-       buildDepends = [ base extensible-exceptions parallel strict-io ];
+       libraryHaskellDepends = [
+         base extensible-exceptions parallel strict-io
+       ];
        description = "A library providing safe lazy IO features";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111813,7 +114667,7 @@ self: {
        pname = "safe-plugins";
        version = "0.1";
        sha256 = "1nxy70iig54098pzbi8mwc8412fj759y6ihmsdjsk6xlpy6bwx65";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath haskell-src-exts plugins Unixutils
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
@@ -111829,8 +114683,10 @@ self: {
        pname = "safe-printf";
        version = "0.1.0.0";
        sha256 = "19nw306q7xlj6s132qxlfskg67x6rx3zhsk2n6lbz2kryr7v99g6";
-       buildDepends = [ base haskell-src-meta template-haskell th-lift ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base haskell-src-meta template-haskell th-lift
+       ];
+       testHaskellDepends = [
          base doctest haskell-src-meta hspec QuickCheck template-haskell
          th-lift
        ];
@@ -111847,14 +114703,14 @@ self: {
      mkDerivation {
        pname = "safecopy";
        version = "0.8.5";
-       revision = "1";
        sha256 = "1r0v2276hynxkysyrdmy2334gwxgaz2v6j8g0hd5jzfj2kmnnmk9";
+       revision = "1";
        editedCabalFile = "9b7af1be25774add78e43c0f9a4f1fe55ce2a98fb00738400661835adf1672c0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base cereal containers lens lens-action quickcheck-instances
          tasty tasty-quickcheck template-haskell time vector
        ];
@@ -111871,8 +114727,8 @@ self: {
        pname = "safeint";
        version = "0.5.3";
        sha256 = "1xrdqylf4f6nk2rnpp0zyaj562cdn2wmf9skir21fbzkw1lzvq7j";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -111889,7 +114745,7 @@ self: {
        pname = "safer-file-handles";
        version = "0.11";
        sha256 = "1jqw13drzj36gjvlaf9fqd4cj1dpy8psmgsdykag6krxvhq6p639";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols explicit-iomodes pathtype
          regional-pointers regions transformers
        ];
@@ -111908,7 +114764,7 @@ self: {
        pname = "safer-file-handles-bytestring";
        version = "0.3.0.1";
        sha256 = "1fbhk5hmq9bpw556vz6w3vq5j380n5pzfgby6w4vrmwnn93y12b9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring explicit-iomodes-bytestring regions
          safer-file-handles transformers
        ];
@@ -111927,7 +114783,7 @@ self: {
        pname = "safer-file-handles-text";
        version = "0.2.0.2";
        sha256 = "14x0kig9dnjrksh7b4gmwdwqr045cqcqjgicvjckhf85jc8bcanm";
-       buildDepends = [
+       libraryHaskellDepends = [
          explicit-iomodes-text regions safer-file-handles text transformers
        ];
        jailbreak = true;
@@ -111943,7 +114799,7 @@ self: {
        pname = "saferoute";
        version = "0.2.0.0";
        sha256 = "00ykmy44paghgc3m731p1hh00zv11416pl2xil4cav7vrr43nb6h";
-       buildDepends = [ base blaze-html containers text ];
+       libraryHaskellDepends = [ base blaze-html containers text ];
        jailbreak = true;
        description = "A simple type-safe routing library";
        license = stdenv.lib.licenses.bsd3;
@@ -111956,8 +114812,11 @@ self: {
        pname = "sai-shape-syb";
        version = "0.3.4";
        sha256 = "07g7qpf7avv5hnxykrh4x7qr8sx9mwwv4hbavnsqi1n7zy2z91a3";
-       buildDepends = [ base containers ghc ghc-syb-utils syb ];
-       testDepends = [ base containers ghc ghc-syb-utils HUnit syb ];
+       libraryHaskellDepends = [ base containers ghc ghc-syb-utils syb ];
+       testHaskellDepends = [
+         base containers ghc ghc-syb-utils HUnit syb
+       ];
+       jailbreak = true;
        homepage = "http://fremissant.net/shape-syb";
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
@@ -111972,36 +114831,36 @@ self: {
        pname = "saltine";
        version = "0.0.0.4";
        sha256 = "1n74qk8yb0ylj6gns68rak5g030yjsaycn96x0hvk1cx7qwym887";
-       buildDepends = [ base bytestring profunctors ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring profunctors ];
+       librarySystemDepends = [ libsodium ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
-       extraLibraries = [ libsodium ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
-     , QuickCheck, saltine, sodium, tasty, tasty-quickcheck
+     , libsodium, QuickCheck, saltine, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "saltine-quickcheck";
        version = "0.1.0.1";
        sha256 = "041286rsyzv67qqbbbd38fc9qqzmml0js4qr0rqhaljv8cf1sxnj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-arbitrary hex QuickCheck saltine
        ];
-       testDepends = [
+       librarySystemDepends = [ libsodium ];
+       testHaskellDepends = [
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
-       extraLibraries = [ sodium ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-     }) { sodium = null;};
+     }) { inherit (pkgs) libsodium;};
 
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
@@ -112013,7 +114872,7 @@ self: {
        pname = "salvia";
        version = "1.0.0";
        sha256 = "1qcnhj3ifjqrkaw1ixqkwmv2br9w5dlk1mrrwgl73c3wxgin7gni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory fclabels MaybeT-transformers
          monads-fd network old-locale process pureMD5 random safe
          salvia-protocol split stm text threadmanager time transformers unix
@@ -112036,7 +114895,7 @@ self: {
        sha256 = "0sfvx7hj0z2g57gs6l1s078z3a34hfgm4pfcb1qr1pvbc8lj3f1h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base c10k fclabels filestore monads-fd network salvia salvia-extras
          salvia-protocol salvia-sessions salvia-websocket stm threadmanager
          transformers
@@ -112057,7 +114916,7 @@ self: {
        pname = "salvia-extras";
        version = "1.0.0";
        sha256 = "1nfiak4nabxm27ddksaif1jdpwn7drbz25jrqk0bmyr5q6q70a51";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring c10k clevercss fclabels filestore hscolour
          HStringTemplate monads-fd network old-locale pureMD5 salvia
          salvia-protocol sendfile split stm text threadmanager time
@@ -112077,7 +114936,7 @@ self: {
        pname = "salvia-protocol";
        version = "1.0.1";
        sha256 = "0a49wjjhdhhlnrwfi6l2zn6jl7vynwyil6s6qzp1za7s5vji48vb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bimap bytestring containers fclabels parsec safe split
          utf8-string
        ];
@@ -112096,7 +114955,7 @@ self: {
        pname = "salvia-sessions";
        version = "1.0.0";
        sha256 = "0cfl9xhawg16gkl18wfxpjysn312yb3q9bagmclrhqk3qzwxgb0h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fclabels MaybeT-transformers monads-fd pureMD5
          random safe salvia salvia-protocol stm time utf8-string
        ];
@@ -112114,7 +114973,7 @@ self: {
        pname = "salvia-websocket";
        version = "1.0.0";
        sha256 = "14sr5z5z9xjkf18z1srz6cgciyrhhs4zyl7a8pffxmb893a2gngl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring fclabels monads-fd salvia salvia-protocol stm
          utf8-string
        ];
@@ -112132,7 +114991,7 @@ self: {
        sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck storable-record ];
+       libraryHaskellDepends = [ base QuickCheck storable-record ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Handling of samples in an (audio) signal";
        license = stdenv.lib.licenses.bsd3;
@@ -112144,7 +115003,7 @@ self: {
        pname = "sample-frame-np";
        version = "0.0.4";
        sha256 = "1l7447xjxj98jx99b75hdfdjps6mcm293yhx0fjrqwxkz6anxv6d";
-       buildDepends = [ base numeric-prelude sample-frame ];
+       libraryHaskellDepends = [ base numeric-prelude sample-frame ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Orphan instances for types from sample-frame and numericprelude";
        license = stdenv.lib.licenses.bsd3;
@@ -112160,9 +115019,14 @@ self: {
        sha256 = "00hm12wz6sqv0jn9v7vqxzvq1m7k8d4fdaw25x928ck7g95gk9id";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring filepath process seqloc vector ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ zlib ];
+       libraryHaskellDepends = [ base bytestring seqloc vector ];
+       librarySystemDepends = [ zlib ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bytestring filepath process seqloc vector
+       ];
+       executableSystemDepends = [ zlib ];
+       executableToolDepends = [ c2hs ];
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
@@ -112178,7 +115042,10 @@ self: {
        sha256 = "0s59ds9s8ghj8wq2cfnh2s865v8bmga53aqvcqf781iv9zvxbqmw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring conduit filepath resourcet samtools transformers
+       ];
+       executableHaskellDepends = [
          base bytestring conduit filepath resourcet samtools transformers
        ];
        jailbreak = true;
@@ -112195,7 +115062,7 @@ self: {
        pname = "samtools-enumerator";
        version = "0.1.2.1";
        sha256 = "0wk2m2av9fd5zvx29my4llbc8zqk1hrczfvnhrvd90qmw8p33r5m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator samtools transformers
        ];
        description = "Enumerator interface to SamTools library";
@@ -112212,7 +115079,10 @@ self: {
        sha256 = "139cp03lm05s536gsf03in7lrsmiprs2x6vpr9vci4k0pq2pd06l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring iteratee samtools transformers
+       ];
+       executableHaskellDepends = [
          base bytestring iteratee monads-tf samtools transformers
        ];
        description = "Iteratee interface to SamTools library";
@@ -112228,8 +115098,8 @@ self: {
        pname = "sandi";
        version = "0.3.5";
        sha256 = "19dfiph5rrxs4shpw286r4agcz739f6afw2wyrlkl66lpaaxjvl5";
-       buildDepends = [ base bytestring conduit exceptions ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring conduit exceptions ];
+       testHaskellDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        homepage = "http://hackage.haskell.org/package/sandi";
@@ -112243,7 +115113,7 @@ self: {
        pname = "sandlib";
        version = "0.0.2";
        sha256 = "07wh6va4rpf6vvxnjqbmwfna3rg20ysjh2pnzylz6xzlayzq0pkx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/regularlambda/sandlib";
        description = "SAND data serialization and manipulation library";
@@ -112260,7 +115130,7 @@ self: {
        sha256 = "184gsdrw10h345ic1bdcdnfaac5fhr6dx77db790fl1lff7z5s1g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath optparse-applicative
          process text unix-compat
        ];
@@ -112275,7 +115145,7 @@ self: {
        pname = "sarasvati";
        version = "0.3.0.0";
        sha256 = "0x8d5n2mydhwl9h7vzk7nr58b2aym9xb21p4m21rfa6vy6r2n438";
-       buildDepends = [ base deepseq portaudio ];
+       libraryHaskellDepends = [ base deepseq portaudio ];
        jailbreak = true;
        homepage = "https://github.com/tokiwoousaka/Sarasvati";
        description = "audio library";
@@ -112290,7 +115160,7 @@ self: {
        pname = "sasl";
        version = "0.0.0.2";
        sha256 = "02cv19vi8wfwzxhi33f32zihjqypxjz1x6j7ff70my2wffw95w26";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cryptohash monads-tf papillon
          simple-pipe
        ];
@@ -112308,7 +115178,7 @@ self: {
        sha256 = "1ia2asqnxzpyr9s4n488yy00388x0bfy8kwqjx17fap33jkjfi6p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://tcana.info/sat.html";
        description = "CNF SATisfier";
        license = "GPL";
@@ -112325,7 +115195,7 @@ self: {
        sha256 = "1w09ccky9rhp1l5g3rxjp9ydfyn0cc7kxmhz922ngls4ywd1hbc4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskell98 mtl parse-dimacs pretty
        ];
        description = "A minimal SAT solver";
@@ -112342,15 +115212,14 @@ self: {
        pname = "satchmo";
        version = "2.9.9";
        sha256 = "134i2xd7fvdhx43a51486mb3szi6c604pqc6w3cxsic1ngm30jbw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array async base bytestring containers deepseq directory hashable
          lens memoize minisat mtl process transformers
        ];
-       testDepends = [ array base ];
+       testHaskellDepends = [ array base ];
        homepage = "https://github.com/jwaldmann/satchmo";
        description = "SAT encoding monad";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-backends" = callPackage
@@ -112361,7 +115230,7 @@ self: {
        pname = "satchmo-backends";
        version = "1.9.1";
        sha256 = "1hyzwmhy0f4k60hqjbh9jl3qr4xw3rjgl8nz2gfcdvm5ad91bfdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers process satchmo timeit
        ];
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
@@ -112380,7 +115249,7 @@ self: {
        sha256 = "1xvgamq53yfzcl1p9wbfyy7dlhxsnbj6pjpxgjkyycndgszc84w3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers process satchmo satchmo-backends
        ];
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
@@ -112397,7 +115266,7 @@ self: {
        pname = "satchmo-funsat";
        version = "1.4";
        sha256 = "0nx0xlbwwcdhdd608akmiwzx8abrd5v4b411221rdl8fshqrbv34";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers funsat parse-dimacs satchmo
        ];
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
@@ -112412,7 +115281,7 @@ self: {
        pname = "satchmo-minisat";
        version = "1.3";
        sha256 = "1dwgj16l2zjqfmf92kpr695ycliwki6a38sxc06scvs6sv6wkc56";
-       buildDepends = [ base containers process satchmo ];
+       libraryHaskellDepends = [ base containers process satchmo ];
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "minisat driver as backend for satchmo";
        license = "GPL";
@@ -112425,12 +115294,13 @@ self: {
        pname = "satchmo-toysat";
        version = "0.2.1.0";
        sha256 = "1g6hzgdiiczwk87928xi42lv2swm218i9hs39f3zqpcp8r7fxh61";
-       buildDepends = [ array base containers satchmo toysolver ];
+       libraryHaskellDepends = [
+         array base containers satchmo toysolver
+       ];
        jailbreak = true;
        homepage = "https://github.com/msakai/satchmo-toysat";
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbv" = callPackage
@@ -112444,12 +115314,15 @@ self: {
        sha256 = "1914695yxyd3ag1z56dd88kz0p0zvl63255psd4bilzvdwlys6ls";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
-         directory filepath HUnit mtl old-time pretty process QuickCheck
-         random syb
+         directory filepath mtl old-time pretty process QuickCheck random
+         syb
        ];
-       testDepends = [ base directory filepath HUnit syb ];
+       executableHaskellDepends = [
+         base directory filepath HUnit process syb
+       ];
+       testHaskellDepends = [ base directory filepath HUnit syb ];
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
@@ -112461,7 +115334,7 @@ self: {
        pname = "sc3-rdu";
        version = "0.15";
        sha256 = "0zrd9w3s535b2dpnmmrfg4i6jd9f4nh338x1cbggcw3pjyv8gk30";
-       buildDepends = [ base hsc3 hsc3-db ];
+       libraryHaskellDepends = [ base hsc3 hsc3-db ];
        homepage = "http://rd.slavepianos.org/t/sc3-rdu";
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
        license = "GPL";
@@ -112476,7 +115349,7 @@ self: {
        pname = "scalable-server";
        version = "0.2.2";
        sha256 = "066ncvz6zid1j6d6j89m4k2hywq58p73z30dkqn2l1svlic7dmx6";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder BoundedChan
          bytestring enumerator mtl network network-enumerator
        ];
@@ -112494,7 +115367,7 @@ self: {
        sha256 = "0alhi0zr2n97942wpnyzq8q62nd4nzjl0rdxaarr7psx6dd3h3nn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath gd ];
+       executableHaskellDepends = [ base filepath gd ];
        homepage = "http://code.haskell.org/~dons/code/scaleimage";
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
@@ -112509,10 +115382,10 @@ self: {
        pname = "scalpel";
        version = "0.2.1";
        sha256 = "0lva7pi78ksbxcjd19dycn4ayxcma28wrjmx3x31hn01nvhsnqg0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring curl regex-base regex-tdfa tagsoup text
        ];
-       testDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
+       testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -112526,7 +115399,7 @@ self: {
        sha256 = "0imc8zmg0d42pzbrxiyi8lqx5q24i73ajj3pmb3kqinfhm465jgv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec ];
+       executableHaskellDepends = [ base parsec ];
        homepage = "http://projects.haskell.org/style-scanner";
        description = "lexical style suggestions for source code";
        license = stdenv.lib.licenses.bsd3;
@@ -112538,8 +115411,8 @@ self: {
        pname = "scan-vector-machine";
        version = "0.2.7";
        sha256 = "112ibzc205pjcmjiwbknw7pdh0c5fyq6i4sqk97jfdr0ynb72vvc";
-       buildDepends = [ accelerate array base dph-base HUnit ];
-       testDepends = [ array base HUnit ];
+       libraryHaskellDepends = [ accelerate array base dph-base HUnit ];
+       testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112555,11 +115428,11 @@ self: {
        sha256 = "18sn7dg2pc5wx73gxs6036fxp8yal95pfh336llvmn3azmkd6n95";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring mtl optparse-applicative scrypt
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base bytestring mtl optparse-applicative scrypt
          vector
        ];
@@ -112583,12 +115456,17 @@ self: {
        sha256 = "0rsx9h0y5g2sgwg47lzdzpmx5nfnpb033fyzz5xkxnc5k4bllad5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers incremental-parser monad-coroutine
+         monad-parallel monoid-subclasses text transformers
+         transformers-compat
+       ];
+       executableHaskellDepends = [
          base bytestring containers haskeline incremental-parser
          monad-coroutine monad-parallel monoid-subclasses parsec process
          text transformers transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers incremental-parser monad-coroutine
          monad-parallel monoid-subclasses QuickCheck test-framework
          test-framework-quickcheck2 text transformers transformers-compat
@@ -112607,7 +115485,7 @@ self: {
        pname = "scenegraph";
        version = "0.1.0.2";
        sha256 = "1l946h6sggg2n8ldx34v2sx4dyjqxd7i34wrsllz88iiy4qd90yw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers fgl GLUT haskell98 hmatrix mtl old-time
          OpenGL process
        ];
@@ -112626,7 +115504,7 @@ self: {
        pname = "scgi";
        version = "0.3.3";
        sha256 = "0zmn5w5vwxv8slnydbrj1jfhmbvsyars2wf9bbrbgvwsfd40zd2m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi extensible-exceptions network
        ];
        description = "A Haskell library for writing SCGI programs";
@@ -112643,7 +115521,9 @@ self: {
        sha256 = "1ggywgyfpdza1fk66ixj8z3a1nv1r64dmw7l4d1m3h65yzxx9jcb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath old-locale time xturtle ];
+       executableHaskellDepends = [
+         base directory filepath old-locale time xturtle
+       ];
        jailbreak = true;
        description = "Marge schedules and show EVR";
        license = stdenv.lib.licenses.bsd3;
@@ -112661,7 +115541,7 @@ self: {
        sha256 = "1x42jm9fciwdp1khlvcw5vl748pw12n8xk4phbnd6iwqaazf9wv8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring composition containers HTTP http-types mtl
          options text text-icu transformers wai warp
        ];
@@ -112675,7 +115555,7 @@ self: {
        pname = "schedyield";
        version = "1.0";
        sha256 = "0lzhxlfxa660vx4y49gbg2q76v8dda00h3rznj5fhdjj29pkypgp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Exposes standard POSIX function sched_yield";
        license = stdenv.lib.licenses.bsd3;
@@ -112696,12 +115576,12 @@ self: {
      mkDerivation {
        pname = "scholdoc";
        version = "0.1.3";
-       revision = "1";
        sha256 = "0dsbr4nk56cmbgdnk91s39lc4qp2wb39hkyisaf4f1n6nmx8zmn4";
+       revision = "1";
        editedCabalFile = "bbe7070ca2ca48d86095c9a45120d2bfbf6a480b3894117d70e0f8e3ccabb435";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring binary blaze-html blaze-markup
          bytestring containers data-default directory extensible-exceptions
          filepath highlighting-kate hslua HTTP http-client http-client-tls
@@ -112710,7 +115590,11 @@ self: {
          SHA syb tagsoup temporary text time unordered-containers vector xml
          yaml zip-archive zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring containers directory extensible-exceptions
+         filepath highlighting-kate network-uri scholdoc-types text yaml
+       ];
+       testHaskellDepends = [
          base bytestring containers Diff directory executable-path filepath
          HUnit process QuickCheck scholdoc-types syb test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -112732,18 +115616,22 @@ self: {
      mkDerivation {
        pname = "scholdoc-citeproc";
        version = "0.6";
-       revision = "1";
        sha256 = "0wy8cwr933zcqb85qscj9l9qcl2xv8mkbd2g9b4gs7c1k5b6khll";
+       revision = "1";
        editedCabalFile = "33a066de8000d8bdb0a8f04f71baca64e27f4a2bb2d2a330f6d5a7f81090b118";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers
-         data-default directory filepath hs-bibutils mtl old-locale parsec
-         process rfc5051 scholdoc scholdoc-types split syb tagsoup temporary
-         text time vector xml-conduit yaml
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale parsec rfc5051 scholdoc scholdoc-types
+         split syb tagsoup text time vector xml-conduit yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath process scholdoc scholdoc-types syb temporary text vector
+         yaml
+       ];
+       testHaskellDepends = [
          aeson base bytestring directory filepath process scholdoc
          scholdoc-types temporary text yaml
        ];
@@ -112765,10 +115653,11 @@ self: {
        sha256 = "05yb55df33v357khdkr95ghmxqzikvq8gxqkh143zc8fi43gjf99";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers mtl network-uri parsec scholdoc-types syb xml
+       libraryHaskellDepends = [
+         base containers mtl parsec scholdoc-types syb xml
        ];
-       testDepends = [
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
@@ -112785,7 +115674,7 @@ self: {
        pname = "scholdoc-types";
        version = "0.1.3.1";
        sha256 = "02335isa6w7mxjziiwsdm2883b778v0y0ayzxpha9p0xr5nlkbar";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
        jailbreak = true;
@@ -112800,7 +115689,7 @@ self: {
        pname = "schonfinkeling";
        version = "0.1.0.0";
        sha256 = "1wwbalfkfg66azr9zizscvdc2csi9q73d6wq5bwbiq33z522nwxy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Transformation of n-ary functions to unary functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -112811,8 +115700,8 @@ self: {
        pname = "sci-ratio";
        version = "0.2.1.0";
        sha256 = "1qddamwk2fzakixx9f0y0r3z9z6kmyyxgpb3dhiiiza6krnf8r9k";
-       buildDepends = [ base hashable ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base hashable ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/Rufflewind/sci-ratio";
        description = "Rational numbers in scientific notation";
        license = stdenv.lib.licenses.mit;
@@ -112824,7 +115713,7 @@ self: {
        pname = "science-constants";
        version = "0.2.0.0";
        sha256 = "0qp3d9la929kks2b2pyylgznl86gy91lp3zgpb9bn7gas3wll9vy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Mathematical/physical/chemical constants";
        license = "unknown";
@@ -112836,7 +115725,9 @@ self: {
        pname = "science-constants-dimensional";
        version = "0.1.0.1";
        sha256 = "0n39pfs7kfhy62vl9q2ka5f9bfckncpssjsdx71d1hrld0jcq2g8";
-       buildDepends = [ base dimensional numtype science-constants ];
+       libraryHaskellDepends = [
+         base dimensional numtype science-constants
+       ];
        jailbreak = true;
        description = "Mathematical/physical/chemical constants";
        license = stdenv.lib.licenses.bsd3;
@@ -112852,10 +115743,10 @@ self: {
        pname = "scientific";
        version = "0.3.3.8";
        sha256 = "0k6f9g3jpwhm52af4zayhdby8xibarn60mpxbb8xxgm78hmdw373";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring deepseq ghc-prim hashable integer-gmp text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck smallcheck tasty tasty-ant-xml
          tasty-hunit tasty-quickcheck tasty-smallcheck text
        ];
@@ -112875,10 +115766,14 @@ self: {
        sha256 = "1ihq538ym6hh099p0h9p1ngjsq3a9h9k5ssnwyr4bqhlmv8xam0i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath ghc ghc-paths ghc-syb
+         hslogger json multiset time uniplate
+       ];
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath ghc ghc-paths
          ghc-syb hslogger json multiset network network-bytestring time
-         uniplate utf8-string
+         utf8-string
        ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/scion";
@@ -112902,7 +115797,14 @@ self: {
        sha256 = "1nf4rvy8szxjra6l20jxd0v2f6zf985jiz2d1y5rkfvrqx1pwqnc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring Cabal conduit containers deepseq
+         derive directory filepath ghc ghc-paths ghc-pkg-lib
+         haskell-src-exts http-conduit monad-logger mtl parallel-io parsec
+         persistent persistent-sqlite persistent-template process resourcet
+         tar text transformers unix unordered-containers utf8-string zlib
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bytestring Cabal conduit containers deepseq
          derive directory filepath ghc ghc-paths ghc-pkg-lib haskeline
          haskell-src-exts HTTP http-conduit monad-logger mtl parallel-io
@@ -112925,7 +115827,7 @@ self: {
        sha256 = "1c9akvpvwakdnqciz57bwjhqkdfkky43wmj7rx9fsk552pamzijk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring containers process ];
+       executableHaskellDepends = [ base bytestring containers process ];
        jailbreak = true;
        description = "Generates graphviz file of scons dependency information";
        license = "GPL";
@@ -112940,7 +115842,7 @@ self: {
        pname = "scope";
        version = "0.8.0.1";
        sha256 = "1ks66paa30xwqgrllkyz0phh73pc0d2f6aq474cpz7gdb7zyrkzi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers iteratee MonadCatchIO-transformers mtl
          mwc-random time unix zoom-cache
        ];
@@ -112959,7 +115861,11 @@ self: {
        sha256 = "0dhpyf0kh6qrrcyr3iwp3i3rkj5vcl7k7aa9qmxq2qq1f6dhw4p6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base cairo gtk MonadCatchIO-transformers mtl old-locale scope time
+         zoom-cache
+       ];
+       executableHaskellDepends = [
          base cairo gtk MonadCatchIO-transformers mtl old-locale scope time
          zoom-cache
        ];
@@ -112977,7 +115883,7 @@ self: {
        pname = "scottish";
        version = "0.1.0.1";
        sha256 = "01874r5r6lzwa7w0pa5i0ymnxb5vpkpxyfnf3knlyblv9b5j82nx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default enclosed-exceptions http-types lens mtl
          persistent resource-pool scotty stm text transformers wai warp
        ];
@@ -112998,16 +115904,16 @@ self: {
      mkDerivation {
        pname = "scotty";
        version = "0.10.2";
-       revision = "1";
        sha256 = "0jlw82brnvc4cbpws0dq3qxn4rnb3z6rx6cfiarqwas14x4k3kl6";
+       revision = "1";
        editedCabalFile = "e0ab23342583c37af1a5422fad9a64926e54cad208dbcac75c70b3db40bf9e99";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class http-types monad-control mtl nats network
          regex-compat text transformers transformers-base
          transformers-compat wai wai-extra warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base data-default-class directory hspec hspec-wai http-types
          lifted-base network text wai
        ];
@@ -113024,10 +115930,10 @@ self: {
        pname = "scotty-binding-play";
        version = "1.3";
        sha256 = "0k9ylywhvb4nfnm304zlan0bzdx8rxcwnvip8assz80kz47zvjp9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl scotty template-haskell text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec http-client HUnit scotty text transformers
        ];
        homepage = "https://github.com/welmo/scotty-binding-play";
@@ -113042,7 +115948,9 @@ self: {
        pname = "scotty-blaze";
        version = "0.1.3";
        sha256 = "0bl37bplal6y6ma0ba8llypsrx11959vcq04s8x6642hzk0cgid7";
-       buildDepends = [ base blaze-builder blaze-html mtl scotty wai ];
+       libraryHaskellDepends = [
+         base blaze-builder blaze-html mtl scotty wai
+       ];
        description = "blaze-html integration for Scotty";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113056,7 +115964,7 @@ self: {
        pname = "scotty-cookie";
        version = "0.1.0.3";
        sha256 = "0wyvx30889lbbgq7dmjfldlbnyg1b8b3zh1py5lis59mwz6r3w9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers cookie scotty text time
          transformers
        ];
@@ -113074,11 +115982,11 @@ self: {
        pname = "scotty-fay";
        version = "0.1.1";
        sha256 = "13ksxw2v6gac3r368ifnbrrgmmafr2fyki63ws4qxw415fwnqa82";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default directory fay fay-jquery filepath
          http-types scotty text transformers wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring data-default directory fay fay-jquery filepath
          http-types HUnit scotty test-framework test-framework-hunit text
          transformers wai wai-test
@@ -113097,7 +116005,7 @@ self: {
        pname = "scotty-hastache";
        version = "0.2.1";
        sha256 = "1yyip8iq1n71iidmpbfs7rifxvpphyrcaf4z394rx36hq72ka8dn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath hastache http-types mtl scotty text wai
          warp
        ];
@@ -113116,7 +116024,7 @@ self: {
        pname = "scotty-session";
        version = "0.0.5";
        sha256 = "1jvxzsnprfp2k9svkzxykmpc3qs6dvzc0wnnircyimha4gca6qh7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring crypto-api
          http-types scotty stm text time transformers unordered-containers
          wai
@@ -113133,11 +116041,12 @@ self: {
        pname = "scotty-tls";
        version = "0.4.0";
        sha256 = "1axr54s8zi9jw5y6yl2izjx4xvd25y18nh4fw7asq9fz0nwjb45a";
-       buildDepends = [ base scotty transformers wai warp warp-tls ];
+       libraryHaskellDepends = [
+         base scotty transformers wai warp warp-tls
+       ];
        homepage = "https://github.com/dmjio/scotty-tls.git";
        description = "TLS for Scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scp-streams" = callPackage
@@ -113150,11 +116059,13 @@ self: {
        sha256 = "1wi860cl9dsq6hfhyas3dk0gcjyd8hx62k3fjwgr5x56ps5fp6ry";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cmdargs io-streams process SHA
-         sha-streams unix
+       libraryHaskellDepends = [
+         attoparsec base bytestring io-streams process
        ];
-       testDepends = [ base bytestring io-streams ];
+       executableHaskellDepends = [
+         base bytestring cmdargs io-streams SHA sha-streams unix
+       ];
+       testHaskellDepends = [ base bytestring io-streams ];
        jailbreak = true;
        homepage = "https://github.com/noteed/scp-streams";
        description = "An SCP protocol implementation";
@@ -113171,7 +116082,7 @@ self: {
        sha256 = "035jpwp58l70jd0dklx5rg0sm8b2bd5r1m726dbhhlv60w6bdfn3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary containers deepseq directory mtl packed-dawg
          parallel split
        ];
@@ -113191,10 +116102,14 @@ self: {
        sha256 = "161l75bni4fxmh35dfz8r2vgllmmf0s55j9y2xpyskqfj3xc85a7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers curl MissingH network network-uri old-locale
          pureMD5 time url
        ];
+       executableHaskellDepends = [
+         base containers curl MissingH network network-uri old-locale time
+         url
+       ];
        description = "Scrobbling server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113211,7 +116126,7 @@ self: {
        sha256 = "06nzvvqn592jgf93zck74w1nhzjq0llzypsy7x575ljvprb3ph0d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring case-insensitive containers data-default IfElse
          monad-loops mtl ncurses optparse-applicative random text unix
          vector
@@ -113231,8 +116146,10 @@ self: {
        pname = "scrypt";
        version = "0.5.0";
        sha256 = "1cnrjdq1ncv224dlk236a7w29na8r019d2acrsxlsaiy74iadh1y";
-       buildDepends = [ base base64-bytestring bytestring entropy ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring entropy
+       ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -113254,7 +116171,7 @@ self: {
        sha256 = "1j5mvvrk1647qfqdl4q6ywnx7l9bgnqp6rsjr1l8bynikfm0ghcg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base base16-bytestring bytestring conduit containers
          cryptohash directory filepath friendly-time hashable http-conduit
          http-types MonadRandom mtl network old-locale process random stm
@@ -113277,14 +116194,13 @@ self: {
        sha256 = "0c4djdr2lq6kbi726zmjicscsc2ksj4l787pzyj5lfbl9c11fb6j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base cmdargs containers directory filepath json mtl parsec
          pretty process safe tagsoup time uniplate utf8-string
        ];
-       buildTools = [ alex ];
+       executableToolDepends = [ alex ];
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sde-solver" = callPackage
@@ -113296,7 +116212,7 @@ self: {
        pname = "sde-solver";
        version = "0.1.0.0";
        sha256 = "0sp12fcf1h4qs0l5iblf3kl6nv1sb4ff49p2ybmrx7jifiwqxma6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal cereal-vector ghc-prim haskell-mpi
          mersenne-random-pure64 mtl mwc-random normaldistribution parallel
          vector
@@ -113314,8 +116230,8 @@ self: {
        pname = "sdf2p1-parser";
        version = "0.1.1";
        sha256 = "1az42i4ridb4xza6zyg2mrsfv7gjp61727cmnfcy5x5b55nl3ahz";
-       buildDepends = [ base bytestring parsec transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring parsec transformers ];
+       testHaskellDepends = [
          base bytestring Cabal HUnit parsec test-framework
          test-framework-hunit transformers
        ];
@@ -113330,9 +116246,9 @@ self: {
        pname = "sdl2";
        version = "1.3.1";
        sha256 = "17d3nmiz32hccbbxx55wa2zca8xn7mq3f02rcarzynqczvi5hlyv";
-       buildDepends = [ base transformers ];
-       extraLibraries = [ SDL2 ];
-       pkgconfigDepends = [ SDL2 ];
+       libraryHaskellDepends = [ base transformers ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
        description = "Low-level bindings to SDL2";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) SDL2;};
@@ -113343,12 +116259,11 @@ self: {
        pname = "sdl2-image";
        version = "0.1.3.2";
        sha256 = "0gps89yy4jzmlh5cdvs94mhmqlakqb99ldall3rirqdfhdv2wysj";
-       buildDepends = [ base sdl2 ];
-       extraLibraries = [ SDL2 ];
-       pkgconfigDepends = [ SDL2 SDL2_image ];
+       libraryHaskellDepends = [ base sdl2 ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 SDL2_image ];
        description = "Haskell binding to sdl2-image";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_image;};
 
   "sdl2-ttf" = callPackage
@@ -113357,9 +116272,9 @@ self: {
        pname = "sdl2-ttf";
        version = "0.2.1";
        sha256 = "0w760xsb02n0j4bv7iigc810mwasgjf8lckrjqbipqvvq1am3l56";
-       buildDepends = [ base sdl2 ];
-       testDepends = [ base sdl2 ];
-       extraLibraries = [ SDL2 SDL2_ttf ];
+       libraryHaskellDepends = [ base sdl2 ];
+       librarySystemDepends = [ SDL2 SDL2_ttf ];
+       testHaskellDepends = [ base sdl2 ];
        description = "Binding to libSDL2-ttf";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_ttf;};
@@ -113370,7 +116285,7 @@ self: {
        pname = "sdnv";
        version = "0.1.0.0";
        sha256 = "07d7989v4a8dz5jqrhz56ki9wkngaf1d0153271lylj015y00rmc";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        description = "Self-delimiting numeric values encoding library";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -113387,13 +116302,13 @@ self: {
        pname = "sdr";
        version = "0.1.0.3";
        sha256 = "1whw45vnns0f5iw9vlmfxw90y3l0gp0q5yar6p6dp1dn57gyrdkc";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cairo cereal Chart Chart-cairo colour
          containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL
          optparse-applicative pango pipes pipes-bytestring pipes-concurrency
          primitive pulse-simple rtlsdr storable-complex time tuple vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base primitive QuickCheck storable-complex test-framework
          test-framework-quickcheck2 vector
        ];
@@ -113415,7 +116330,7 @@ self: {
        pname = "seacat";
        version = "1.0.0.3";
        sha256 = "0iyl7mp0vpxy4kqr7qqqz642zxpla3ydlbdzmw4ipjmg5gwjr7pm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring ConfigFile data-default
          directory filepath http-types mime-types MissingH monad-control mtl
          network persistent persistent-postgresql persistent-sqlite
@@ -113435,7 +116350,7 @@ self: {
        pname = "seal-module";
        version = "0.1.0.1";
        sha256 = "0x2m280qbfaswr2gk26d26dwg2s3v1nk4n93zh2fh1ikpkw13dfq";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell support for global configuration data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113448,10 +116363,10 @@ self: {
        pname = "search";
        version = "0.1.0.1";
        sha256 = "0w9pfyw33zrfjy70bwslbgyns1jswshzxcz71cgbfl4q5hjbmvkw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim profunctors semigroupoids tagged transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/search/";
        description = "Infinite search in finite time with Hilbert's epsilon";
@@ -113465,7 +116380,7 @@ self: {
        pname = "sec";
        version = "0.0.1";
        sha256 = "1ryl0nm1a37r606xhxy6ykf3c8c1gml6gdqna428w8y3a2vg5q2v";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/urso/sec";
        description = "Semantic Editor Combinators";
@@ -113480,7 +116395,8 @@ self: {
        sha256 = "0qrb2g7dfhh2m3hwp39xlimbc3kinww279a58pah738gqnhmayrs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        homepage = "http://github.com/pgavin/secdh";
        description = "SECDH Machine Simulator";
        license = stdenv.lib.licenses.bsd3;
@@ -113493,7 +116409,7 @@ self: {
        pname = "seclib";
        version = "1.1.0.2";
        sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A simple library for static information-flow security in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -113510,20 +116426,21 @@ self: {
        pname = "second-transfer";
        version = "0.6.0.0";
        sha256 = "1w726qfbz86sicpg5apx5n767av61l3kn8fra7ban8f67amg3z7w";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring binary bytestring clock conduit
          containers deepseq exceptions hashable hashtables hslogger http2
          lens network network-uri pqueue SafeSemaphore stm text time
          transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ openssl ];
+       libraryToolDepends = [ cpphs ];
+       testHaskellDepends = [
          attoparsec base base16-bytestring binary bytestring clock conduit
-         containers cpphs deepseq exceptions hashable hashtables hslogger
-         http2 HUnit lens network network-uri pqueue SafeSemaphore stm text
-         time transformers unordered-containers
+         containers deepseq exceptions hashable hashtables hslogger http2
+         HUnit lens network network-uri pqueue SafeSemaphore stm text time
+         transformers unordered-containers
        ];
-       buildTools = [ cpphs ];
-       extraLibraries = [ openssl ];
+       testToolDepends = [ cpphs ];
        homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
@@ -113540,7 +116457,7 @@ self: {
        sha256 = "0qrc1jk2hhhhq0cq9h9g8pc2frjsb1m96h6sdj79m7km5dc2slm8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers diagrams-cairo diagrams-lib haskell-qrencode random
        ];
        jailbreak = true;
@@ -113559,11 +116476,11 @@ self: {
        pname = "secret-sharing";
        version = "1.0.0.3";
        sha256 = "0q315gmfnhpzgi4r0p3li8vvrdl2a0xgh0gxdin6s3nkh6hjpbv2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring dice-entropy-conduit finite-field polynomial
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://monoid.at/code";
@@ -113580,7 +116497,7 @@ self: {
        sha256 = "0hcf8mxl1br27764ha0gdf7jdl7zlxknbspqijw0jr6ws7hshxg9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 ];
+       executableHaskellDepends = [ base haskell98 ];
        jailbreak = true;
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
        license = stdenv.lib.licenses.publicDomain;
@@ -113595,7 +116512,7 @@ self: {
        pname = "secure-sockets";
        version = "1.2.9.2";
        sha256 = "0ijizi76fzqamynwhyd3ppzy90bfvypmzbjr0v63ng2w0mwnrjlz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory HsOpenSSL network process transformers
        ];
        homepage = "http://code.google.com/p/secure-hs/";
@@ -113609,7 +116526,9 @@ self: {
        pname = "securemem";
        version = "0.1.9";
        sha256 = "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy";
-       buildDepends = [ base byteable bytestring ghc-prim memory ];
+       libraryHaskellDepends = [
+         base byteable bytestring ghc-prim memory
+       ];
        homepage = "http://github.com/vincenthz/hs-securemem";
        description = "abstraction to an auto scrubbing and const time eq, memory chunk";
        license = stdenv.lib.licenses.bsd3;
@@ -113623,10 +116542,10 @@ self: {
        pname = "sednaDBXML";
        version = "0.1.2.5";
        sha256 = "068yl4z0wb5kr7a7c7haah3z391mjqdzgxh5rg68rrjgvf7dczky";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL bytestring containers iteratee mtl text
        ];
-       extraLibraries = [ sedna ];
+       librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113638,7 +116557,7 @@ self: {
        pname = "select";
        version = "0.4.0.1";
        sha256 = "180cj5m0bap1lb19s68icpn1dvk2s395cmlcc6dnwz3mpbj5alj0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://nonempty.org/software/haskell-select";
        description = "Wrap the select(2) POSIX function";
        license = stdenv.lib.licenses.bsd3;
@@ -113652,10 +116571,10 @@ self: {
        pname = "selectors";
        version = "0.0.3.0";
        sha256 = "1chs2d1j58y4r01231hh50gr4h0wnwsg9mardzq8ybqc6z6l32pr";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers template-haskell text xml-conduit
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        homepage = "http://github.com/rcallahan/selectors";
        description = "CSS Selectors for DOM traversal";
        license = stdenv.lib.licenses.bsd3;
@@ -113668,7 +116587,7 @@ self: {
        pname = "selenium";
        version = "0.2.5";
        sha256 = "0vr3d891pj947lv2grgbc83nm828gz9bbz6dp8mnf9bsji3ih7l7";
-       buildDepends = [ base HTTP HUnit mtl network pretty ];
+       libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113683,12 +116602,12 @@ self: {
        pname = "selenium-server";
        version = "0.1.0.0";
        sha256 = "13bqzhia3z35174hzf2ipl4ga62mcvh7whvhwj5b8rsazgi259qf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit directory filepath http-conduit
          http-conduit-downloader network process random regex-tdfa
          utf8-string
        ];
-       testDepends = [ base hspec text webdriver ];
+       testHaskellDepends = [ base hspec text webdriver ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/selenium-server.git";
        description = "Run the selenium standalone server for usage with webdriver";
@@ -113702,7 +116621,7 @@ self: {
        pname = "selfrestart";
        version = "0.1.0";
        sha256 = "100a427r8xjfv7fsh7khj3db9klqwnalfy33w23khxqp7k1bkq3n";
-       buildDepends = [ base directory executable-path unix ];
+       libraryHaskellDepends = [ base directory executable-path unix ];
        homepage = "https://github.com/nh2/selfrestart";
        description = "Restarts the current executable (on binary change)";
        license = stdenv.lib.licenses.mit;
@@ -113714,8 +116633,8 @@ self: {
        pname = "selinux";
        version = "0.1.1";
        sha256 = "1r0lwah32y3cza5jnihzwkl4wdk23qh7sgw6yzcajq7rjnzrf8qw";
-       buildDepends = [ base unix ];
-       extraLibraries = [ selinux ];
+       libraryHaskellDepends = [ base unix ];
+       librarySystemDepends = [ selinux ];
        homepage = "https://github.com/luite/selinux";
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -113728,7 +116647,7 @@ self: {
        pname = "semaphore-plus";
        version = "0.1";
        sha256 = "1349pzjs91xayx4dib520037mmgh4lvyc0wjx8h8yf492dvfbdkr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Various concurrency abstractions built on top of semaphores";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113741,7 +116660,7 @@ self: {
        pname = "semi-iso";
        version = "1.0.0.0";
        sha256 = "09hcg6hkyd4bnk0586gk4dzc76g64sx37jg0pz3jq87lrq8dzm5g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens profunctors semigroupoids transformers tuple-morph
        ];
        description = "Weakened partial isomorphisms, reversible computations";
@@ -113755,7 +116674,7 @@ self: {
        pname = "semigroupoid-extras";
        version = "5";
        sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh";
-       buildDepends = [ base profunctors semigroupoids ];
+       libraryHaskellDepends = [ base profunctors semigroupoids ];
        homepage = "http://github.com/ekmett/semigroupoid-extras";
        description = "Semigroupoids that depend on PolyKinds";
        license = stdenv.lib.licenses.bsd3;
@@ -113770,11 +116689,11 @@ self: {
        pname = "semigroupoids";
        version = "5.0.0.2";
        sha256 = "14q7284gq44h86j6jxi7pz1hxwfal0jgv6i2j1v2hdzqfnd8z5sw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
          distributive semigroups tagged transformers transformers-compat
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
@@ -113790,11 +116709,11 @@ self: {
        pname = "semigroupoids-syntax";
        version = "0.0.1";
        sha256 = "1r3byywgbcn82dq9xw4k9m5lgmhsgj02rxwmkrp4jwrjaax8v4zh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers contravariant distributive semigroupoids
          semigroups transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        jailbreak = true;
@@ -113811,7 +116730,7 @@ self: {
        pname = "semigroups";
        version = "0.16.2.2";
        sha256 = "0mzdv05yhrvnib62mwfwwj66fmyzs3axm0y5sn374ig2r113wzni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq hashable nats text
          unordered-containers
        ];
@@ -113826,7 +116745,7 @@ self: {
        pname = "semigroups-actions";
        version = "0.1";
        sha256 = "0vns2vdchszw34i12s9rfl4cm76ympfrivpb397j2vzg2i7bghqb";
-       buildDepends = [ base containers semigroups ];
+       libraryHaskellDepends = [ base containers semigroups ];
        jailbreak = true;
        homepage = "http://github.com/ppetr/semigroups-actions/";
        description = "Semigroups actions";
@@ -113845,7 +116764,8 @@ self: {
        sha256 = "1b56y5a45fha07rbqqjl6f5i2bw9pji97pagyjcn9bprzqfbiymy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base Boolean containers monoids ];
+       executableHaskellDepends = [
          base Boolean containers HUnit monoids QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -113862,7 +116782,7 @@ self: {
        pname = "semiring-simple";
        version = "0.2.1.0";
        sha256 = "074wp8bn6jhx8jjp78dzjpy9bdwc2i1a1sp6qkqj689zvrhwfman";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A module for dealing with semirings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113875,8 +116795,8 @@ self: {
        pname = "semver";
        version = "0.3.3.1";
        sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn";
-       buildDepends = [ attoparsec base deepseq text ];
-       testDepends = [ base tasty tasty-hunit text ];
+       libraryHaskellDepends = [ attoparsec base deepseq text ];
+       testHaskellDepends = [ base tasty tasty-hunit text ];
        homepage = "https://github.com/brendanhay/semver";
        description = "Representation, manipulation, and de/serialisation of Semantic Versions";
        license = "unknown";
@@ -113888,7 +116808,7 @@ self: {
        pname = "sendfile";
        version = "0.7.9";
        sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        homepage = "http://hub.darcs.net/stepcut/sendfile";
        description = "A portable sendfile library";
        license = stdenv.lib.licenses.bsd3;
@@ -113902,7 +116822,7 @@ self: {
        pname = "sendgrid-haskell";
        version = "1.0";
        sha256 = "0k5sbc4j9palfsp7ryap79scb50jhm0kzzq0lfa0r7py1pkx2ylp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers exceptions http-conduit
          monad-control text transformers
        ];
@@ -113921,7 +116841,7 @@ self: {
        sha256 = "1yzh1ngfddybxwqybvdg7l5lgg85kmhqhdl3mzsnndvz2labphp1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring containers process stm zeromq3-haskell
        ];
        jailbreak = true;
@@ -113942,10 +116862,11 @@ self: {
        sha256 = "1kv4ldms739x4b2fbs6hjwy8bssrwv0kavn4jqdc2svzlfqxqsqx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring cereal cmdargs directory filepath
          old-locale old-time process safecopy time unix
        ];
+       executableHaskellDepends = [ base directory filepath unix ];
        jailbreak = true;
        homepage = "https://github.com/noteed/sentry";
        description = "Process monitoring tool written and configured in Haskell";
@@ -113972,8 +116893,10 @@ self: {
        pname = "separated";
        version = "0.1.0";
        sha256 = "18kb9c6l0ikhzy3kiw4pg5b7vcm42hhbkp693qyygpr74hzpi2h2";
-       buildDepends = [ base bifunctors lens semigroupoids semigroups ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bifunctors lens semigroupoids semigroups
+       ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/tonymorris/separated";
@@ -113993,10 +116916,13 @@ self: {
        sha256 = "0kmzzxk1z10lqjawl0yqbv1n35b0bx41ikgiqii202m73khbg9qn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal containers cpphs deepseq-bounded directory
-         exceptions filepath ghc ghc-paths mtl process regex-base regex-pcre
-         syb template-haskell temporary transformers
+       libraryHaskellDepends = [
+         array base containers cpphs deepseq-bounded exceptions filepath ghc
+         ghc-paths mtl regex-pcre syb template-haskell temporary
+         transformers
+       ];
+       executableHaskellDepends = [
+         base Cabal cpphs directory process regex-base regex-pcre temporary
        ];
        jailbreak = true;
        homepage = "http://fremissant.net/seqaid";
@@ -114011,7 +116937,7 @@ self: {
        pname = "seqalign";
        version = "0.2.0.4";
        sha256 = "01a3fhymyp7279hym03zzz6qkh5h47nq5y1xglar0n46imjr98af";
-       buildDepends = [ base bytestring vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114022,7 +116948,7 @@ self: {
        pname = "seqid";
        version = "0.1.0";
        sha256 = "0q5vs8kravhiq906rrzi5iw5837bb8s6fibycgdracyfwrzvxly0";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
@@ -114034,7 +116960,7 @@ self: {
        pname = "seqid";
        version = "0.4.1";
        sha256 = "0lfgw2fwizhid58aj4ncia8pqldzmkpzrmpgmvw51pgd0c25wjz0";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114045,7 +116971,7 @@ self: {
        pname = "seqid-streams";
        version = "0.1.0";
        sha256 = "13g0c76lyl3b4qdznpyr2a3szjb1dch2bsvgyv68br94045fk6d2";
-       buildDepends = [ base io-streams seqid ];
+       libraryHaskellDepends = [ base io-streams seqid ];
        jailbreak = true;
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
@@ -114057,7 +116983,7 @@ self: {
        pname = "seqid-streams";
        version = "0.4.0";
        sha256 = "05h2878dlrnlv66lsf41bngk4w9nwqviq4jl3bj0wdhcdvy9d9il";
-       buildDepends = [ base io-streams seqid ];
+       libraryHaskellDepends = [ base io-streams seqid ];
        jailbreak = true;
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
@@ -114071,11 +116997,11 @@ self: {
        pname = "seqloc";
        version = "0.6.1.1";
        sha256 = "1hsm9y6q0g7ixnqj562a33lmyka4k7f778fndcmn25v4m1myfda4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base biocore bytestring hashable unordered-containers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base biocore bytestring hashable QuickCheck random
          unordered-containers vector
        ];
@@ -114097,13 +117023,18 @@ self: {
        sha256 = "175nifix2vax5xsinz604mm3nid7krh5a9d7gqpy02wh4f5qdrja";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base biocore bytestring conduit conduit-extra hashable
+         iteratee lifted-base resourcet seqloc transformers-base
+         unordered-containers
+       ];
+       executableHaskellDepends = [
          attoparsec base biocore bytestring cmdtheline conduit conduit-extra
          filepath hashable iteratee lifted-base monads-tf pretty QuickCheck
          random resourcet seqloc transformers transformers-base
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base biocore bytestring conduit conduit-extra directory
          hashable iteratee lifted-base process QuickCheck random seqloc
          transformers transformers-base unordered-containers vector
@@ -114120,7 +117051,7 @@ self: {
        pname = "sequence";
        version = "0.9.8";
        sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        homepage = "https://github.com/atzeus/sequence";
        description = "A type class for sequences and various sequence data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -114134,7 +117065,10 @@ self: {
        sha256 = "1q9rrr0nrnnhdv2jwpwjs1r98g3xdbqi7sfj7zsv1dykzalmc2nd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ghc transformers ];
+       libraryHaskellDepends = [
+         base bytestring containers ghc transformers
+       ];
+       executableHaskellDepends = [ base bytestring containers ];
        homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -114147,7 +117081,7 @@ self: {
        pname = "sequential-index";
        version = "0.2.0.1";
        sha256 = "0vd7nrkx59vsxrhpb46kgzbvz7v830wh5zx3vg9494wvski983y6";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/aristidb/sequential-index";
        description = "Sequential numbers that allow arbitrarily inserting numbers - for containers";
        license = stdenv.lib.licenses.bsd3;
@@ -114163,7 +117097,11 @@ self: {
        sha256 = "1m41yk7bgazl9g30im8qvnvzjh4f4kvrd6jhk1wz2r31xxlxp7ms";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary bytestring containers mtl nlp-scores pretty split
+         text vector
+       ];
+       executableHaskellDepends = [
          array base binary bytestring containers mtl nlp-scores pretty split
          text vector
        ];
@@ -114181,14 +117119,13 @@ self: {
        pname = "serf";
        version = "0.1.1.0";
        sha256 = "0ry0shqmazxcsjxsh6amvz2fky2fy3wwlck7d331j8csz7fwdjfn";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base conduit conduit-extra mtl operational process
          resourcet text
        ];
        homepage = "http://github.com/sanetracker/serf";
        description = "Interact with Serf via Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serial" = callPackage
@@ -114197,7 +117134,7 @@ self: {
        pname = "serial";
        version = "0.2.7";
        sha256 = "1h52h8i28bhamp57q57ih1w9h26ih9g1l25gg9rhiwv5ykhy2vfq";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "POSIX serial port wrapper";
        license = "LGPL";
      }) {};
@@ -114210,8 +117147,10 @@ self: {
        pname = "serial-test-generators";
        version = "0.1.3";
        sha256 = "0crivy8j3jnlm2vpbvfqgvmr6afwyg3lkzaj7jl0j6vgvq16xyas";
-       buildDepends = [ aeson base binary bytestring cereal here ];
-       testDepends = [
+       libraryHaskellDepends = [
+         aeson base binary bytestring cereal here
+       ];
+       testHaskellDepends = [
          aeson base binary bytestring cereal here hspec QuickCheck
          system-fileio transformers
        ];
@@ -114225,8 +117164,8 @@ self: {
        pname = "serialport";
        version = "0.4.7";
        sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [ base bytestring HUnit ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [ base bytestring HUnit ];
        homepage = "https://github.com/jputcu/serialport";
        description = "Cross platform serial port library";
        license = stdenv.lib.licenses.bsd3;
@@ -114243,12 +117182,12 @@ self: {
        pname = "servant";
        version = "0.4.4";
        sha256 = "1v0n194gj2cy16scfgs94q2vcb2baryp0rl1s21zwww1kfgmpffj";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
          string-conversions text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring directory doctest filemanip
          filepath hspec parsec QuickCheck quickcheck-instances
          string-conversions text url
@@ -114268,9 +117207,11 @@ self: {
        sha256 = "1fnlyk6848nzby0nxdrvm4d0vvisdx6pmlzjnh6y1q5q8wq4m48j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring http-media JuicyPixels servant servant-server wai
-         warp
+       libraryHaskellDepends = [
+         base bytestring http-media JuicyPixels servant
+       ];
+       executableHaskellDepends = [
+         base JuicyPixels servant servant-server wai warp
        ];
        homepage = "https://github.com/tvh/servant-JuicyPixels";
        description = "servant-JuicyPixels";
@@ -114283,7 +117224,7 @@ self: {
        pname = "servant-blaze";
        version = "0.4.4";
        sha256 = "140sgy7hcp6pxjrh7zk5i59sq79swqgg76gakgdnvkg7zz0a150s";
-       buildDepends = [ base blaze-html http-media servant ];
+       libraryHaskellDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
        license = stdenv.lib.licenses.bsd3;
@@ -114300,12 +117241,12 @@ self: {
        pname = "servant-client";
        version = "0.4.4";
        sha256 = "0m5aw8pb6iga2rf8m3mnx58xh6jnh33rvvkdzbmb3s6vplsqh6vz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
          string-conversions text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring deepseq either hspec http-client http-media
          http-types HUnit network QuickCheck servant servant-server text wai
          warp
@@ -114326,12 +117267,18 @@ self: {
        sha256 = "0kp5346jxakjz8x92wvayz7c3f2xcvnpsgg9dxgb41imvww2pyfc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring bytestring-conversion case-insensitive
-         hashable http-media http-types lens servant string-conversions text
+       libraryHaskellDepends = [
+         base bytestring bytestring-conversion case-insensitive hashable
+         http-media http-types lens servant string-conversions text
          unordered-containers
        ];
-       testDepends = [ aeson base hspec lens servant string-conversions ];
+       executableHaskellDepends = [
+         aeson base bytestring-conversion lens servant string-conversions
+         text
+       ];
+       testHaskellDepends = [
+         aeson base hspec lens servant string-conversions
+       ];
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
@@ -114349,10 +117296,13 @@ self: {
        sha256 = "0lq9kd96lzkyx35n46q0yxk44lirpnh9gv4wji8i8qjqf18fkg6c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring ede either filepath http-media http-types
-         semigroups servant servant-server text transformers
-         unordered-containers vector wai warp xss-sanitize
+         semigroups servant text transformers unordered-containers vector
+         wai xss-sanitize
+       ];
+       executableHaskellDepends = [
+         base ede http-media servant-server warp
        ];
        homepage = "http://github.com/alpmestan/servant-ede";
        description = "Combinators for rendering EDE templates in servant web applications";
@@ -114371,7 +117321,7 @@ self: {
        sha256 = "1qzrlkqwfv4w7d3sjbvz3s4kgx0x6zn0hh07hm955vvlfksgwjym";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory either http-types js-jquery lucid
          random servant servant-client servant-docs servant-jquery
          servant-lucid servant-server text time transformers wai wai-extra
@@ -114393,11 +117343,11 @@ self: {
        sha256 = "04j2cnxrx2hljxnha94nbmql61zw3apz7n32mf23vf749svjcmvd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base charset filepath lens servant servant-server stm text
-         transformers warp
+       libraryHaskellDepends = [ base charset lens servant text ];
+       executableHaskellDepends = [
+         aeson base filepath servant servant-server stm transformers warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
        homepage = "http://haskell-servant.github.io/";
@@ -114411,7 +117361,7 @@ self: {
        pname = "servant-lucid";
        version = "0.4.4";
        sha256 = "1vy9vdd1jkvx7nzcw6a83az4p351ds98x7wasn496h3bwk23bbhr";
-       buildDepends = [ base http-media lucid servant ];
+       libraryHaskellDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
@@ -114424,16 +117374,15 @@ self: {
      mkDerivation {
        pname = "servant-pandoc";
        version = "0.4.1.1";
-       revision = "1";
        sha256 = "00clyv651fyz0dx9b4g5c0z5z3bgybgg93x4s1b1lciwsin8i6nk";
+       revision = "1";
        editedCabalFile = "ee2eff37865c8a5c246021f6d05aae5f075ba5910cac6d650312aafb2f4bf091";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-media lens pandoc-types servant-docs text
          unordered-containers
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pool" = callPackage
@@ -114442,7 +117391,7 @@ self: {
        pname = "servant-pool";
        version = "0.1";
        sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69";
-       buildDepends = [ base resource-pool servant time ];
+       libraryHaskellDepends = [ base resource-pool servant time ];
        homepage = "http://github.com/zalora/servant-pool";
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
@@ -114457,7 +117406,7 @@ self: {
        pname = "servant-postgresql";
        version = "0.1";
        sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring postgresql-simple servant servant-pool
          servant-response
        ];
@@ -114473,7 +117422,7 @@ self: {
        pname = "servant-response";
        version = "0.1";
        sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy";
-       buildDepends = [ aeson base http-types text ];
+       libraryHaskellDepends = [ aeson base http-types text ];
        homepage = "http://github.com/zalora/servant";
        description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types";
        license = stdenv.lib.licenses.bsd3;
@@ -114487,7 +117436,7 @@ self: {
        pname = "servant-scotty";
        version = "0.1.1";
        sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base http-types scotty servant servant-response text
          transformers
        ];
@@ -114511,12 +117460,13 @@ self: {
        sha256 = "0byxply71jv558bs33i1j9whrfgfa1iygdjsxap7wiq9f27iyaa9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring either filepath http-types mmorph
          mtl network-uri safe servant split string-conversions
          system-filepath text transformers wai wai-app-static warp
        ];
-       testDepends = [
+       executableHaskellDepends = [ aeson base servant text wai warp ];
+       testHaskellDepends = [
          aeson base bytestring bytestring-conversion directory doctest
          either exceptions filemanip filepath hspec hspec-wai http-types mtl
          network parsec QuickCheck servant string-conversions temporary text
@@ -114536,11 +117486,11 @@ self: {
        pname = "serversession";
        version = "1.0.1";
        sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring data-default hashable nonce
          path-pieces text time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring bytestring containers data-default
          hspec nonce path-pieces QuickCheck text time transformers
          unordered-containers
@@ -114558,11 +117508,11 @@ self: {
        pname = "serversession-backend-acid-state";
        version = "1.0.1";
        sha256 = "1hc5vpy82pxd0wlzabw3md4gvhxbnvs8wsa0wammni2a1pf123a7";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state base containers mtl safecopy serversession
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          acid-state base containers hspec mtl safecopy serversession
          unordered-containers
        ];
@@ -114582,12 +117532,12 @@ self: {
        pname = "serversession-backend-persistent";
        version = "1.0.1";
        sha256 = "0n4l2hgfzlg1ra4blq6dcp61mvcfm6k8cwafi6rrzid67amr022k";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cereal path-pieces
          persistent serversession tagged text time transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring bytestring cereal hspec monad-logger
          path-pieces persistent persistent-postgresql persistent-sqlite
          persistent-template QuickCheck resource-pool serversession text
@@ -114596,7 +117546,6 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-backend-redis" = callPackage
@@ -114608,18 +117557,17 @@ self: {
        pname = "serversession-backend-redis";
        version = "1.0";
        sha256 = "0r1zr25zw80s4psscdwscf7wlm8qfw4dyk0kkczzvj5434jnxnj2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring hedis path-pieces serversession tagged text time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hedis hspec path-pieces serversession text time
          transformers unordered-containers
        ];
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-frontend-snap" = callPackage
@@ -114631,14 +117579,13 @@ self: {
        pname = "serversession-frontend-snap";
        version = "1.0";
        sha256 = "1n29c3jfv61fz9kfc4zjwj7df1fll74l2kqccxmg4id8jpsrywci";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring nonce path-pieces serversession snap snap-core text
          time transformers unordered-containers
        ];
        homepage = "https://github.com/yesodweb/serversession";
        description = "Snap bindings for serversession";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-frontend-wai" = callPackage
@@ -114650,14 +117597,13 @@ self: {
        pname = "serversession-frontend-wai";
        version = "1.0";
        sha256 = "0rxifhjirhmhk1x14m6lvpv6dl32g179i4i3xi3dq59r7l716j0b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cookie data-default path-pieces serversession text
          time transformers unordered-containers vault wai wai-session
        ];
        homepage = "https://github.com/yesodweb/serversession";
        description = "wai-session bindings for serversession";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-frontend-yesod" = callPackage
@@ -114669,7 +117615,7 @@ self: {
        pname = "serversession-frontend-yesod";
        version = "1.0";
        sha256 = "0lv7gkj4inks98g44n5kqvx5s4c66lmxf7gqfdly54znggglcf86";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers cookie data-default path-pieces
          serversession text time transformers unordered-containers wai
          yesod-core
@@ -114691,7 +117637,7 @@ self: {
        sha256 = "02c570ghvrp0qw2s6k30548k619424p77bpi1mfh02yrv1a45jdk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder blaze-html bytestring cmdargs containers
          directory hamlet http-types mime-types shakespeare-css text
          transformers wai wai-app-static wai-extra warp
@@ -114711,13 +117657,12 @@ self: {
        pname = "ses-html";
        version = "0.3.0.0";
        sha256 = "1clf24kyyp9b8r22bacp44q0gf83zr6k1b33dz4bfy935wbnlshy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-html byteable bytestring cryptohash
          HsOpenSSL http-streams tagsoup time
        ];
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ses-html-snaplet" = callPackage
@@ -114728,7 +117673,7 @@ self: {
        pname = "ses-html-snaplet";
        version = "0.1.0.0";
        sha256 = "1lrr321gk7djyzv9yb7x967d53azxflh4jkf9zlkpxh3p7rz6793";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring configurator ses-html snap text
          transformers
        ];
@@ -114745,7 +117690,9 @@ self: {
        pname = "sessions";
        version = "2008.7.18";
        sha256 = "0zijfbakj3fh052b8nvaddg1xy87ysfbm3qnibisam93lx0agp2s";
-       buildDepends = [ base binary bytestring containers mtl network ];
+       libraryHaskellDepends = [
+         base binary bytestring containers mtl network
+       ];
        homepage = "http://www.wellquite.org/sessions/";
        description = "Session Types for Haskell";
        license = "GPL";
@@ -114760,7 +117707,7 @@ self: {
        sha256 = "0323l2jnk5caa3wsxqxgsdkvnfs9llb4yh13c0rx55q0is8a203j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers utility-ht ];
+       libraryHaskellDepends = [ base containers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/set-cover/";
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
@@ -114772,7 +117719,7 @@ self: {
        pname = "set-extra";
        version = "1.3.2";
        sha256 = "0lyxz1mnslsq8crc0vnvygz8r5r3iqyl457sjvg2j6lnz132917p";
-       buildDepends = [ base containers mtl syb ];
+       libraryHaskellDepends = [ base containers mtl syb ];
        homepage = "https://github.com/ddssff/set-extra";
        description = "Functions that could be added to Data.Set.";
        license = stdenv.lib.licenses.bsd3;
@@ -114784,7 +117731,7 @@ self: {
        pname = "set-monad";
        version = "0.2.0.0";
        sha256 = "1nxgn8d0qff4s66gcvfrnxjh0aq5q5jk0s453km28457qh946azb";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        description = "Set monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114797,13 +117744,14 @@ self: {
        pname = "set-with";
        version = "0.0.1";
        sha256 = "0mkc44gkhjibq3zhxgiw3c7nfy03jmjmrafdr8x9f5ak4l9ns0h4";
-       buildDepends = [ base containers invariant ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers invariant ];
+       testHaskellDepends = [
          base QuickCheck quickcheck-instances tasty tasty-hunit
          tasty-quickcheck
        ];
        description = "Set of elements sorted by a different data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setdown" = callPackage
@@ -114816,11 +117764,11 @@ self: {
        sha256 = "1007cb1p8ymnm39cbk423jfgzvdk7yip54yy3ydiiqwkfy2rxs5g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring cmdargs containers directory filepath mtl
          split text uuid
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://bitbucket.org/robertmassaioli/setdown";
        description = "Treating files as sets to perform rapid set manipulation";
@@ -114832,10 +117780,10 @@ self: {
      mkDerivation {
        pname = "setenv";
        version = "0.1.1.3";
-       revision = "1";
        sha256 = "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73";
+       revision = "1";
        editedCabalFile = "c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "A cross-platform library for setting environment variables";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114846,7 +117794,7 @@ self: {
        pname = "setlocale";
        version = "1.0.0.3";
        sha256 = "17n173byca8k5cmqmnzgjk7772ibhg5am5sd1adfp0zd0rcqnqsd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
        description = "Haskell bindings to setlocale";
        license = stdenv.lib.licenses.bsd3;
@@ -114858,7 +117806,7 @@ self: {
        pname = "setops";
        version = "0.1.2";
        sha256 = "1mja48p8g9prfk53218qbv83ks6rs63s0n6jad0jgrj1221afpvg";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Uniform names (and Unicode operators) for set operations on data structures";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -114869,7 +117817,7 @@ self: {
        pname = "setters";
        version = "0.1";
        sha256 = "0rw9m9f7cqi0kvjcq81b7qrn3v672d4w0ch1k377m1151vg20a2z";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Small (TH) library to declare setters for typical `record' data type fields";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114885,11 +117833,11 @@ self: {
        sha256 = "19blk6nzbsm9syx45zzlmqxq1mi2prv0jq12cf83b4kf4pvwk32n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cmdargs containers dlist ghc-prim mtl
-         vector
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers dlist ghc-prim mtl vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base bytestring cmdargs ];
+       testHaskellDepends = [
          base bytestring containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -114904,12 +117852,12 @@ self: {
      mkDerivation {
        pname = "sexp-show";
        version = "0.1.1.0";
-       revision = "1";
        sha256 = "1ip1y1y2z2d6ib3ihq18j93081cp2lkwjm27bc0d0ihixd154gy5";
+       revision = "1";
        editedCabalFile = "314f05a4542c657517d485faa31ec23324458782cf0112acda948fb7092a154c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base pretty-show ];
+       executableHaskellDepends = [ base pretty-show ];
        description = "Produce a s-expression representation of Show values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114924,9 +117872,10 @@ self: {
        sha256 = "1ffs5r065zkipsa3y4v14if45fqjbzgksj3r40qci453kc3xq93p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base64-string binary bytestring pretty QuickCheck random
+       libraryHaskellDepends = [
+         base base64-string binary bytestring pretty
        ];
+       executableHaskellDepends = [ QuickCheck random ];
        description = "S-expression printer and parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114938,7 +117887,7 @@ self: {
        pname = "sext";
        version = "0.1.0.0";
        sha256 = "0vq7fbm8gm7fym9qjaxsy2mk89rn2pjfkbhv3ym94xslcybwrwpy";
-       buildDepends = [ base bytestring template-haskell text ];
+       libraryHaskellDepends = [ base bytestring template-haskell text ];
        jailbreak = true;
        homepage = "http://github.com/dzhus/sext/";
        description = "Lists, Texts and ByteStrings with type-encoded length";
@@ -114952,8 +117901,8 @@ self: {
        pname = "sfml-audio";
        version = "0.7.1.1816";
        sha256 = "057z0z2xbls1p43k0kixbw26v0pv6lsvfh5ycjx37r8xw8ks31ba";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ libsndfile openal ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ libsndfile openal ];
        homepage = "http://patch-tag.com/r/shahn/sfml-audio";
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
@@ -114965,7 +117914,7 @@ self: {
        pname = "sfmt";
        version = "0.1.1";
        sha256 = "1jwzsk43kkvlmw551z46bhbvccf9yn1ncrhd27lm4pn93as2v1p6";
-       buildDepends = [ base bytestring entropy primitive ];
+       libraryHaskellDepends = [ base bytestring entropy primitive ];
        homepage = "https://github.com/philopon/sfmt-hs";
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
        license = stdenv.lib.licenses.bsd3;
@@ -114980,7 +117929,7 @@ self: {
        pname = "sgd";
        version = "0.3.7";
        sha256 = "1z4w81mbk2syrxacfrjb690ik6lcsh1fb7m3d65zlz37y3pk5q04";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq filepath lazy-io logfloat
          monad-par mtl primitive random temporary vector
        ];
@@ -114998,7 +117947,7 @@ self: {
        pname = "sgf";
        version = "0.1.3.1";
        sha256 = "1bwfphbbkkwi2q8l0916yvpl58j7fb0nr144w582vpsq3wfvgiwc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers encoding extensible-exceptions mtl parsec split
          time transformers
        ];
@@ -115015,7 +117964,7 @@ self: {
        sha256 = "0ai9j735wj5lclixwlki5g2s50g2mscglfrir2q7bj0lwg76dygi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio regex-compat ];
+       executableHaskellDepends = [ base bio regex-compat ];
        homepage = "http://blog.malde.org/";
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
@@ -115030,7 +117979,8 @@ self: {
        sha256 = "1qasdpm244dr7zh3hnr51jbp1b8qnrwbxvm3nnrbaf7bah1y4d2i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring io-streams SHA ];
+       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";
@@ -115047,17 +117997,18 @@ self: {
        sha256 = "1m0zxnmxn536jnaj5l4qpj5k7xshffsbca0cl53y3dnb6ssq9fni";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base doctest filemanip fsnotify MissingH mtl process safe
          system-filepath text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest filemanip fsnotify MissingH mtl process safe
          system-filepath text
        ];
        homepage = "http://github.com/karun012/shadower";
        description = "An automated way to run doctests in files that are changing";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shadowsocks" = callPackage
@@ -115071,11 +118022,11 @@ self: {
        sha256 = "1630lfspy8fnsi9j2np9sygdng59bxx1q54kcr7cx7rgq434s5ys";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary bytestring containers cryptohash HsOpenSSL
          network optparse-applicative unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring containers cryptohash HUnit process
        ];
        homepage = "https://github.com/rnons/shadowsocks-haskell";
@@ -115092,7 +118043,7 @@ self: {
        pname = "shady-gen";
        version = "0.5.1";
        sha256 = "1vsk0ah6ngcgn5i6xda9j400xan1y843v25hc4lqcql37mg3ifn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-numbers base Boolean containers data-treify MemoTrie
          mtl ty TypeCompose vector-space wl-pprint
        ];
@@ -115111,7 +118062,7 @@ self: {
        pname = "shady-graphics";
        version = "0.5.0";
        sha256 = "1wzlygmpjfys4ijyqh8ymv2f75swy9zd0g05gxpqhxkvlrw3jdk4";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-numbers base Boolean containers data-treify MemoTrie
          mtl shady-gen ty TypeCompose vector-space wl-pprint
        ];
@@ -115133,12 +118084,17 @@ self: {
        sha256 = "18vkyc8h7dpz5d3snfdssfqd1cfp22wnpv63ckrik9p8r4j6i01c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq directory extra filepath hashable
          js-flot js-jquery old-time process random time transformers unix
          unordered-containers utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery old-time process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
          base binary bytestring deepseq directory extra filepath hashable
          js-flot js-jquery old-time process QuickCheck random time
          transformers unix unordered-containers utf8-string
@@ -115156,7 +118112,9 @@ self: {
        sha256 = "1ql2w164f2sfmbcqk2da00nihwfr6a85f99apx5dwpbkfbc53n8l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process
+       ];
        jailbreak = true;
        homepage = "https://github.com/samplecount/shake-cabal-build";
        description = "Utility for building Shake build systems using Cabal sandboxes";
@@ -115171,7 +118129,7 @@ self: {
        pname = "shake-extras";
        version = "0.1.1";
        sha256 = "0qqzdhd6q8hhix7lx4j1v4j37b8jnv710clilk2wxbyvz03rbblz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs directory filepath shake
        ];
        jailbreak = true;
@@ -115189,11 +118147,11 @@ self: {
        pname = "shake-language-c";
        version = "0.8.0";
        sha256 = "1b7yi1cprgiyx06dnhc94shmfx5n1am7zhgiwg6g0bk2gg20im35";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class fclabels process shake split
          unordered-containers
        ];
-       testDepends = [ base directory doctest hspec shake ];
+       testHaskellDepends = [ base directory doctest hspec shake ];
        homepage = "https://github.com/samplecount/shake-language-c";
        description = "Utilities for cross-compiling with Shake";
        license = stdenv.lib.licenses.asl20;
@@ -115205,7 +118163,9 @@ self: {
        pname = "shake-minify";
        version = "0.1.4";
        sha256 = "17q0xzjj6xl9h3s6dlxgkxxz2dd4ycbh918ali1lrq2dq9gig3ir";
-       buildDepends = [ base bytestring css-text hjsmin shake text ];
+       libraryHaskellDepends = [
+         base bytestring css-text hjsmin shake text
+       ];
        homepage = "https://github.com/LukeHoersten/shake-minify";
        description = "Shake Minify Rules";
        license = stdenv.lib.licenses.bsd3;
@@ -115217,7 +118177,7 @@ self: {
        pname = "shake-pack";
        version = "0.1.2";
        sha256 = "0iy2n7cg7fm0by479s1hm5w2jzzfdavjlyq6nf2sh6qlkc6w2ga1";
-       buildDepends = [ base bytestring bzlib shake tar ];
+       libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        homepage = "https://github.com/LukeHoersten/shake-pack";
        description = "Shake File Pack Rule";
        license = stdenv.lib.licenses.bsd3;
@@ -115235,7 +118195,13 @@ self: {
        sha256 = "1m4b7pvpr5mg6g5sc9xhnn7i9lx65vb3ass38zkyrfgksg65lwhf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory filepath ghc ghc-paths
+         haskeline haskell-src HUnit mtl old-time parsec3 QuickCheck
+         regex-posix template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath ghc ghc-paths
          haskeline haskell-src HUnit mtl old-time parsec3 QuickCheck
          regex-posix template-haskell test-framework test-framework-hunit
@@ -115256,15 +118222,15 @@ self: {
      mkDerivation {
        pname = "shakespeare";
        version = "2.0.5";
-       revision = "1";
        sha256 = "0jdmmrglzqzpj4cfiyab3kfr0vlz1rfc893nrq94b1rg4vwh1zzh";
+       revision = "1";
        editedCabalFile = "c3cde3794b87e5f99500aac7199a66ad95985ba716170551fe40e82452a61ebc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim parsec process template-haskell text time
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim hspec HUnit parsec process template-haskell
          text time transformers
@@ -115280,7 +118246,7 @@ self: {
        pname = "shakespeare-css";
        version = "1.1.0";
        sha256 = "18d0kxfrs0aj9pfd9p1j7w5amch1hvsww3xycgn5qk6i0z7l4ywz";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Stick your haskell variables into css at compile time. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -115293,7 +118259,7 @@ self: {
        pname = "shakespeare-i18n";
        version = "1.1.0";
        sha256 = "0ahhg9r7d8kdxn0x33bp5p8wmwkh1yvdqhw05yjwif0ky5y9h625";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A type-based approach to internationalization. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -115306,7 +118272,7 @@ self: {
        pname = "shakespeare-js";
        version = "1.3.0";
        sha256 = "0hihcrgvzf4nsrgw6vqpkzbgskq01yc1mnvp7g2wy7vq0dv4pjp4";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -115318,7 +118284,7 @@ self: {
        pname = "shakespeare-text";
        version = "1.1.0";
        sha256 = "18ixixb9aqn630s9wblxcki1gggm4i0fj9752c55p3b42q8h86rc";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Interpolation with quasi-quotation: put variables strings (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -115330,7 +118296,7 @@ self: {
        pname = "shana";
        version = "2009.12.1";
        sha256 = "0fg16nbi0r0pdd3sfabzdz1f4595x3hz3b4pxfwy8l78p8lppv0y";
-       buildDepends = [ base directory regex-posix ];
+       libraryHaskellDepends = [ base directory regex-posix ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "treat haskell functions as unix pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -115344,7 +118310,7 @@ self: {
        pname = "shapefile";
        version = "0.0.0.1";
        sha256 = "0j6c01igj767ab3pd5yzkjkd8374rmjr57f2gw5c69qnh288c6w6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 dbf filepath rwlock
        ];
        homepage = "http://code.haskell.org/~mokus/shapefile";
@@ -115360,8 +118326,10 @@ self: {
        pname = "shapely-data";
        version = "0.1";
        sha256 = "1yn1rim4y6j834ngpz47wsi5pyhbi2gaznj0pyrqrmallzv0zin8";
-       buildDepends = [ base proxy-kindness tagged template-haskell ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base proxy-kindness tagged template-haskell
+       ];
+       testHaskellDepends = [
          base containers proxy-kindness QuickCheck tagged template-haskell
        ];
        homepage = "http://github.com/jberryman/shapely-data";
@@ -115371,16 +118339,16 @@ self: {
      }) {};
 
   "shared-buffer" = callPackage
-    ({ mkDerivation, base, bytestring, hsc2hs, QuickCheck
-     , test-framework, test-framework-quickcheck2, unix
+    ({ mkDerivation, base, bytestring, QuickCheck, test-framework
+     , test-framework-quickcheck2, unix
      }:
      mkDerivation {
        pname = "shared-buffer";
        version = "0.2.2";
        sha256 = "031aabqynp5d4k47rjjwyx3xjzh4f1k4csfgdnnhsf45xv5nc3kc";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [
-         base bytestring hsc2hs QuickCheck test-framework
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [
+         base bytestring QuickCheck test-framework
          test-framework-quickcheck2 unix
        ];
        jailbreak = true;
@@ -115396,8 +118364,8 @@ self: {
        pname = "shared-fields";
        version = "0.2.0.0";
        sha256 = "107n6w4dn0n4iv7qmfm1d9y04rgj3ab3qc8kyqqddnbnfa44y157";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base Cabal hspec lens text ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base Cabal hspec lens text ];
        homepage = "http://github.com/intolerable/shared-fields";
        description = "a tiny library for using shared lens fields";
        license = stdenv.lib.licenses.bsd3;
@@ -115409,8 +118377,8 @@ self: {
        pname = "shared-memory";
        version = "0.1.0.0";
        sha256 = "15h4j81q2v97dx61pnpaqs99z4vvlw7xl1dxbh878imxj8zn4z84";
-       buildDepends = [ base unix ];
-       testDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base unix ];
+       testHaskellDepends = [ base bytestring unix ];
        homepage = "https://github.com/nh2/shared-memory";
        description = "POSIX shared memory";
        license = stdenv.lib.licenses.mit;
@@ -115422,7 +118390,7 @@ self: {
        pname = "sharedio";
        version = "0.1.0";
        sha256 = "08hmmb2nn2lpirdnpp928m6xadzkv8k90x1nycw2b58vp1rpk7zv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nh2/haskell-sharedio";
        description = "Bundles shared calls to IO functions to perform them only once";
        license = stdenv.lib.licenses.mit;
@@ -115436,7 +118404,8 @@ self: {
        sha256 = "0x3jc2c4j0b8xavap7hj4673zb89zgww1pv13sddkn6p49pk1zvc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath mtl ];
+       libraryHaskellDepends = [ base filepath mtl ];
+       executableHaskellDepends = [ base filepath mtl ];
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
@@ -115453,7 +118422,7 @@ self: {
        pname = "shell-conduit";
        version = "4.5.2";
        sha256 = "04kc9gzlqbw3d2pj6qn13pnmmrlmx8nmmj5bvxn7zdmh25nw6ys2";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring conduit conduit-extra control-monad-loop
          directory filepath monad-control monads-tf process resourcet
          semigroups split template-haskell text transformers
@@ -115470,7 +118439,9 @@ self: {
        pname = "shell-escape";
        version = "0.2.0";
        sha256 = "0jms5hdl8zrpxwypq9998798krspclivprirrcq59r179alrng72";
-       buildDepends = [ base binary bytestring containers vector ];
+       libraryHaskellDepends = [
+         base binary bytestring containers vector
+       ];
        homepage = "http://github.com/solidsnack/shell-escape";
        description = "Shell escaping library";
        license = stdenv.lib.licenses.bsd3;
@@ -115482,10 +118453,9 @@ self: {
        pname = "shell-monad";
        version = "0.6.4";
        sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13";
-       buildDepends = [ base containers text unix ];
+       libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-pipe" = callPackage
@@ -115496,7 +118466,8 @@ self: {
        sha256 = "0xyarxm2hs8yypmz8w4zbnjvv5xl9dd657j7j3a82gbghsb93vyy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://gnu.rtin.bz/directory/devel/prog/other/shell-haskell.html";
        description = "Pipe streams through external shell commands";
        license = "GPL";
@@ -115511,7 +118482,7 @@ self: {
        pname = "shellish";
        version = "0.1.4";
        sha256 = "1ldwid270mwyky6zmggbvn72hvs4s39hhf2zj8r0jahxnwlpbfan";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath mtl process strict time
          unix-compat
        ];
@@ -115529,7 +118500,7 @@ self: {
        pname = "shellmate";
        version = "0.1.6";
        sha256 = "17fpl0h58cw5hp6jzrajkl629mw2c6x15cmlcbdxqk9xlxqrg4hr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath process temporary time transformers
        ];
        homepage = "http://github.com/valderman/shellmate";
@@ -115548,7 +118519,7 @@ self: {
        sha256 = "0ad8sc4md8mp0l0s40yx7qbgaabqzd4nz8lx15ajcdbwr2ffnra2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs Diff directory filemanip filepath HUnit parsec
          pretty-show process regex-tdfa safe test-framework
          test-framework-hunit utf8-string
@@ -115571,13 +118542,13 @@ self: {
        sha256 = "173aypf9dcrkhnaz5gfcpicw9ha6cgs7javds3s7m2qr2vdj8rhs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
          system-fileio system-filepath text time transformers
          transformers-base unix-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions hspec HUnit lifted-async lifted-base monad-control mtl
          process system-fileio system-filepath text time transformers
@@ -115596,14 +118567,13 @@ self: {
        pname = "shelly-extra";
        version = "0.3.0.1";
        sha256 = "1mc55m10s89mp2fz267sqhayaj0igj27kwyx7hnk5h23w0nhc0h5";
-       buildDepends = [ async base mtl SafeSemaphore shelly ];
-       testDepends = [
+       libraryHaskellDepends = [ async base mtl SafeSemaphore shelly ];
+       testHaskellDepends = [
          async base hspec HUnit mtl SafeSemaphore shelly text
        ];
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shelly features that require extra dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shivers-cfg" = callPackage
@@ -115614,7 +118584,7 @@ self: {
        pname = "shivers-cfg";
        version = "0.1";
        sha256 = "1jrf9l25lcmqh55zy3g2nbi60ph9m0ycvjz1q0qvpb403kqhd0wa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory HPDF language-dot mtl pretty process
        ];
        description = "Implementation of Shivers' Control-Flow Analysis";
@@ -115628,7 +118598,7 @@ self: {
        pname = "shoap";
        version = "0.2";
        sha256 = "0ywb8bfkdpqqv2spb92j9rzx4fv5k1c7b65wj0zwnn9rp7ckq59v";
-       buildDepends = [ base curl ];
+       libraryHaskellDepends = [ base curl ];
        jailbreak = true;
        homepage = "http://richardfergie.com/shoap";
        description = "A very basic SOAP package";
@@ -115641,7 +118611,7 @@ self: {
        pname = "shortcircuit";
        version = "0.1";
        sha256 = "02gcr6glp1kjs4l7ds8487dbblr1pw8nyq34i3rg1hskz0b83l6z";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aristidb/shortcircuit";
        description = "Short-circuit values and expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -115653,7 +118623,7 @@ self: {
        pname = "shortcut-links";
        version = "0.4.0.0";
        sha256 = "1i9a5hgzw9w9fqg7vjixc90ck49ag0ikm9bjl2xc30gvjslpy3r8";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        homepage = "http://github.com/aelve/shortcut-links";
        description = "Link shortcuts for use in text markup";
        license = stdenv.lib.licenses.bsd3;
@@ -115665,7 +118635,7 @@ self: {
        pname = "shorten-strings";
        version = "0.1.0.1";
        sha256 = "1srqbc2kx1zn0xlzv94y7kqdrflmdck3jy6d2fl75zhf11wilxw3";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "https://github.com/Tarrasch/shorten-strings";
        description = "Shorten a variety of string-like types adding ellipsis";
@@ -115678,8 +118648,10 @@ self: {
        pname = "should-not-typecheck";
        version = "2.0";
        sha256 = "0869dgn7xccnzxhzbjl150x0sdwwgppk06nq448i9xlnhhrk6dkc";
-       buildDepends = [ base deepseq HUnit ];
-       testDepends = [ base deepseq hspec hspec-expectations HUnit ];
+       libraryHaskellDepends = [ base deepseq HUnit ];
+       testHaskellDepends = [
+         base deepseq hspec hspec-expectations HUnit
+       ];
        homepage = "http://github.com/CRogers/should-not-typecheck";
        description = "A HUnit/hspec assertion library to verify that an expression does not typecheck";
        license = stdenv.lib.licenses.bsd3;
@@ -115691,7 +118663,7 @@ self: {
        pname = "show";
        version = "0.6";
        sha256 = "15bvfffnr034z8wbmhxa8h5qskbxwbflk434dx023l1qlm3sjmsg";
-       buildDepends = [ base syb ];
+       libraryHaskellDepends = [ base syb ];
        description = "'Show' instances for Lambdabot";
        license = "GPL";
      }) {};
@@ -115702,7 +118674,7 @@ self: {
        pname = "show-type";
        version = "0.1.1";
        sha256 = "1sppi8vj1cg7gwz7vagc1cry22b814wlwbm6jjj1c4d5f4kmpyyv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Kinokkory/show-type";
        description = "convert types into string values in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -115716,7 +118688,7 @@ self: {
        sha256 = "1gpjb8lw5zmnsd8ic739j91iqsv9a707nd9j5mbnhq6gilk61nrh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base glade gtk random ];
+       executableHaskellDepends = [ base glade gtk random ];
        jailbreak = true;
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
@@ -115731,7 +118703,7 @@ self: {
        pname = "shpider";
        version = "0.2.1.1";
        sha256 = "19741zlma2fp3jbfsmqgl0004bvfpizbjljg2k5xam1k4v144kwd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers curl mtl regex-posix tagsoup
          tagsoup-parsec time url web-encodings
        ];
@@ -115749,7 +118721,7 @@ self: {
        sha256 = "0wml7x8843ib8jmwq6xz9q011hz4vpd7zmnvbc8h2zdql6p6lqxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl ];
+       executableHaskellDepends = [ base mtl ];
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/shplit";
        description = "A Haskell pattern splitter with emacs attachments";
        license = stdenv.lib.licenses.publicDomain;
@@ -115763,7 +118735,7 @@ self: {
        pname = "shqq";
        version = "0.1";
        sha256 = "08mdnlnq001slxml0y1rg7nry2fz8qcf1cw0q22j84gx3csrfhcm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base parsec posix-escape process template-haskell unix
        ];
        description = "Embed shell commands with interpolated Haskell variables, and capture output";
@@ -115781,10 +118753,11 @@ self: {
        sha256 = "0ngva3p3838xay3zz442n99ilhk5d9majg342x6y7hs796lqbrrd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base Cabal containers directory filepath network network-uri
          process uhc-util uuagc uuagc-cabal uulib
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/UU-ComputerScience/shuffle";
        description = "Shuffle tool for UHC";
        license = stdenv.lib.licenses.bsd3;
@@ -115796,7 +118769,7 @@ self: {
        pname = "sieve";
        version = "0.1.0.1";
        sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.the-singleton.com";
        description = "Sieve is an implementation of the Sieve abstract data type";
        license = stdenv.lib.licenses.gpl2;
@@ -115812,7 +118785,7 @@ self: {
        sha256 = "0xahs91s1kvb2vrdr6xwg4nrm3d4pfz807rnb7dj9rfj1knlaw4j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers directory fgl filepath glib gtk hxt mtl
          parsec process sifflet-lib unix
        ];
@@ -115831,11 +118804,11 @@ self: {
        pname = "sifflet-lib";
        version = "2.2.1";
        sha256 = "1snaq0vlsk4r2lbg2sk389ppwnz22mqwhf1lgwjh3cg91ab905n4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers directory fgl filepath glib gtk hxt mtl
          parsec process unix
        ];
-       extraLibraries = [ gdk_x11 gtk_x11 ];
+       librarySystemDepends = [ gdk_x11 gtk_x11 ];
        jailbreak = true;
        homepage = "http://mypage.iu.edu/~gdweber/software/sifflet/";
        description = "Library of modules shared by sifflet and its tests and its exporters";
@@ -115852,8 +118825,10 @@ self: {
        pname = "sign";
        version = "0.4.1";
        sha256 = "1d7hxvvmbbv8izr74l4ah1q50fwmmgman90rhjixkvppkq8fwjhz";
-       buildDepends = [ base containers deepseq hashable lattices ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers deepseq hashable lattices
+       ];
+       testHaskellDepends = [
          base containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
@@ -115870,7 +118845,7 @@ self: {
        pname = "signals";
        version = "0.0.0.1";
        sha256 = "12l5vixyv6j3fz8j9rwahf5ifvibqb38kc9j7xg36akc5v2n11s2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base constraints containers data-reify exception-mtl
          exception-transformers language-c-quote mainland-pretty mtl
          operational
@@ -115888,7 +118863,7 @@ self: {
        pname = "signed-multiset";
        version = "0.4";
        sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "Multisets with negative membership";
        license = stdenv.lib.licenses.bsd3;
@@ -115900,8 +118875,8 @@ self: {
        pname = "silently";
        version = "1.2.5";
        sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf";
-       buildDepends = [ base deepseq directory ];
-       testDepends = [ base deepseq directory nanospec temporary ];
+       libraryHaskellDepends = [ base deepseq directory ];
+       testHaskellDepends = [ base deepseq directory nanospec temporary ];
        homepage = "https://github.com/hspec/silently";
        description = "Prevent or capture writing to stdout and other handles";
        license = stdenv.lib.licenses.bsd3;
@@ -115913,7 +118888,7 @@ self: {
        pname = "simd";
        version = "0.1.0.1";
        sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m";
-       buildDepends = [ base ghc-prim primitive vector ];
+       libraryHaskellDepends = [ base ghc-prim primitive vector ];
        jailbreak = true;
        homepage = "http://github.com/mikeizbicki/simd";
        description = "simple interface to GHC's SIMD instructions";
@@ -115931,7 +118906,7 @@ self: {
        sha256 = "1yqd9799ys8y4n325mayq8qps99ajv1r4j8h6r16l5n94wvyw1ba";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskell98 mersenne-random-pure64 mtl parsec random
        ];
        jailbreak = true;
@@ -115954,13 +118929,17 @@ self: {
        sha256 = "1s75cr2fjgicgf6mndaf659xrp0dga68i2ii8l5dbjz0b2sbhhm7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base base64-bytestring blaze-builder bytestring
-         cmdargs directory filepath http-types mime-types monad-control mtl
-         process setenv simple-templates text transformers transformers-base
-         unordered-containers vector wai wai-extra
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring directory
+         filepath http-types mime-types monad-control mtl simple-templates
+         text transformers transformers-base unordered-containers vector wai
+         wai-extra
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs directory filepath process
+         setenv simple-templates text unordered-containers vector
+       ];
+       testHaskellDepends = [
          base hspec HUnit monad-control mtl transformers wai
        ];
        jailbreak = true;
@@ -115977,7 +118956,9 @@ self: {
        pname = "simple-actors";
        version = "0.4.0";
        sha256 = "13xjyr6gf55yxinaah4c8fx56a9fyr191v4lwycnlkdz8vvizw25";
-       buildDepends = [ base chan-split contravariant mtl transformers ];
+       libraryHaskellDepends = [
+         base chan-split contravariant mtl transformers
+       ];
        homepage = "http://brandon.si/code/simple-actors-0-1-0-released/";
        description = "A library for more structured concurrent programming, based on the Actor Model";
        license = stdenv.lib.licenses.bsd3;
@@ -115989,7 +118970,7 @@ self: {
        pname = "simple-atom";
        version = "0.2";
        sha256 = "1kqkaay3r03plxvvyan3hdgj2rfynygnisi6hrsjwqgj4nw6va17";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/simple-atom";
        description = "Atom (or symbol) datatype for fast comparision and sorting";
@@ -116002,8 +118983,8 @@ self: {
        pname = "simple-bluetooth";
        version = "0.1.0.0";
        sha256 = "1qrlvqy2vcl36db3403nb1c0sx233d3vwxrbqb7jip13hy0h6jf4";
-       buildDepends = [ base bytestring network ];
-       extraLibraries = [ bluetooth ];
+       libraryHaskellDepends = [ base bytestring network ];
+       librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116019,8 +119000,10 @@ self: {
        pname = "simple-c-value";
        version = "0.0.0.1";
        sha256 = "0ky0yilcc54hx8sl11z4dl14n6k9wfz0w9bwv3pbgyi44ravr8gs";
-       buildDepends = [ base DebugTraceHelpers dlist ghc-prim tuple ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base DebugTraceHelpers dlist ghc-prim tuple
+       ];
+       testHaskellDepends = [
          base checkers DebugTraceHelpers derive dlist ghc-prim HUnit mtl
          QuickCheck template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 tuple uniplate
@@ -116042,7 +119025,7 @@ self: {
        pname = "simple-conduit";
        version = "0.5.1";
        sha256 = "1jy70cdw2h6fd2618dczajml5k82kkjmd2n0mgbby2mr6r3sk5zr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring chunked-data containers either
          exceptions filepath free lifted-async lifted-base mmorph
          monad-control mono-traversable mtl mwc-random primitive semigroups
@@ -116062,11 +119045,11 @@ self: {
        pname = "simple-config";
        version = "1.2.2.1";
        sha256 = "1ndczlpqycrmyjm8v3gpsw1f946lfvc70kzmipli4ir9cbqh5d5k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default network-uri parsec template-haskell
          transformers
        ];
-       testDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/yunomu/simple-config";
        description = "Simple config file parser generator";
        license = stdenv.lib.licenses.bsd3;
@@ -116080,7 +119063,7 @@ self: {
        pname = "simple-css";
        version = "0.0.4";
        sha256 = "19a2yfp9gji7w5ps5lh8jwvnhma21d83v4fm2hrc92490fpq9aid";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html hashable language-css unordered-containers
        ];
        description = "simple binding of css and html";
@@ -116096,7 +119079,8 @@ self: {
        sha256 = "185dgpfc7b1ayw0ajfdnf28fy1a87b3kqn4fh9y5l9krzlqs2lfl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec text transformers ];
+       libraryHaskellDepends = [ base parsec text transformers ];
+       executableHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "https://github.com/gitfoxi/Language.Eval";
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
@@ -116109,7 +119093,7 @@ self: {
        pname = "simple-firewire";
        version = "0.1.3.4";
        sha256 = "14fh3z3vqkmfgvgxja431ivm3lk1ksgrxaqjzz25wdc493j640ka";
-       buildDepends = [ base bindings-dc1394 CV ];
+       libraryHaskellDepends = [ base bindings-dc1394 CV ];
        homepage = "https://github.com/aleator/simple-firewire";
        description = "Simplified interface for firewire cameras";
        license = stdenv.lib.licenses.bsd3;
@@ -116124,7 +119108,7 @@ self: {
        pname = "simple-form";
        version = "0.5.0";
        sha256 = "01pqp7593vxf32fw18g7351qblj4lxvbgvs0psgb9aghsw3dss53";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html digestive-functors email-validate network-uri
          old-locale text time transformers
        ];
@@ -116142,7 +119126,8 @@ self: {
        sha256 = "14gy8bmkvv81zd1hmdzmmdzf4pspn4nymfpjx07jxcgm5isn49qi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base deepseq parallel random ];
+       libraryHaskellDepends = [ base parallel random ];
+       executableHaskellDepends = [ base deepseq parallel random ];
        jailbreak = true;
        homepage = "http://eax.me/haskell-genetic-algorithm/";
        description = "Simple parallel genetic algorithm implementation";
@@ -116159,7 +119144,10 @@ self: {
        sha256 = "193n24n5dpmdha85h4vn0kx846hppyzbc9f75wgndc7y7vm1qagy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base MonadRandom parallel random transformers
+       ];
+       executableHaskellDepends = [
          base deepseq MonadRandom parallel random transformers
        ];
        homepage = "http://eax.me/haskell-genetic-algorithm/";
@@ -116173,7 +119161,7 @@ self: {
        pname = "simple-get-opt";
        version = "0.1.0.0";
        sha256 = "1hia6kjx3nnv6i5wrkmvj6vz52pw12fwsz48gkz7049ygpa5jnl5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A simple library for processing command-line options";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116186,7 +119174,7 @@ self: {
        pname = "simple-index";
        version = "0.1.0.1";
        sha256 = "0w5nqhabv1rdbgnjw5vgx6p19dhqiq6xn5ljld3s7ndfk8nfddgy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable safecopy unordered-containers
        ];
        jailbreak = true;
@@ -116203,7 +119191,7 @@ self: {
        pname = "simple-log";
        version = "0.3.2";
        sha256 = "1nlnxjv2p6fkk069480czn0wg1m2jcw1g2sb38cb524kv0qn1kr0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq directory filepath
          MonadCatchIO-transformers mtl SafeSemaphore text time transformers
        ];
@@ -116218,7 +119206,7 @@ self: {
        pname = "simple-log-syslog";
        version = "0.2.0";
        sha256 = "1619jsxgz5afmwhjcixg54i7dhh8jl29cmziifjrg60mm4rf2c34";
-       buildDepends = [ base hsyslog simple-log text ];
+       libraryHaskellDepends = [ base hsyslog simple-log text ];
        jailbreak = true;
        homepage = "http://github.com/mvoidex/simple-log-syslog";
        description = "Syslog backend for simple-log";
@@ -116235,7 +119223,12 @@ self: {
        sha256 = "07brvfs19qprbpiys38gw3ypkwyx8y31fdil3kkzc9gszvcfi7vy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers deepseq parallel random split ];
+       libraryHaskellDepends = [
+         base containers deepseq parallel random split
+       ];
+       executableHaskellDepends = [
+         base containers deepseq parallel random split
+       ];
        jailbreak = true;
        homepage = "http://eax.me/haskell-neural-networks/";
        description = "Simple parallel neural networks implementation";
@@ -116251,11 +119244,11 @@ self: {
        pname = "simple-nix";
        version = "0.1.0.4";
        sha256 = "1kyarxkp9zdf6k1jpx9a5yjrjghbr52ranfzrbcnb8kdnzi0mh0f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base classy-prelude error-list MissingH mtl parsec system-filepath
          text text-render unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base classy-prelude error-list hspec hspec-expectations MissingH
          mtl parsec system-filepath text text-render unordered-containers
        ];
@@ -116270,7 +119263,7 @@ self: {
        pname = "simple-observer";
        version = "0.0.1";
        sha256 = "1njzw6zjarlpjrmbkxwivr9azj8v1298bsd1ai3ddlmylwyhn24r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gimbo/observer.hs";
        description = "The Observer pattern";
        license = stdenv.lib.licenses.bsd3;
@@ -116286,7 +119279,7 @@ self: {
        sha256 = "1nrm52agsgr2gxljv14l7f713jvbfa99qnzkcni2s7777xc33dkk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath mtl parsec simple-stacked-vm
        ];
        description = "Simplified Pascal language to SSVM compiler";
@@ -116302,7 +119295,7 @@ self: {
        pname = "simple-pipe";
        version = "0.0.0.28";
        sha256 = "11bvk1dwi6anmnsvv3hi7ii60yy3d64g38vfmxhabh93sjr4b4nm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring lifted-base monad-control monads-tf stm
          transformers-base
        ];
@@ -116321,7 +119314,7 @@ self: {
        pname = "simple-postgresql-orm";
        version = "0.9.0.1";
        sha256 = "0j1v64ywfchxjdidy5pb1dzab0qhn516vcy580incw1bminyh3rz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath postgresql-orm postgresql-simple
          resource-pool simple transformers
        ];
@@ -116337,7 +119330,7 @@ self: {
        pname = "simple-reflect";
        version = "0.3.2";
        sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
        description = "Simple reflection of expressions containing variables";
        license = stdenv.lib.licenses.bsd3;
@@ -116349,7 +119342,7 @@ self: {
        pname = "simple-rope";
        version = "0.1";
        sha256 = "187ghgn8nivvn5m8nsn0vrjh8mr6h7n6r1p1119gr4h3m2hpmrpl";
-       buildDepends = [ base bytestring QuickCheck ];
+       libraryHaskellDepends = [ base bytestring QuickCheck ];
        homepage = "http://github.com/jkff/haskell-rope";
        description = "Memory-efficient strings with concatenation and splitting";
        license = stdenv.lib.licenses.bsd3;
@@ -116363,8 +119356,8 @@ self: {
        pname = "simple-sendfile";
        version = "0.2.21";
        sha256 = "0xzxcz60gl22w3rxjvw0s6js0g5mi6as1n48gl37dv4lbrn9s8v1";
-       buildDepends = [ base bytestring network unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring network unix ];
+       testHaskellDepends = [
          base bytestring conduit conduit-extra directory hspec HUnit network
          process resourcet unix
        ];
@@ -116380,7 +119373,7 @@ self: {
        pname = "simple-server";
        version = "0.0.3";
        sha256 = "0qmqkcyikyjcfsq82w0i54ydizfnp72h0qfsbjw5qjizf4l3awcr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring concurrent-extra containers hashtables network time
          unbounded-delays
        ];
@@ -116397,7 +119390,7 @@ self: {
        pname = "simple-session";
        version = "0.10.0.0";
        sha256 = "1vqpikn6ml4fmz9pg29blw1c5ck8d4xx1qrb388jw57x24gknp0k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder byteable bytestring containers
          cookie cryptohash http-types simple transformers wai
        ];
@@ -116413,11 +119406,10 @@ self: {
        pname = "simple-sessions";
        version = "0.1.3";
        sha256 = "08abag1im9gp2jpndd12sv911ca2qwh6frrz6qr87mj11xfhbky5";
-       buildDepends = [ base indexed synchronous-channels ];
+       libraryHaskellDepends = [ base indexed synchronous-channels ];
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A simple implementation of session types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-smt" = callPackage
@@ -116426,7 +119418,7 @@ self: {
        pname = "simple-smt";
        version = "0.6.0";
        sha256 = "15dnd6vjf8zl0bi5r4pczxdns8614rvdq1f44sgrmy8crc4x9d0c";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116441,8 +119433,9 @@ self: {
        sha256 = "0hz5acbkn9i46c8hpx258vkyj0q9ii4kh5wsjjj79avlnal2gz8q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty ];
-       testDepends = [
+       libraryHaskellDepends = [ base mtl parsec pretty ];
+       executableHaskellDepends = [ base mtl parsec pretty ];
+       testHaskellDepends = [
          base HUnit mtl parsec pretty test-framework test-framework-hunit
        ];
        homepage = "http://jakewheat.github.io/simple-sql-parser/";
@@ -116460,7 +119453,7 @@ self: {
        sha256 = "1grhdaf6z6illki5km1glliaaqlyvskwjvvcqz2vh8467arsy2pd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary-state containers filepath mtl parsec
        ];
        description = "Simple stacked virtual machine: assembler, disassembler, bytecode interpreter";
@@ -116473,7 +119466,7 @@ self: {
        pname = "simple-tabular";
        version = "0.1.0.0";
        sha256 = "0p7rd8y6rhwg0ap6cib7l32bglvfkvbzg938pdwpb2ss6cv8b9zs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/BartMassey/simple-tabular";
        description = "Simple tabular-text formatter";
@@ -116488,10 +119481,10 @@ self: {
        pname = "simple-templates";
        version = "0.8.0.0";
        sha256 = "1lmls90fbd18bklhhblfm0983w9bk66jj8iad3jzi5gd2injwj78";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base scientific text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base hspec HUnit scientific vector
        ];
        homepage = "http://simple.cx";
@@ -116506,7 +119499,7 @@ self: {
        pname = "simple-vec3";
        version = "0.1.0.1";
        sha256 = "1vzx88drwg40a9b7dzz4nbd5faawrc15wgyd1b12zmrsysn0h6s4";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "http://github.com/dzhus/simple-vec3/";
        description = "Three-dimensional vectors of doubles with basic operations";
@@ -116520,7 +119513,7 @@ self: {
        pname = "simpleargs";
        version = "0.2.1";
        sha256 = "1grjjpb3397wnr6sd0bn679k9pfg1zlm61350zd2gj5yq6pshl6p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/simpleargs";
        description = "Provides a more flexible getArgs function with better error reporting";
        license = "LGPL";
@@ -116534,10 +119527,10 @@ self: {
        pname = "simpleirc";
        version = "0.3.1";
        sha256 = "1mwhqa5gby38hlbq0shjbff4whhblw00x8wksqbh47jd6i6ihww5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring connection containers network old-locale time
        ];
-       testDepends = [ base bytestring hspec HUnit knob ];
+       testHaskellDepends = [ base bytestring hspec HUnit knob ];
        homepage = "http://github.com/dom96/SimpleIRC";
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
@@ -116549,10 +119542,10 @@ self: {
      mkDerivation {
        pname = "simpleirc-lens";
        version = "0.1.0.0";
-       revision = "2";
        sha256 = "0lr4zrp8h7xgg8zsznawqkkzh3pvlzfw5hl6n0hss5ramb71ccy5";
+       revision = "2";
        editedCabalFile = "618750d5b230316747d59d784bd40481a4404443316fc9c3a73e1349e3d10975";
-       buildDepends = [ base bytestring simpleirc ];
+       libraryHaskellDepends = [ base bytestring simpleirc ];
        homepage = "https://github.com/relrod/simpleirc-lens";
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
@@ -116567,7 +119560,7 @@ self: {
        pname = "simplenote";
        version = "1.0";
        sha256 = "0kggnvbhvzrsqj387vqq2xpspk4xn3830k65g4cc642gmw4l803v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring curl dataenc download-curl HTTP json time
          utf8-string
        ];
@@ -116586,7 +119579,8 @@ self: {
        sha256 = "0qlhh9m455fh8w9hdzykgxbw699mkd926ar031j99dhimca2d4hj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
          base ghc-paths haskell-src-exts process uniplate
        ];
        jailbreak = true;
@@ -116600,10 +119594,10 @@ self: {
      mkDerivation {
        pname = "simplesmtpclient";
        version = "0.2";
-       revision = "1";
        sha256 = "0z8g82222nvh3yhn8qisr8qqnsv02zxjyzs32qrcg2pshbd5mdj8";
+       revision = "1";
        editedCabalFile = "e6021c7bbf5e50c15433dca491f4618483229203c810a7b71e7c42094e13ad25";
-       buildDepends = [ array base directory network old-time ];
+       libraryHaskellDepends = [ array base directory network old-time ];
        description = "Very simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116614,8 +119608,8 @@ self: {
        pname = "simplessh";
        version = "0.2.0.5";
        sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ ssh2 ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ ssh2 ];
        homepage = "http://hub.darcs.net/thoferon/simplessh";
        description = "Simple wrapper around libssh2";
        license = stdenv.lib.licenses.bsd3;
@@ -116632,7 +119626,7 @@ self: {
        sha256 = "0z8ysg43dydij5l271ary8g5l26k0fvsymi99ycyjnl2ij1sg482";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath mtl process random regex-compat split time
        ];
        homepage = "http://github.com/scravy/simplex";
@@ -116648,10 +119642,10 @@ self: {
        pname = "simplex-basic";
        version = "0.0.0.1";
        sha256 = "180bnrka1id16scz4zzi60m8692b7pyicfzfbzvi8rz1shl038zq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors linear-grammar mtl QuickCheck transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bifunctors containers hspec linear-grammar mtl QuickCheck
          transformers
        ];
@@ -116667,7 +119661,7 @@ self: {
        sha256 = "0i60ksi5xc0d0rg5xzhbdjv2f3b5jr6rl9khn9i2b1n9sh1lv36m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring random ];
+       executableHaskellDepends = [ base bio bytestring random ];
        homepage = "http://malde.org/~ketil/";
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
@@ -116680,7 +119674,7 @@ self: {
        pname = "simtreelo";
        version = "0.1.1.0";
        sha256 = "1j7q2mld8np16nmq8w3lx87j1f530jpxv4jlpf038k42pf4p23l2";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Loader for data organized in a tree";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -116696,12 +119690,18 @@ self: {
        sha256 = "0p76rsk02p6rw51ppbr3j7ydk57k34684qf50nrz5qd0jrnapjm2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bytestring containers mtl parsec permute
          process regex-pcre setlocale text unix utf8-string X11 X11-rm
          x11-xim X11-xshape
        ];
-       pkgconfigDepends = [ libXft ];
+       libraryPkgconfigDepends = [ libXft ];
+       executableHaskellDepends = [
+         array attoparsec base bytestring containers mtl parsec permute
+         process regex-pcre setlocale text unix utf8-string X11 X11-rm
+         x11-xim X11-xshape
+       ];
+       executablePkgconfigDepends = [ libXft ];
        jailbreak = true;
        homepage = "http://sigkill.dk/programs/sindre";
        description = "A programming language for simple GUIs";
@@ -116715,7 +119715,7 @@ self: {
        pname = "singleton-nats";
        version = "0.3.0.1";
        sha256 = "1zgrvpszlvbq3mhfrs50dz2wd3bx6zxpyh0cj1zlwbn62psbdqxm";
-       buildDepends = [ base singletons ];
+       libraryHaskellDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116728,8 +119728,10 @@ self: {
        pname = "singletons";
        version = "1.1.2.1";
        sha256 = "1lxbajfwq65bkl73cr3zqzcqy67vqbq9sf8w9ckrik4713sx0mhb";
-       buildDepends = [ base containers mtl template-haskell th-desugar ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers mtl template-haskell th-desugar
+       ];
+       testHaskellDepends = [
          base Cabal constraints filepath process tasty tasty-golden
        ];
        homepage = "http://www.cis.upenn.edu/~eir/packages/singletons";
@@ -116743,7 +119745,7 @@ self: {
        pname = "sink";
        version = "0.1.0.1";
        sha256 = "04ny9450h2mlw1j0gn6a1vvgwsk3gbhhzshqv2sbcg5pwkzkdrzp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "An alternative to lazy I/O that doesn't conflate execution with evaluation";
        license = stdenv.lib.licenses.mit;
@@ -116757,8 +119759,8 @@ self: {
        pname = "siphash";
        version = "1.0.3";
        sha256 = "1wq5dan30ggjgmravy92ylqjvjv1q7mxrmddr7zc8h6aqr0wx0fg";
-       buildDepends = [ base bytestring cpu ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cpu ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -116775,7 +119777,7 @@ self: {
        pname = "sirkel";
        version = "0.1";
        sha256 = "0hhphhdvzcq9az5zriip7sgypfwbf5plx65s96nvrm2lznw4pzan";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers hashtables haskell98 random
          remote SHA transformers
        ];
@@ -116790,11 +119792,10 @@ self: {
        pname = "sitemap";
        version = "0.1.2";
        sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
-       buildDepends = [ base lens taggy taggy-lens text ];
+       libraryHaskellDepends = [ base lens taggy taggy-lens text ];
        homepage = "http://github.com/alpmestan/sitemap";
        description = "Sitemap parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized" = callPackage
@@ -116805,7 +119806,7 @@ self: {
        pname = "sized";
        version = "0.1.0.0";
        sha256 = "00n9fb7kk3c6dy4j19d9ikmynllpxc7yd51sign0rhvnasmyrghl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints containers ListLike monomorphic type-natural
          vector
        ];
@@ -116825,8 +119826,11 @@ self: {
        sha256 = "1nwr92gy8031f18w367ys0l27q4qvpkrkikbj03m93q2i7y74ry7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base base-compat containers singletons ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [
+         array base base-compat containers singletons
+       ];
+       executableHaskellDepends = [ base base-compat ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
@@ -116841,7 +119845,7 @@ self: {
        pname = "sized-vector";
        version = "1.4.2.0";
        sha256 = "0lz1fr2n5x7xfb6y8l7prnawj1p3fp79bbgi98w1n22wazcy9jkm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints deepseq equational-reasoning hashable monomorphic
          singletons type-natural
        ];
@@ -116862,7 +119866,7 @@ self: {
        sha256 = "0xns0xl3khks1jvsmxh0nqf1saxs7qscvkbcg4270pp7n6lziqdg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs deepseq dlist lens parallel-io regex-posix
          system-fileio system-filepath text unix
        ];
@@ -116878,16 +119882,16 @@ self: {
      mkDerivation {
        pname = "sjsp";
        version = "0.1.0";
-       revision = "1";
        sha256 = "0x76hrzm0ikijsf5n425bagzin2x463mcmlnjqvinrb6ni47f4bl";
+       revision = "1";
        editedCabalFile = "309e00100db2c1bae2d292c485f2dc1a68e1c72a848a2142c3f0637c494dd727";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder bytestring filepath ghc-prim language-javascript
          syb unordered-containers
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        description = "Simple JavaScript Profiler";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -116900,8 +119904,10 @@ self: {
        pname = "skein";
        version = "1.0.9.3";
        sha256 = "0k7ibm4ykvypz6dm6jgqx0aj7qlg34cg841vipyjkbykp8nv3fn7";
-       buildDepends = [ base bytestring cereal crypto-api tagged ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal crypto-api tagged
+       ];
+       testHaskellDepends = [
          base bytestring cereal crypto-api filepath hspec tagged
        ];
        homepage = "https://github.com/meteficha/skein";
@@ -116919,7 +119925,7 @@ self: {
        sha256 = "10bcw4l4w7myrbpmalg4mvpcyzbrnr8dafsplxkjlb6bnhc33scb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          argparser attoparsec base bytestring filepath hex posix-escape
          process time
        ];
@@ -116936,7 +119942,7 @@ self: {
        pname = "skell";
        version = "0.1.0.0";
        sha256 = "0lnlqcw5slv5gshdq35il16pm57fh07hkd7zx95gfxx1aipyr4lp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers http-types text wai
        ];
        jailbreak = true;
@@ -116954,7 +119960,7 @@ self: {
        pname = "skype4hs";
        version = "0.0.0.0";
        sha256 = "0mrd63yfmxxmv3l5v5i01rh4lyl831pfb06k9bxvc6m5q88fxglp";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring lifted-base monad-control mtl stm text
          time transformers-base word8 X11
        ];
@@ -116975,7 +119981,7 @@ self: {
        sha256 = "0rk9m9fw6as7zzjkm4jhwgw7nbs05ky1s556xmjbnkh6l9xp2chw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring containers directory filepath ghc-binary
          haskell98 IfElse old-locale regex-pcre time utf8-string
        ];
@@ -116994,7 +120000,7 @@ self: {
        pname = "slack";
        version = "0.1.0.0";
        sha256 = "0sqi4g8wavxdd98cnv869qx2p9g77f6dznxlfmgv1jlvd4a1ya67";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers either http-conduit mtl old-locale text time
          transformers
        ];
@@ -117014,12 +120020,12 @@ self: {
        pname = "slack-api";
        version = "0.5";
        sha256 = "1jjm7qzb1s2z8c7ikwsvz2bp7f3dx3qcqw7kcas42xp0ziwnl50m";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers errors HsOpenSSL io-streams lens
          lens-aeson monad-loops mtl network network-uri openssl-streams text
          time time-locale-compat transformers websockets wreq
        ];
-       testDepends = [ base ];
+       testHaskellDepends = [ base ];
        description = "Bindings to the Slack RTM API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -117034,10 +120040,11 @@ self: {
        sha256 = "0sz05v40b78qdpz8cqpnblhjy4dxqsz5175hq5083j7iv3xi3kc7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HTTP http-client http-client-tls network
          text
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/tattsun/slack-notify-haskell";
        description = "Slack notifier for Haskell project";
        license = stdenv.lib.licenses.mit;
@@ -117052,11 +120059,11 @@ self: {
        pname = "slave-thread";
        version = "1.0.0.0";
        sha256 = "0snk0v126a79q2blddbznz50l89jfap4y4xs9i76pk0b0dcik319";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude list-t mmorph partial-handler stm-containers
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore
        ];
        jailbreak = true;
@@ -117075,7 +120082,7 @@ self: {
        sha256 = "0mvjj8hs8837dby54ii71wd1sg2z3r14sr7w2hnj2nhnjy7c23yy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs containers directory filepath
          language-slice MissingH
        ];
@@ -117094,7 +120101,7 @@ self: {
        sha256 = "0x6blvdqwf9sqspwj48drasizx1pb1i92a0lp06szwa2nszdvzf0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring MonadCatchIO-transformers mtl pandoc
          snap-core snap-server utf8-string
        ];
@@ -117114,15 +120121,11 @@ self: {
        sha256 = "1jmnyw5n2k9c0bsdgna7hxc6yxjrycss02wjwsavbq13i7amq8i9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cereal containers directory
          download-curl filepath HTTP network optparse-applicative
          stringsearch terminal-size text zlib
        ];
-       postInstall = ''
-         mkdir -p $out/share/man/man1
-         cp sloane.1 $out/share/man/man1/
-       '';
        homepage = "http://github.com/akc/sloane";
        description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences";
        license = stdenv.lib.licenses.bsd3;
@@ -117136,7 +120139,7 @@ self: {
        pname = "slot-lambda";
        version = "0.1.0.3";
        sha256 = "1npin7yaharbi5nzwksj1j7rf2k1nvmr1jgcf2xpnvvbcga7l69i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta syb
          template-haskell vector
        ];
@@ -117151,7 +120154,7 @@ self: {
        pname = "sloth";
        version = "0.0.2";
        sha256 = "0x3iw1mqbl3q723kkxr6b0i1hxcfb4sink4kmg6xnpzd3hwaspq9";
-       buildDepends = [ base mtl process ];
+       libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117163,7 +120166,7 @@ self: {
        pname = "smallarray";
        version = "0.2.2.4";
        sha256 = "16fgxsg8grxhqx6d4s3mm89qbkw2k72qvr4r701ih1i8gmf1ms1z";
-       buildDepends = [ base bytestring deepseq hashable ];
+       libraryHaskellDepends = [ base bytestring deepseq hashable ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~aslatter/code/bytearray";
        description = "low-level unboxed arrays, with minimal features";
@@ -117181,11 +120184,12 @@ self: {
        sha256 = "1vjzvsvci8zn4y2lh7s2kh6v1c6447nfksqxcv468zz8d1mflsfi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers data-default directory filepath parsec
          text transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers data-default text ];
+       testHaskellDepends = [
          attoparsec base containers data-default parsec text
        ];
        jailbreak = true;
@@ -117199,12 +120203,30 @@ self: {
        pname = "smallcheck";
        version = "1.1.1";
        sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd";
-       buildDepends = [ base ghc-prim logict mtl pretty ];
+       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
        homepage = "https://github.com/feuerbach/smallcheck";
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck-laws" = callPackage
+    ({ mkDerivation, base, smallcheck, smallcheck-series, tasty
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "smallcheck-laws";
+       version = "0.1";
+       sha256 = "11b1fmbksw7z7inn9as73vjplm39d8kwmq10v8gj0yfw1g872xh0";
+       revision = "1";
+       editedCabalFile = "ff6bf8f4f1f7b95550c9adc53125bfb25dc665260f5121eaf811ca3a08e386a1";
+       libraryHaskellDepends = [
+         base smallcheck smallcheck-series tasty tasty-smallcheck
+       ];
+       testHaskellDepends = [ base smallcheck tasty ];
+       description = "SmallCheck properties for standard type classes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smallcheck-lens" = callPackage
     ({ mkDerivation, base, lens, smallcheck, smallcheck-series, tasty
      , tasty-smallcheck, transformers
@@ -117213,11 +120235,13 @@ self: {
        pname = "smallcheck-lens";
        version = "0.1";
        sha256 = "19awz3gphvkmb54j3mqqmqjzdjywdrrvsb9lp46gbhjazn94sxdl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens smallcheck smallcheck-series tasty tasty-smallcheck
          transformers
        ];
-       testDepends = [ base lens smallcheck tasty tasty-smallcheck ];
+       testHaskellDepends = [
+         base lens smallcheck tasty tasty-smallcheck
+       ];
        homepage = "https://github.com/jdnavarro/smallcheck-lens";
        description = "SmallCheck lens laws";
        license = stdenv.lib.licenses.bsd3;
@@ -117231,10 +120255,10 @@ self: {
        pname = "smallcheck-series";
        version = "0.3";
        sha256 = "1vdwafwdv38n1bvjf1rybfhh42a0q0g0g4wmw0v4fgxh73qndfdv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers logict smallcheck text transformers
        ];
-       testDepends = [ base doctest Glob ];
+       testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/jdnavarro/smallcheck-series";
        description = "Extra SmallCheck series and utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -117248,7 +120272,7 @@ self: {
        sha256 = "1g4g2sgj39pkm3ll4yv0q9dcmq2lyd26qkr1gir1svmxs6hdwp59";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base vector ];
+       executableHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "http://github.com/noteed/smallpt-hs";
        description = "A Haskell port of the smallpt path tracer";
@@ -117264,7 +120288,7 @@ self: {
        pname = "smallstring";
        version = "0.3.3";
        sha256 = "1wkgbnknx9k56ikl6hpv91r9sav8v5qvl2w7z2jadgrlj29fy755";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring deepseq hashable smallarray text utf8-string
        ];
        jailbreak = true;
@@ -117281,8 +120305,8 @@ self: {
        pname = "smaoin";
        version = "0.3.0.0";
        sha256 = "0j18pdpywgb01679b4f2aj7pzna1njh45giw1b1dsqqdp45gz2rp";
-       buildDepends = [ base bytestring random text uuid ];
-       testDepends = [ base bytestring QuickCheck ];
+       libraryHaskellDepends = [ base bytestring random text uuid ];
+       testHaskellDepends = [ base bytestring QuickCheck ];
        homepage = "http://rel4tion.org/projects/smaoin-hs/";
        description = "Utilities for the Smaoin semantic information model";
        license = stdenv.lib.licenses.publicDomain;
@@ -117294,7 +120318,9 @@ self: {
        pname = "smartGroup";
        version = "0.3.0";
        sha256 = "10wb5v87xl54bsl2xxsh1fh54bgqbhmmkhyaa3ly23nm2f01cpnp";
-       buildDepends = [ base bytestring containers template-haskell ];
+       libraryHaskellDepends = [
+         base bytestring containers template-haskell
+       ];
        homepage = "http://patch-tag.com/r/salazar/smartGroup";
        description = "group strings or bytestrings by words in common";
        license = stdenv.lib.licenses.bsd3;
@@ -117311,7 +120337,10 @@ self: {
        sha256 = "1rkw4fhiidn9rfq4dvik58zr453jsh2l8xpswas2rsv6k5w0909r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers generic-deriving ghc-prim mtl QuickCheck random
+       ];
+       executableHaskellDepends = [
          base containers generic-deriving ghc-prim mtl QuickCheck random
        ];
        homepage = "https://github.com/leepike/SmartCheck";
@@ -117326,7 +120355,7 @@ self: {
        pname = "smartconstructor";
        version = "0.2.0.0";
        sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/frerich/smartconstructor";
        description = "A package exposing a helper function for generating smart constructors";
        license = stdenv.lib.licenses.bsd3;
@@ -117340,7 +120369,9 @@ self: {
        sha256 = "0dxw4jgmwcz92n2rymdrfaz1v8lc2wknql9ca5p98jc14l8c2bl3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 pretty unix utf8-string ];
+       executableHaskellDepends = [
+         base haskell98 pretty unix utf8-string
+       ];
        homepage = "http://kyagrd.dyndns.org/~kyagrd/project/smartword/";
        description = "Web based flash card for Word Smart I and II vocabularies";
        license = stdenv.lib.licenses.bsd3;
@@ -117353,7 +120384,7 @@ self: {
        pname = "sme";
        version = "0.1";
        sha256 = "1d3kjyskwzc7p5bi6pv9yxfa6l6dqkkqc24dmmxl5wx7vmbfma25";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117365,7 +120396,7 @@ self: {
        pname = "smoothie";
        version = "0.4.0.2";
        sha256 = "1g2lk58p8rbhi45j6q3r0w4103bxi6pn9i3c5i3525s8brl4y8ni";
-       buildDepends = [ aeson base linear text vector ];
+       libraryHaskellDepends = [ aeson base linear text vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
@@ -117377,7 +120408,7 @@ self: {
        pname = "smt-lib";
        version = "0.0.2";
        sha256 = "1phm50pabahrpxrzp25mfhpafzhp4hz8cxp6fp93rwh4cl7cckky";
-       buildDepends = [ array base directory polyparse ];
+       libraryHaskellDepends = [ array base directory polyparse ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "Parsing and printing SMT-LIB";
@@ -117391,7 +120422,7 @@ self: {
        pname = "smtLib";
        version = "1.0.7";
        sha256 = "1jn2790x7g7n6jm5cfgd692n3l6iafyv0zyz40hx8ykcs4jh2rkf";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "A library for working with the SMTLIB format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117405,7 +120436,7 @@ self: {
        pname = "smtlib2";
        version = "0.2";
        sha256 = "1xkbsqhfjsnf3qx9x7n7hqp3l769k4bbrp1274sf9cqqgbcs2ny6";
-       buildDepends = [
+       libraryHaskellDepends = [
          array atto-lisp attoparsec base blaze-builder bytestring
          constraints containers data-fix mtl process tagged text
          transformers
@@ -117423,7 +120454,7 @@ self: {
        pname = "smtp-mail";
        version = "0.1.4.5";
        sha256 = "010fbrcbypajwd9fjjc35br9p5axl1pqd0n1v51585ncrlv2icyw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base16-bytestring base64-bytestring bytestring
          cryptohash filepath mime-mail network text
        ];
@@ -117442,7 +120473,7 @@ self: {
        pname = "smtp-mail-ng";
        version = "0.1.0.2";
        sha256 = "0jvjb3ps22p71b0vq7lgfyxmhjbzhsc3crs0cv3qsnkhz4ghvgbh";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring base64-bytestring bytestring
          crypto-random cryptohash filepath haskeline mime-mail mtl network
          stringsearch text tls transformers transformers-compat x509-store
@@ -117462,7 +120493,7 @@ self: {
        sha256 = "0z36zvrh6xhg8s7wai65d2y6hz0qz016ick9a4yrjpqxxk78h902";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 network process ];
+       executableHaskellDepends = [ base haskell98 network process ];
        homepage = "https://github.com/singpolyma/sock2stream";
        description = "Listen for SMTP traffic and send it to an MTA script";
        license = "unknown";
@@ -117479,7 +120510,7 @@ self: {
        pname = "smtps-gmail";
        version = "1.3.0";
        sha256 = "0vbykxqrw0gdhxwgchvgvkxwh7pwyrc1wvl26x5wqlkmkalmkvv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring conduit conduit-extra
          cprng-aes data-default filepath mime-mail network resourcet
          stringsearch text tls transformers
@@ -117497,7 +120528,7 @@ self: {
        pname = "snake-game";
        version = "1.2";
        sha256 = "1iy3m20ldc98agdi7n71ik8k2f62ybfg719z79lcf8pzynbfsrbd";
-       buildDepends = [ base GLUT OpenGL random ];
+       libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117518,18 +120549,21 @@ self: {
        sha256 = "05xnil6kfxwrnbvg7sigzh7hl8jsfr8cvbjd41z9ywn6ymxzr7zs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession comonad
          configurator containers directory directory-tree dlist either
          filepath hashable heist lens logict MonadCatchIO-transformers mtl
-         mwc-random old-time pwstore-fast regex-posix snap-core snap-server
-         stm template-haskell text time transformers unordered-containers
-         vector vector-algorithms xmlhtml
+         mwc-random pwstore-fast regex-posix snap-core snap-server stm text
+         time transformers unordered-containers vector vector-algorithms
+         xmlhtml
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory directory-tree filepath
+         hashable old-time snap-server template-haskell text
        ];
        homepage = "http://snapframework.com/";
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-accept" = callPackage
@@ -117538,7 +120572,7 @@ self: {
        pname = "snap-accept";
        version = "0.1.0";
        sha256 = "19sn7q9avb7y9j46fk7iga237qgcdm69sanb351c5s0lfgcpnf1m";
-       buildDepends = [ base http-media snap-core ];
+       libraryHaskellDepends = [ base http-media snap-core ];
        jailbreak = true;
        homepage = "http://github.com/zimothy/snap-accept";
        description = "Accept header branching for the Snap web framework";
@@ -117568,7 +120602,7 @@ self: {
        sha256 = "0spdn7zazd17yrcx004m4yag8vy4bac4997f81nfvy25jvg87hhl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base bytestring clientsession cmdargs snap text
          unordered-containers utf8-string
        ];
@@ -117576,7 +120610,6 @@ self: {
        homepage = "https://github.com/dzhus/snap-auth-cli";
        description = "Command-line tool to manage Snap AuthManager database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-blaze" = callPackage
@@ -117585,7 +120618,7 @@ self: {
        pname = "snap-blaze";
        version = "0.2.1.3";
        sha256 = "0jpiykqgvdbhk1wk37qgfxmyrnx8553wnnmn7a4b3mq8zx8fzmlm";
-       buildDepends = [ base blaze-html snap-core ];
+       libraryHaskellDepends = [ base blaze-html snap-core ];
        homepage = "http://github.com/jaspervdj/snap-blaze";
        description = "blaze-html integration for Snap";
        license = stdenv.lib.licenses.bsd3;
@@ -117597,7 +120630,7 @@ self: {
        pname = "snap-blaze-clay";
        version = "0.1.0.0";
        sha256 = "05zi9rjd37xznjj8yhm5har12mfrclsrwd9fbcwh5ngccd7h7fiy";
-       buildDepends = [ base blaze-html clay snap-core ];
+       libraryHaskellDepends = [ base blaze-html clay snap-core ];
        jailbreak = true;
        homepage = "http://github.com/deckool/snap-blaze-clay";
        description = "blaze-html-clay integration for Snap";
@@ -117610,7 +120643,9 @@ self: {
        pname = "snap-configuration-utilities";
        version = "0.1.0.0";
        sha256 = "07cm60v7bz585fawfc8mml178z54zqfg8kb7ldln5bsa0ggpha2z";
-       buildDepends = [ base configurator text unordered-containers ];
+       libraryHaskellDepends = [
+         base configurator text unordered-containers
+       ];
        jailbreak = true;
        description = "Methods to manipulate Configurator objects for Snap & Snaplets";
        license = stdenv.lib.licenses.bsd3;
@@ -117627,10 +120662,10 @@ self: {
      mkDerivation {
        pname = "snap-core";
        version = "0.9.7.2";
-       revision = "1";
        sha256 = "0lgnflwcjyiinrm75dy1flr37bvjn3yljx53cvlsb3ccfnxqwsjj";
+       revision = "1";
        editedCabalFile = "d39520edcc970d9d1f683af9631ccbcad39536b9f88040b93efb66cbe7aefc55";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring bytestring-mmap
          case-insensitive containers deepseq directory enumerator filepath
@@ -117652,14 +120687,13 @@ self: {
        pname = "snap-cors";
        version = "1.2.9";
        sha256 = "0s6bl9nldr96l0zjx1qh3zq9fs5wlrmagaalxsppjsln456gzjcd";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive hashable network
          network-uri snap text transformers unordered-containers
        ];
        homepage = "http://github.com/ocharles/snap-cors";
        description = "Add CORS headers to Snap applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-elm" = callPackage
@@ -117670,7 +120704,7 @@ self: {
        pname = "snap-elm";
        version = "0.1.1.2";
        sha256 = "1lp76s5yqgw5zvkv13b4552zq9f2mrngp5l5vd8kwz9rhawgl6kr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory Elm filepath process snap-core text
          transformers
        ];
@@ -117687,14 +120721,13 @@ self: {
        pname = "snap-error-collector";
        version = "1.1.1";
        sha256 = "1b0wsbk01zjxqmilan94h0dprnvnq4j8rhair54ra2lzyqsbdbcx";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers monad-loops MonadCatchIO-transformers snap
          stm time transformers
        ];
        homepage = "http://github.com/ocharles/snap-error-collector";
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-extras" = callPackage
@@ -117712,14 +120745,14 @@ self: {
        sha256 = "1747qvwbn1rlrjk085rj1780nrsqw4ps78c13si3kkk697k4wcbm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
          digestive-functors-heist digestive-functors-snap directory-tree
          filepath heist jmacro lens mtl pcre-light readable safe snap
          snap-core text time transformers wl-pprint-text xmlhtml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers QuickCheck snap-core tasty tasty-hunit
          tasty-quickcheck
        ];
@@ -117737,7 +120770,7 @@ self: {
        pname = "snap-loader-dynamic";
        version = "0.10.0.3";
        sha256 = "0nk4knkxnfffs5pgf6x3ld83l174aymqlyasxbf7j10w0w8srmvw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
        ];
@@ -117751,10 +120784,10 @@ self: {
      mkDerivation {
        pname = "snap-loader-static";
        version = "0.9.0.2";
-       revision = "1";
        sha256 = "0d6s7n6yryfs2jkw0hxvhvc79fhbj256askb1c6ksqhscxxxwz1m";
+       revision = "1";
        editedCabalFile = "c927448783c28f56bd57c7b09d147965b96e7b4c7320524b26c83bf10ab89c21";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework: static loader";
        license = stdenv.lib.licenses.bsd3;
@@ -117770,11 +120803,11 @@ self: {
        pname = "snap-predicates";
        version = "0.3.1";
        sha256 = "02rksb2p8wgpla86313z6lwqli5f4ryv4wr95s61kamcpbmf18y5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive containers monads-tf
          snap-core text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring case-insensitive containers HUnit
          monads-tf QuickCheck snap-core test-framework test-framework-hunit
          test-framework-quickcheck2 text transformers
@@ -117794,16 +120827,16 @@ self: {
      mkDerivation {
        pname = "snap-server";
        version = "0.9.5.1";
-       revision = "1";
        sha256 = "18ryin6f315picrs2159sn2668266l3xchs7jb8isw0gp52273xg";
+       revision = "1";
        editedCabalFile = "7909ad539e7d3f23f3c799d736d1a54d0a9098dd55fd6be75c13b57794bfaa5c";
-       buildDepends = [
+       configureFlags = [ "-fopenssl" ];
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring case-insensitive containers
          enumerator HsOpenSSL MonadCatchIO-transformers mtl network
          old-locale snap-core text time unix unix-compat
        ];
-       configureFlags = [ "-fopenssl" ];
        homepage = "http://snapframework.com/";
        description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -117818,12 +120851,12 @@ self: {
        pname = "snap-testing";
        version = "0.6.0.0";
        sha256 = "1kzcdlfahhrpczihbr4f41p4ijps27lhghrh29csl6jl7n71lvqk";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers digestive-functors HandsomeSoup
          hxt io-streams mtl process QuickCheck snap snap-core text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring containers digestive-functors HandsomeSoup
          hxt io-streams lens mtl process QuickCheck snap snap-core text
          transformers
@@ -117843,7 +120876,7 @@ self: {
        pname = "snap-utils";
        version = "0.1.2";
        sha256 = "1kr09fj1jfs6sfmca51k0gwn4acya70s9irzay9yf5b9yyvka391";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring heist http-types MonadCatchIO-transformers mtl snap
          snap-core text xmlhtml
        ];
@@ -117862,14 +120895,13 @@ self: {
        pname = "snap-web-routes";
        version = "0.5.0.0";
        sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring heist mtl snap snap-core text web-routes xmlhtml
        ];
        jailbreak = true;
        homepage = "https://github.com/lukerandall/snap-web-routes";
        description = "Type safe URLs for Snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-acid-state" = callPackage
@@ -117878,11 +120910,12 @@ self: {
        pname = "snaplet-acid-state";
        version = "0.2.7";
        sha256 = "0vjqcmcp0p8vmh7vzwv62bigbx1ck2vnaxlkqmg5wddn0mhfm6gx";
-       buildDepends = [ acid-state base mtl snap text transformers ];
+       libraryHaskellDepends = [
+         acid-state base mtl snap text transformers
+       ];
        homepage = "https://github.com/mightybyte/snaplet-acid-state";
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-actionlog" = callPackage
@@ -117897,7 +120930,7 @@ self: {
        pname = "snaplet-actionlog";
        version = "0.2.0.1";
        sha256 = "177a1b9fvlqh59hd9b5y92lq8yxv14jh79aadkyhxb4i0l5rl9vv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring digestive-functors
          digestive-functors-heist digestive-functors-snap errors heist
          persistent persistent-postgresql persistent-template readable
@@ -117919,7 +120952,7 @@ self: {
        pname = "snaplet-amqp";
        version = "1.1.0.0";
        sha256 = "01qw28paifysk402lpb7y8dyhf401ls1l0dcn6fiigvczwxzmk91";
-       buildDepends = [
+       libraryHaskellDepends = [
          amqp base bytestring configurator lens monad-control mtl network
          resource-pool snap transformers
        ];
@@ -117927,7 +120960,6 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-amqp";
        description = "Snap framework snaplet for the AMQP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-auth-acid" = callPackage
@@ -117940,7 +120972,7 @@ self: {
        pname = "snaplet-auth-acid";
        version = "0.1.0";
        sha256 = "0i0py2rj2vkivl97fxnv87bpbsbms2ncdqbq4zs0777nbr717swm";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson attoparsec base cereal clientsession directory
          errors filepath hashable lens MonadCatchIO-transformers mtl
          safecopy scientific snap snap-core text time unordered-containers
@@ -117949,7 +120981,6 @@ self: {
        jailbreak = true;
        description = "Provides an Acid-State backend for the Auth Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-coffee" = callPackage
@@ -117960,14 +120991,13 @@ self: {
        pname = "snaplet-coffee";
        version = "0.1.0.2";
        sha256 = "1kxxnk8m9154sallhy3rf8nmz0qkvchh8m761jgzhfbnnwlznpnf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator directory filepath haskell-coffee mtl
          snap snap-core
        ];
        homepage = "https://github.com/AtticHacker/snaplet-coffee";
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-css-min" = callPackage
@@ -117978,7 +121008,7 @@ self: {
        pname = "snaplet-css-min";
        version = "0.1.2";
        sha256 = "1bp6y0x03dpflbp4b1kkbxnqwsgnynbbpdgcpswwxz48xkpcp0ij";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring css-text directory filepath lens snap text
          utf8-string
        ];
@@ -117997,7 +121027,7 @@ self: {
        pname = "snaplet-environments";
        version = "0.1.1";
        sha256 = "1kk2ry19z73cmmwh3hmg87n00hqhzpmdvnb36b7yf9ck4zkhgy3h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bson configurator mtl regex-tdfa snap snap-core text
          unordered-containers
        ];
@@ -118015,14 +121045,13 @@ self: {
        pname = "snaplet-fay";
        version = "0.3.3.12";
        sha256 = "1j9khzd1zalzkli0p139fx48dljn76f4g851k889q3zq5lriihps";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
        ];
        homepage = "https://github.com/faylang/snaplet-fay";
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-hasql" = callPackage
@@ -118033,14 +121062,13 @@ self: {
        pname = "snaplet-hasql";
        version = "1.0.2";
        sha256 = "08gx096vg0swjc7z10nzlqsnjlr43cp190q4krkf08jb54ln3kcv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring clientsession configurator hasql
          hasql-backend lens mtl snap text time
        ];
        homepage = "https://github.com/mikeplus64/snaplet-hasql";
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -118051,7 +121079,7 @@ self: {
        pname = "snaplet-haxl";
        version = "0.0.0.2";
        sha256 = "0xqz62qrhzr0ik60055w7jawxkps6cn5k6v1g7nx2zzhyvg1w4wl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haxl MonadCatchIO-transformers snap transformers
        ];
        jailbreak = true;
@@ -118071,7 +121099,7 @@ self: {
        pname = "snaplet-hdbc";
        version = "0.9.1";
        sha256 = "17r7ailc2cnfny1ki7b027b5xipg2nvgr2yxvfh0sfzq8xkqa8ym";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clientsession containers convertible data-lens
          data-lens-template HDBC MonadCatchIO-transformers mtl
          resource-pool-catchio snap text time transformers
@@ -118092,14 +121120,13 @@ self: {
        pname = "snaplet-hslogger";
        version = "1.0.0.2";
        sha256 = "15cvpiz3p1qhb80sgz61mabvkb8h6j713jrny6mbg6qj945jbb0x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator hslogger mtl snap transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/ixmatus/snaplet-logger";
        description = "Snap framework snaplet for the Logger API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-i18n" = callPackage
@@ -118112,7 +121139,11 @@ self: {
        sha256 = "0yl28vvk5p1qazcvb3ca3748cqzr45x9274ifcidcn13p327kck2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base configurator filepath heist lens snap snap-loader-static text
+         xmlhtml
+       ];
+       executableHaskellDepends = [
          base bytestring configurator filepath heist lens snap
          snap-loader-static text xmlhtml
        ];
@@ -118132,7 +121163,7 @@ self: {
        pname = "snaplet-influxdb";
        version = "1.0.1.1";
        sha256 = "1dv800rclzl0b251bixksfl7jf28z82ql7nikf5dvginfpm71j7j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator http-client influxdb lens
          monad-control mtl network snap text transformers
        ];
@@ -118140,7 +121171,6 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-influxdb";
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-lss" = callPackage
@@ -118151,10 +121181,10 @@ self: {
        pname = "snaplet-lss";
        version = "0.1.0.0";
        sha256 = "0gll9r65xahx5vai4pbi0nrvscg6z964m30s58kkzy3898j000gx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath heist lss snap text xmlhtml
        ];
-       testDepends = [ base hspec-snap hspec2 lens snap text ];
+       testHaskellDepends = [ base hspec-snap hspec2 lens snap text ];
        jailbreak = true;
        homepage = "https://github.com/dbp/lss";
        description = "Lexical Style Sheets - Snap Web Framework adaptor";
@@ -118169,14 +121199,13 @@ self: {
        pname = "snaplet-mandrill";
        version = "0.1.0.3";
        sha256 = "0yyb0qbd14v6xw5vix08pv40w9l8p2vwvmh67sa9b4q9wkvwv962";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator mandrill mtl network snap transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/ixmatus/snaplet-mandrill";
        description = "Snap framework snaplet for the Mandrill API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-mongoDB" = callPackage
@@ -118189,7 +121218,7 @@ self: {
        pname = "snaplet-mongoDB";
        version = "0.2";
        sha256 = "0hpm2bhvb8gh4sz4dfx53s24gkkk2c234szhwbrn10bmd7hrapaw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bson bytestring compact-string-fix containers haskell-src-exts
          MonadCatchIO-transformers mongoDB mtl parsec regular safe snap
          snap-core template-haskell text time
@@ -118207,7 +121236,9 @@ self: {
        pname = "snaplet-mongodb-minimalistic";
        version = "0.0.6.12";
        sha256 = "0d0hnn0qp4zd453wzh1d3adls68gpv28dnkr7dcmjfl4f5igdran";
-       buildDepends = [ base lens mongoDB mtl snap text transformers ];
+       libraryHaskellDepends = [
+         base lens mongoDB mtl snap text transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/Palmik/snaplet-mongodb-minimalistic";
        description = "Minimalistic MongoDB Snaplet";
@@ -118225,7 +121256,7 @@ self: {
        pname = "snaplet-mysql-simple";
        version = "0.2.1.0";
        sha256 = "0hq58xsk5089kcdv2pby7dd71nb3nqzxrpppzb9qyqfz7pf45nr1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clientsession configurator containers errors lens
          MonadCatchIO-transformers mtl mysql mysql-simple
          resource-pool-catchio snap text transformers unordered-containers
@@ -118248,13 +121279,13 @@ self: {
        pname = "snaplet-oauth";
        version = "0.0.6";
        sha256 = "177yspz91nlzz9pw9x9zh4s4q7z7w9kl8gg5fd285xbadxazp3yl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring bytestring-show data-lens data-lens-template
          failure hashable heist hoauth2 http-conduit http-types
          MonadCatchIO-mtl snap snap-core snap-loader-dynamic
          snap-loader-static text unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring bytestring-show HUnit test-framework
          test-framework-hunit text
        ];
@@ -118276,7 +121307,7 @@ self: {
        pname = "snaplet-persistent";
        version = "0.5";
        sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clientsession configurator errors heist lens
          monad-logger MonadCatchIO-transformers mtl persistent
          persistent-postgresql persistent-template readable resource-pool
@@ -118286,7 +121317,6 @@ self: {
        homepage = "https://github.com/soostone/snaplet-persistent";
        description = "persistent snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-postgresql-simple" = callPackage
@@ -118298,10 +121328,10 @@ self: {
      mkDerivation {
        pname = "snaplet-postgresql-simple";
        version = "0.6.0.2";
-       revision = "2";
        sha256 = "0xx69x9mkv6xyd7arnip12zzyq7hdcqbypgypalgsj6vcjb8i4mp";
+       revision = "2";
        editedCabalFile = "cfc56ee20478bf05a650bdcb457b606a640daa71b84a3a2a3bdb8930dcbbeb7b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clientsession configurator errors lens
          MonadCatchIO-transformers mtl postgresql-simple
          resource-pool-catchio snap text transformers unordered-containers
@@ -118310,7 +121340,6 @@ self: {
        homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-postmark" = callPackage
@@ -118321,14 +121350,13 @@ self: {
        pname = "snaplet-postmark";
        version = "0.2.0";
        sha256 = "0006i88ssgh6z9g967wlw0km8abxmxdjjs7aalsddzla6xdp8wnx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator mtl postmark snap text transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/LukeHoersten/snaplet-postmark";
        description = "Postmark snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-purescript" = callPackage
@@ -118339,13 +121367,12 @@ self: {
        pname = "snaplet-purescript";
        version = "0.3.0.0";
        sha256 = "1dapzqyxj7s6j4drp0szldjxrhm77r4yvbjxs79155a58mj9p1wn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator mtl raw-strings-qq shelly snap snap-core text
          transformers
        ];
        description = "Automatic (re)compilation of purescript projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-recaptcha" = callPackage
@@ -118357,14 +121384,13 @@ self: {
        pname = "snaplet-recaptcha";
        version = "1.0.3";
        sha256 = "02f5fv70r7zjzycrrqsd1jwgpa7sq1m6rci74dlcbnms7z9cpv26";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring configurator heist http-conduit
          lens MonadCatchIO-transformers mtl snap text transformers
        ];
        homepage = "http://github.com/mikeplus64/snaplet-recaptcha";
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-redis" = callPackage
@@ -118375,14 +121401,13 @@ self: {
        pname = "snaplet-redis";
        version = "0.1.4.2";
        sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator hedis lens mtl network snap text transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/dzhus/snaplet-redis/";
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-redson" = callPackage
@@ -118395,7 +121420,7 @@ self: {
        pname = "snaplet-redson";
        version = "0.1.0.0";
        sha256 = "0pvan8fnddn27cps5x8gyrwmm88z96jjh124i9g3mi9aqpyx8z5d";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring configurator containers data-lens
          data-lens-template easy-file hedis mtl snap snap-core snaplet-redis
          text utf8-string websockets websockets-snap
@@ -118416,7 +121441,7 @@ self: {
        pname = "snaplet-rest";
        version = "0.1.0";
        sha256 = "1w1cy5zisn0mxj6rrz7wrw31ariia006cjxqwh9ahds6iwqh40y1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive http-media
          lens mtl snap snap-accept snap-core text utf8-string xmlhtml
        ];
@@ -118436,7 +121461,7 @@ self: {
        pname = "snaplet-riak";
        version = "0.2.0.0";
        sha256 = "0q0mnk0cl31xidax6bahvwabm9341p5852939yzgbam72mcv8jh0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers data-lens data-lens-template mtl riak
          riak-protobuf snap snap-core time transformers
        ];
@@ -118455,14 +121480,13 @@ self: {
        pname = "snaplet-sass";
        version = "0.1.2.0";
        sha256 = "1aiznsi54lxzwxnilckspvp6rdfmksxppa3964kqxh93a9gvkr9z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator directory filepath mtl process snap
          snap-core transformers
        ];
        homepage = "https://github.com/lukerandall/snaplet-sass";
        description = "Sass integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-sedna" = callPackage
@@ -118473,7 +121497,7 @@ self: {
        pname = "snaplet-sedna";
        version = "0.0.1.0";
        sha256 = "1rd0ymsnanf3nk02cim8lm9gppm739jfi2x6fzmp10xs9wmlhqab";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers monad-control mtl resource-pool
          sednaDBXML snap
        ];
@@ -118491,13 +121515,12 @@ self: {
        pname = "snaplet-ses-html";
        version = "0.1.1.0";
        sha256 = "1s5pyhwdnpw1ijy67h4kw052jz4pp73bpjcqii31passybvfd7k6";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base blaze-html bytestring configurator lens ses-html
          snap text transformers
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-sqlite-simple" = callPackage
@@ -118512,12 +121535,12 @@ self: {
        pname = "snaplet-sqlite-simple";
        version = "0.4.8.3";
        sha256 = "0nc0kv9s3c4wc3xb6jggx9v4p141c3af07x8vda18c7qlfif5nx3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring clientsession configurator direct-sqlite lens
          MonadCatchIO-transformers mtl snap sqlite-simple text transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring clientsession configurator containers
          directory errors HUnit lens MonadCatchIO-transformers mtl
          SafeSemaphore snap snap-core sqlite-simple stm test-framework
@@ -118526,7 +121549,6 @@ self: {
        homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -118538,7 +121560,7 @@ self: {
        pname = "snaplet-stripe";
        version = "0.3.0";
        sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator heist lens-family-core mtl snap stripe
          text text-format transformers xmlhtml
        ];
@@ -118546,7 +121568,6 @@ self: {
        homepage = "https://github.com/LukeHoersten/snaplet-stripe";
        description = "Stripe snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-tasks" = callPackage
@@ -118557,7 +121578,7 @@ self: {
        pname = "snaplet-tasks";
        version = "0.1.2";
        sha256 = "0wkhjjjmd08jbhp41j6xvcvg3g7c74cz18mm89k8alwfc50krvc0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers curl data-hash haskell98 MissingH mtl
          network snap snap-core
        ];
@@ -118576,7 +121597,7 @@ self: {
        pname = "snaplet-typed-sessions";
        version = "0.5";
        sha256 = "0gc6vnxsbwgciv281p6jff8ylcni4qpkmak2zqz710in86grjbgw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal clientsession containers hashtables mtl
          PSQueue random regex-posix snap snap-core time
        ];
@@ -118597,13 +121618,13 @@ self: {
        pname = "snaplet-wordpress";
        version = "0.1.1.2";
        sha256 = "1vmkywrd0vfyd028d0pvfglywgbv1m26j1shwy9wmnr581vx9pab";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base blaze-builder bytestring configurator
          containers data-default either hedis heist hspec hspec-snap lens
          map-syntax mtl snap snap-core snaplet-redis text time
          unordered-containers vector wreq xmlhtml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base blaze-builder containers data-default either hedis heist
          hspec hspec-core hspec-snap lens mtl snap snaplet-redis text
          unordered-containers xmlhtml
@@ -118622,12 +121643,12 @@ self: {
        pname = "snappy";
        version = "0.2.0.2";
        sha256 = "14fdx0fikkd9krpzqrvas6mjqmmhmh0qwqzvz1kymil7d8rdyr85";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ snappy ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       extraLibraries = [ snappy ];
        homepage = "http://github.com/bos/snappy";
        description = "Bindings to the Google Snappy library for fast compression/decompression";
        license = stdenv.lib.licenses.bsd3;
@@ -118639,7 +121660,7 @@ self: {
        pname = "snappy-conduit";
        version = "0.1.0.0";
        sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi";
-       buildDepends = [ base bytestring conduit snappy ];
+       libraryHaskellDepends = [ base bytestring conduit snappy ];
        jailbreak = true;
        homepage = "http://github.com/tatac1/snappy-conduit/";
        description = "Conduit bindings for Snappy (see snappy package)";
@@ -118652,7 +121673,7 @@ self: {
        pname = "snappy-framing";
        version = "0.1.0";
        sha256 = "1m7zk4ns8igh2717d77k4zvf06byp35dly3ykawaz9hxwsxn1jb2";
-       buildDepends = [ array base binary bytestring snappy ];
+       libraryHaskellDepends = [ array base binary bytestring snappy ];
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
        license = "unknown";
@@ -118664,7 +121685,7 @@ self: {
        pname = "snappy-iteratee";
        version = "0.1";
        sha256 = "17jwsvw7ik2bjanmzw4h72mdjaz031b5a6hi7cjz4ba1yjkiqnmk";
-       buildDepends = [ base bytestring iteratee snappy ];
+       libraryHaskellDepends = [ base bytestring iteratee snappy ];
        jailbreak = true;
        homepage = "http://github.com/iand675/snappy-iteratee";
        description = "An enumeratee that uses Google's snappy compression library";
@@ -118681,7 +121702,7 @@ self: {
        pname = "sndfile-enumerators";
        version = "0.10.0.0";
        sha256 = "1nnlbhnm88xy462sh3d54b751ndl0r2qggbxn2irrwqdnhc21v4r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers filepath iteratee
          listlike-instances MonadCatchIO-transformers transformers vector
          word24
@@ -118699,11 +121720,12 @@ self: {
        pname = "sneathlane-haste";
        version = "1";
        sha256 = "0m6281a1hvwbhv02vpdd01vm0jvccvq1kvy26dfncv0a8158y6wj";
-       buildDepends = [ base haste-compiler ];
+       libraryHaskellDepends = [ base haste-compiler ];
        jailbreak = true;
        homepage = "http://sneathlane.com";
        description = "A compositional web UI library, which draws to a Canvas element";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snippet-extractor" = callPackage
@@ -118714,7 +121736,7 @@ self: {
        sha256 = "0iyya6p5i5jrhvah45bcvqgldfx49qv8393vwi5k413vxjr7c3zm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec ];
+       executableHaskellDepends = [ base parsec ];
        description = "Extracts labeled snippets of code to files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118729,10 +121751,13 @@ self: {
        sha256 = "1n2cj35qrp6a766w29qrqcpcrv81xcpk9agkbibxngxh03abyhji";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath HsSyck parsec safe spoonutil
          xhtml
        ];
+       executableHaskellDepends = [
+         base containers directory filepath HsSyck parsec safe spoonutil
+       ];
        homepage = "http://github.com/elginer/snm";
        description = "The Simple Nice-Looking Manual Generator";
        license = stdenv.lib.licenses.gpl3;
@@ -118749,7 +121774,7 @@ self: {
        pname = "snmp";
        version = "0.2.0.0";
        sha256 = "0vjbpjsa4ivsjzvfc9sr457pms2rw1zpb92d971n0yccl0bxmf67";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types async base binary bytestring
          cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl
          network network-info random securemem text time
@@ -118764,7 +121789,7 @@ self: {
        pname = "snow-white";
        version = "2009.12.1";
        sha256 = "007hzr8dpj0mhvmnpdg0gi296q3mlicnx36s6hmgifzmyaa8kssi";
-       buildDepends = [ base binary bytestring mps ];
+       libraryHaskellDepends = [ base binary bytestring mps ];
        homepage = "http://github.com/nfjinjing/snow-white";
        description = "encode any binary instance to white space";
        license = stdenv.lib.licenses.bsd3;
@@ -118780,8 +121805,8 @@ self: {
        pname = "snowball";
        version = "1.0.0.1";
        sha256 = "0fvxzm14ffjqq6n51bi5cmq5yrlggpkbb9rbbw522l6cjgv0apbx";
-       buildDepends = [ base bytestring text text-icu ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text text-icu ];
+       testHaskellDepends = [
          base HUnit QuickCheck quickcheck-instances test-framework-hunit
          test-framework-quickcheck2 test-framework-th text
        ];
@@ -118796,7 +121821,7 @@ self: {
        pname = "snowflake";
        version = "0.1.1.1";
        sha256 = "1pfd8lqwv0504hli6fhwiqckcca0x9pnfzmy3kz36w7138rclmpi";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers.";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -118811,7 +121836,7 @@ self: {
        sha256 = "0l6hy0mza344k7m9skb6v9al611zgrrknhjdzx4ipqdd9zky9p23";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random
        ];
        jailbreak = true;
@@ -118830,19 +121855,18 @@ self: {
        pname = "soap";
        version = "0.2.2.7";
        sha256 = "02yirl0pr680pbwbh9z0awyk4blgdd0rir8x1gyydyn6v5dg736i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit configurator data-default exceptions
          http-client http-types iconv mtl resourcet text
          unordered-containers xml-conduit xml-conduit-writer xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec HUnit text unordered-containers xml-conduit
          xml-conduit-writer
        ];
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "SOAP client tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-openssl" = callPackage
@@ -118853,14 +121877,13 @@ self: {
        pname = "soap-openssl";
        version = "0.1.0.2";
        sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator data-default HsOpenSSL http-client
          http-client-openssl soap text
        ];
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using openssl bindings)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-tls" = callPackage
@@ -118872,14 +121895,13 @@ self: {
        pname = "soap-tls";
        version = "0.1.1.2";
        sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator connection data-default http-client
          http-client-tls soap text tls x509 x509-store x509-validation
        ];
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using tls package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sock2stream" = callPackage
@@ -118892,7 +121914,7 @@ self: {
        sha256 = "1vnrjza4x4jqlvz7mmihrjbdf4ngw02fkkn1j768w81m814vny7h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers directory haskell98 network
        ];
        homepage = "https://github.com/singpolyma/sock2stream";
@@ -118907,7 +121929,7 @@ self: {
        pname = "sockaddr";
        version = "0.0.0";
        sha256 = "1h74k5pipv9314y1d2wgpwgvyxfp6pcnq5051fdqr1shqlkpwbs2";
-       buildDepends = [ base byteorder bytestring network ];
+       libraryHaskellDepends = [ base byteorder bytestring network ];
        description = "Printing SockAddr";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118918,12 +121940,11 @@ self: {
        pname = "socket";
        version = "0.5.2.0";
        sha256 = "0mika886mqzjzm14sby3qdlwdlnd20xwl2d2n1faalgimjl1149y";
-       buildDepends = [ base bytestring ];
-       testDepends = [ async base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
        description = "A portable and extensible sockets library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-activation" = callPackage
@@ -118932,7 +121953,7 @@ self: {
        pname = "socket-activation";
        version = "0.1.0.1";
        sha256 = "109zxc16zlp98ggc99ap7wbzaa40yg34v3abn2nfs0w49dvh1zma";
-       buildDepends = [ base network transformers unix ];
+       libraryHaskellDepends = [ base network transformers unix ];
        homepage = "https://github.com/sakana/haskell-socket-activation";
        description = "systemd socket activation library";
        license = stdenv.lib.licenses.bsd3;
@@ -118946,7 +121967,7 @@ self: {
        pname = "socket-io";
        version = "1.3.3";
        sha256 = "1gy8g8bxjjj1hifkhvid6v8amml0gpp6gbfpih3v0grbi5aci0w7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
@@ -118960,9 +121981,9 @@ self: {
        pname = "socket-sctp";
        version = "0.1.0.0";
        sha256 = "1xdrc3d31xzi0q8arh8liv1h9xqinscaa5ip2xs6dvf4gap7rvs8";
-       buildDepends = [ base bytestring socket ];
-       testDepends = [ base bytestring socket ];
-       extraLibraries = [ sctp ];
+       libraryHaskellDepends = [ base bytestring socket ];
+       librarySystemDepends = [ sctp ];
+       testHaskellDepends = [ base bytestring socket ];
        homepage = "https://github.com/lpeterse/haskell-socket-sctp";
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
@@ -118981,12 +122002,12 @@ self: {
        pname = "socketio";
        version = "0.1.3";
        sha256 = "19rwkix7fjj3znd7z5bzknnpcfkmkmpcmrksv3q51b9fwph8gwrq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-terminal attoparsec base blaze-builder bytestring
          conduit conduit-extra http-types lifted-base monad-control mtl
          random text transformers-base unordered-containers vector wai warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson ansi-terminal attoparsec base blaze-builder bytestring
          conduit conduit-extra http-types HUnit lifted-base monad-control
          mtl QuickCheck random scientific test-framework
@@ -119005,7 +122026,7 @@ self: {
        pname = "socks";
        version = "0.5.4";
        sha256 = "1nmldlwxqasmg359i2aa3a903gi3lmnlspvf12xk49jrg3mf3dg9";
-       buildDepends = [ base bytestring cereal network ];
+       libraryHaskellDepends = [ base bytestring cereal network ];
        homepage = "http://github.com/vincenthz/hs-socks";
        description = "Socks proxy (version 5) implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -119017,7 +122038,7 @@ self: {
        pname = "sodium";
        version = "0.11.0.3";
        sha256 = "00qs1calial08a185ma5hm17lmmzig0yjf3710d5ikq1bmrgcqga";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Sodium Reactive Programming (FRP) System";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119028,7 +122049,7 @@ self: {
        pname = "soegtk";
        version = "0.12.1";
        sha256 = "01f49hwxc5h85iwzgnddxlh1lmb3s27zddmghxrlq958gcrr2iar";
-       buildDepends = [ base cairo gtk old-time stm ];
+       libraryHaskellDepends = [ base cairo gtk old-time stm ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
@@ -119045,7 +122066,10 @@ self: {
        sha256 = "0gihsk7szq27ihhy9idiaslv164by23c9c70fhzwyqx3wk7z1aip";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring bzlib containers mtl pretty utf8-string xml
+       ];
+       executableHaskellDepends = [
          array base bytestring bzlib containers mtl pretty utf8-string xml
        ];
        homepage = "http://darcs.k-hornz.de/cgi-bin/darcsweb.cgi?r=sonic-visualiser;a=summary";
@@ -119062,8 +122086,8 @@ self: {
        pname = "sophia";
        version = "0.1.2";
        sha256 = "18svfy0ald8cz03vfv3m43w777rxksmaz0713a1vzcmyfb6h5iwg";
-       buildDepends = [ base bindings-sophia bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bindings-sophia bytestring ];
+       testHaskellDepends = [
          base bindings-sophia bytestring directory tasty tasty-hunit
        ];
        jailbreak = true;
@@ -119079,7 +122103,7 @@ self: {
        pname = "sort-by-pinyin";
        version = "2014.5.19";
        sha256 = "1ksfx5zhagg2y8virg8am1w8ljrzc9ddmf7xgvi5gx88zibi32fd";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-extra air-th base bytestring containers text
        ];
        homepage = "https://github.com/nfjinjing/sort-by-pinyin";
@@ -119093,7 +122117,7 @@ self: {
        pname = "sorted";
        version = "0.0.1";
        sha256 = "0rzcxhzc4s4sbdnysmjh1i8pd39jyx7a4hbhkarsp2qbx29s4h03";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Efficient, type-safe sorted sequences";
        license = stdenv.lib.licenses.mit;
@@ -119106,7 +122130,7 @@ self: {
        pname = "sorted-list";
        version = "0.1.4.2";
        sha256 = "1prfxpfvsx03lvk5q33azpcif2a3j80v4naw2kn48r1kb84r60m1";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
        license = stdenv.lib.licenses.bsd3;
@@ -119118,7 +122142,7 @@ self: {
        pname = "sorting";
        version = "1.0.0.1";
        sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/joneshf/sorting";
        description = "Utils for sorting";
        license = stdenv.lib.licenses.bsd3;
@@ -119132,7 +122156,7 @@ self: {
        sha256 = "04bripdlc90rlkv5q6p44j10n7c1zdwv0ibiq5p365xijgribfaq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       executableHaskellDepends = [ base bytestring ];
        jailbreak = true;
        description = "Sort lines per file size";
        license = stdenv.lib.licenses.bsd3;
@@ -119150,7 +122174,7 @@ self: {
        sha256 = "11zwhq5r21phgadfvxxmvz7gcz3vhyrqw2rmwnkxz0n65p5az15m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base carray directory fft filepath numeric-prelude
          optparse-applicative sample-frame soxlib storablevector
          storablevector-carray synthesizer-core temporary transformers
@@ -119170,7 +122194,7 @@ self: {
        sha256 = "1mqa70zbhpw860hclns4y8pri6d9swahzbhac7jhzrwq4vyia9xj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parseargs WAVE ];
+       executableHaskellDepends = [ base containers parseargs WAVE ];
        homepage = "http://github.com/BartMassey/sounddelay";
        description = "Audio delay line";
        license = stdenv.lib.licenses.bsd3;
@@ -119188,7 +122212,7 @@ self: {
        sha256 = "1934awipc837mdhkfa3ghmljxk0vb16wd4f31qdl4q9nxgwfv6c8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers curl data-default directory filepath
          hack hack-contrib hack-handler-happstack haskell98 HDBC
          HDBC-sqlite3 json loli mps mtl process safe StateVar stm
@@ -119207,10 +122231,10 @@ self: {
      mkDerivation {
        pname = "sourcemap";
        version = "0.1.3.0";
-       revision = "1";
        sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5";
+       revision = "1";
        editedCabalFile = "aa8b674ddb6f30642da0a391ad3481b44241f9f1cb2ee661503e59dac3ca2053";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring process text unordered-containers
          utf8-string
        ];
@@ -119227,10 +122251,10 @@ self: {
        pname = "sousit";
        version = "0.4";
        sha256 = "0vfgl4l3zwfsb2p5fds47bikyvfcsypmbjd1yvkjvi36x2g3pzwr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal mtl resourcet stm transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/msiegenthaler/SouSiT";
@@ -119248,7 +122272,7 @@ self: {
        pname = "sox";
        version = "0.2.2.5";
        sha256 = "19jczxackqhbi85i0i3jl26ng34a9hkfw73jlfscfl8xjqc0j99n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers explicit-exception extensible-exceptions process
          sample-frame transformers unix utility-ht
        ];
@@ -119268,11 +122292,11 @@ self: {
        sha256 = "1d82sqihmx3ymgyahbnjlzmam4pj4rwyp956p74fpl0gsmqphmr8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers explicit-exception extensible-exceptions
          sample-frame storablevector transformers utility-ht
        ];
-       pkgconfigDepends = [ sox ];
+       libraryPkgconfigDepends = [ sox ];
        homepage = "http://www.haskell.org/haskellwiki/Sox";
        description = "Write, read, convert audio signals using libsox";
        license = stdenv.lib.licenses.bsd3;
@@ -119289,7 +122313,7 @@ self: {
        sha256 = "1w8adkrics3jp8lc1gwjiwn4i94yfzxba13wf65qywhmdr9lcy3p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cmdargs containers pretty QuickCheck
          trifecta uniplate vector
        ];
@@ -119305,8 +122329,8 @@ self: {
        pname = "spacefill";
        version = "0.1";
        sha256 = "0md1ygps2y2ri49g012xj5vv9iglixw06sicl685k60h4sskiqsk";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/knz/spacefill";
        description = "Generators for space-filling curves";
        license = stdenv.lib.licenses.publicDomain;
@@ -119318,7 +122342,7 @@ self: {
        pname = "spacepart";
        version = "0.1.0.0";
        sha256 = "118wch92ix54jp1hi4qw9mk46571lnak4df8ji83bs2vz3vax6jp";
-       buildDepends = [ base vector-space ];
+       libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
        description = "Space partition data structures. Currently only a QuadTree.";
@@ -119333,8 +122357,8 @@ self: {
        pname = "spaceprobe";
        version = "0.3.0";
        sha256 = "09vpnq5mfdzr132cqm5i4xkxmpg2035pbs64a56lgq0asdzlhfmy";
-       buildDepends = [ base clock containers erf mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base clock containers erf mtl ];
+       testHaskellDepends = [
          base clock containers erf mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -119353,13 +122377,14 @@ self: {
        sha256 = "0qi1pm46fyrn4vv1b5kcwhd8im59nz5qil6z33r8wq16vv151qb4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers gloss lens linear MonadRandom mtl netwire
        ];
        jailbreak = true;
        homepage = "https://github.com/vtan/spanout";
        description = "A breakout clone written in netwire and gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparse" = callPackage
@@ -119373,11 +122398,11 @@ self: {
        pname = "sparse";
        version = "0.9.2";
        sha256 = "0ckjmpnav3rd40ylksrwc0awy4pigv6ngm15z1k6sicw73iyl3pd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base contravariant deepseq hybrid-vectors lens primitive
          transformers vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath hlint
          hybrid-vectors lens linear mtl QuickCheck semigroups simple-reflect
          test-framework test-framework-quickcheck2 test-framework-th
@@ -119398,8 +122423,8 @@ self: {
        pname = "sparse-lin-alg";
        version = "0.4.3";
        sha256 = "1255q13mb6196i3hv1i41agifg1x1840z535mx48jjkln297gmc9";
-       buildDepends = [ base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -119414,7 +122439,7 @@ self: {
        pname = "sparsebit";
        version = "0.5";
        sha256 = "1a4gsnmr1y8b05iws2vrmjqbs5y9svfsz0jb3k19dddn1aszzm07";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://kyagrd.dyndns.org/wiki/SparseBitmapsForPatternMatchCoverage";
        description = "Sparse bitmaps for pattern match coverage";
        license = stdenv.lib.licenses.bsd3;
@@ -119427,7 +122452,7 @@ self: {
        pname = "sparsecheck";
        version = "0.1.0.3";
        sha256 = "19h9vy7arhi35rqafbq3nf9a50vnlw5mbfwvl6sp1j61w0yxai95";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://www.cs.york.ac.uk/~mfn/sparsecheck/";
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
@@ -119442,7 +122467,7 @@ self: {
        pname = "sparser";
        version = "0.6.1";
        sha256 = "1mhnjlsqmvvwnh35dzrms9vsdvr563aq49qhwg35pvscsia2fpr2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default monadplus nats pointed semigroups
        ];
        description = "Lightweight parsing library based on partial functions";
@@ -119455,7 +122480,7 @@ self: {
        pname = "spata";
        version = "2010.10.10";
        sha256 = "1cr0d82l2b96jvszca4yavdgwq450yzigcyrrlddrf9m9908kkzy";
-       buildDepends = [ base dlist mps mtl ];
+       libraryHaskellDepends = [ base dlist mps mtl ];
        homepage = "http://github.com/nfjinjing/spata";
        description = "brainless form validation";
        license = stdenv.lib.licenses.bsd3;
@@ -119470,8 +122495,10 @@ self: {
        pname = "spatial-math";
        version = "0.2.4.0";
        sha256 = "0aysc8r9ry7ii76d6522ja4pjwrfl3m212mbrimbdrh20ykirjvv";
-       buildDepends = [ base binary cereal ghc-prim lens linear ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base binary cereal ghc-prim lens linear
+       ];
+       testHaskellDepends = [ base doctest ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119482,7 +122509,7 @@ self: {
        pname = "spawn";
        version = "0.3";
        sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Tiny library for concurrent computations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119493,8 +122520,8 @@ self: {
        pname = "spdx";
        version = "0.2.0.0";
        sha256 = "0hxzkmyi90cbr7w8mjlp2azbkyp8gvjpv28c57lpvxw2xvyavgjq";
-       buildDepends = [ base transformers ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/phadej/spdx";
        description = "SPDX license expression language";
        license = stdenv.lib.licenses.bsd3;
@@ -119506,8 +122533,8 @@ self: {
        pname = "spe";
        version = "0.6.3";
        sha256 = "02cq8f9yz5z3rwkcj4nj8dgzwnn2w3b1jpndmmcqwsjymmivy8fr";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/akc/spe";
        description = "Combinatorial species lite";
        license = stdenv.lib.licenses.bsd3;
@@ -119519,7 +122546,7 @@ self: {
        pname = "special-functors";
        version = "1.0.0.1";
        sha256 = "0c68af104qxn9lhzshcy9s466q10n3ic7q4navqi53mmmmznivrd";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
@@ -119535,7 +122562,7 @@ self: {
        pname = "special-keys";
        version = "0.1.0.3";
        sha256 = "0r66rzyh9m9wsy8mhyq09ar0zbalfyr627z9xrxny8242nbsygpy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-markup bytestring cereal deepseq hashable
          mwc-random path-pieces primitive safecopy text uuid
        ];
@@ -119554,12 +122581,12 @@ self: {
        pname = "specialize-th";
        version = "0.0.0.8";
        sha256 = "1b9bs08zja8id739zf0q47y91aq10gjr1ikbf7rvzav9i3w6djnc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base composition derive MissingH mtl newtype newtype-th
          template-haskell th-expand-syns tuple type-sub-th uniplate
          universe-th
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers composition DebugTraceHelpers derive HUnit MissingH
          mtl newtype newtype-th QuickCheck template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2 th-expand-syns
@@ -119579,7 +122606,7 @@ self: {
        pname = "species";
        version = "0.3.4.2";
        sha256 = "07xixq45wbfqmdiykra2fpsfjv1n5s1zn0jvqrhja5d2i92865ly";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers multiset-comb np-extras numeric-prelude
          template-haskell
        ];
@@ -119593,7 +122620,7 @@ self: {
        pname = "speculation";
        version = "1.5.0.2";
        sha256 = "11d4v3x9phayx29lxl4na0b940ax27rjd867f7l9jb284p1rvhp5";
-       buildDepends = [ base ghc-prim stm transformers ];
+       libraryHaskellDepends = [ base ghc-prim stm transformers ];
        homepage = "http://github.com/ekmett/speculation";
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
@@ -119605,7 +122632,7 @@ self: {
        pname = "speculation-transformers";
        version = "0.1.2";
        sha256 = "0050iy5q9m1ylkhbbnpff7yl99917pa46pgvj76isij4lvdl4f5a";
-       buildDepends = [ speculation ];
+       libraryHaskellDepends = [ speculation ];
        homepage = "http://github.com/ekmett/speculation/";
        description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
@@ -119622,7 +122649,10 @@ self: {
        sha256 = "0n0b2lbvj3pjg841pdw7pb09cpkz2d186dd4pmabjnm6r6wabm2n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base edit-distance phonetic-code sqlite
+       ];
+       executableHaskellDepends = [
          base edit-distance parseargs phonetic-code sqlite
        ];
        homepage = "https://github.com/gregwebs/haskell-spell-suggest";
@@ -119638,7 +122668,7 @@ self: {
        pname = "sphero";
        version = "0.1.0.0";
        sha256 = "1b5i6zpp3xz8jcvs44g97iyam5vcig3fpy0hcsldg51cm762sv48";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers mtl simple-bluetooth
        ];
        jailbreak = true;
@@ -119655,7 +122685,7 @@ self: {
        pname = "sphinx";
        version = "0.6.0.1";
        sha256 = "1pcm4y9k5lc00805ddv519cx4j3qld2v1dnbckg38n9dyp96wj98";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 network text text-icu
          xml
        ];
@@ -119672,7 +122702,7 @@ self: {
        sha256 = "08fqfmd6462skjywv2j4ilnmpbzr28d6vwmb187w3sv0byvvjzw3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base sphinx ];
+       executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119686,7 +122716,7 @@ self: {
        pname = "spice";
        version = "0.5.0.0";
        sha256 = "1xs09ipg9l38nq3kxpdyv6643ywivhw87w6il0q9bzhng4rpfj6g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default elerea GLFW JuicyPixels
          JuicyPixels-repa OpenGL
        ];
@@ -119708,11 +122738,11 @@ self: {
        sha256 = "11xr80fmbd6ps79fyzb40ha1gw4crxr8gff2nk39spj0sj64jqdn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath glib global-variables gtk mtl
          process random rosezipper stm webkit
        ];
-       pkgconfigDepends = [ libsoup ];
+       executablePkgconfigDepends = [ libsoup ];
        jailbreak = true;
        homepage = "http://github.com/Tener/spike";
        description = "Experimental web browser";
@@ -119726,7 +122756,7 @@ self: {
        pname = "spine";
        version = "0.1";
        sha256 = "1sk2vkslcbmr4z87xc7q38ywbj118bcgqrkz9fqsp7jffxvy4bgv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/spl/spine";
        description = "Simple implementation of the generic spine view";
        license = stdenv.lib.licenses.bsd3;
@@ -119738,7 +122768,7 @@ self: {
        pname = "spir-v";
        version = "0.0.0.1";
        sha256 = "1aazv418dd4kgpm8kq7n1cfm0gwcr0amsfdks0n1d9mn1rvz7b9p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/expipiplus1/spir-v";
        description = "Some utilities for reading and writing SPIR-V files";
@@ -119751,7 +122781,7 @@ self: {
        pname = "splay";
        version = "0.0.6";
        sha256 = "1mq5n62lg2jbhzbl1py7yhnhdyxa0gn2xmihb9cm5r7p75p5wacl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119764,8 +122794,8 @@ self: {
        pname = "splaytree";
        version = "0.1.5";
        sha256 = "0jilqkgp1mk6sllxhigp1sidnp7amgsfdmxf23r0l69hp0w4dcm7";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -119781,7 +122811,7 @@ self: {
        pname = "splice";
        version = "0.6.1.1";
        sha256 = "0lsfkm4vfipzbnqpf3yli6fwrv5a5mwbs149dfzhs7spa9kbxyl1";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        homepage = "http://corsis.github.com/splice/";
        description = "Cross-platform Socket to Socket Data Splicing";
        license = stdenv.lib.licenses.bsd3;
@@ -119798,11 +122828,11 @@ self: {
        sha256 = "112agbhn11wpy4dn0g3j9mrqcja5hhql55swmwh3lbm26hcvwjpq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs filepath MissingH repa repa-algorithms repa-io tasty
          tasty-hunit tasty-quickcheck vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs doctest filepath MissingH repa repa-algorithms repa-io
          tasty tasty-hunit tasty-quickcheck vector
        ];
@@ -119820,8 +122850,10 @@ self: {
        pname = "splines";
        version = "0.5.0.1";
        sha256 = "1bq5m8izvkrw21v9anp381rrq41svsmkxa0fk86ncm0lkaj09l5b";
-       buildDepends = [ base containers polynomial vector vector-space ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers polynomial vector vector-space
+       ];
+       testHaskellDepends = [
          base containers polynomial QuickCheck test-framework
          test-framework-quickcheck2 vector vector-space
        ];
@@ -119836,7 +122868,7 @@ self: {
        pname = "split";
        version = "0.1.4.3";
        sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~byorgey/code/split";
        description = "Combinator library for splitting lists";
@@ -119848,11 +122880,11 @@ self: {
      mkDerivation {
        pname = "split";
        version = "0.2.2";
-       revision = "1";
        sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr";
+       revision = "1";
        editedCabalFile = "9098e40414e8491b0a400f5874408e577a444c4eadf1e03fb4ea6dfcc32e30c4";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Combinator library for splitting lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119863,7 +122895,7 @@ self: {
        pname = "split-channel";
        version = "0.2.0.1";
        sha256 = "0w2sgj1f5ydfvhm80d3pbka9988jwl80n14bp5nisawpd2glxvak";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Control.Concurrent.Chan split into sending and receiving halves.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -119878,7 +122910,7 @@ self: {
        sha256 = "0d53npfi3mba83vpjkq59ga51nxqvkvv7gr0mj1jb8kj8i4jjw7v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base numeric-prelude soxlib storablevector synthesizer-core
          transformers utility-ht
        ];
@@ -119894,7 +122926,7 @@ self: {
        pname = "split-tchan";
        version = "0.1.0.0";
        sha256 = "0qwcbvnm2vlr4bmn8r1q3ycamvgs0nfap4dkyzgp54f9rrl73x2p";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "STM's TChan split into sending and receiving halves";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119907,12 +122939,13 @@ self: {
        sha256 = "1nibmm0ab7a2j9rdmnphzz2svc3xfq268jbn23a403465s0v6sq6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath parsec range ];
+       executableHaskellDepends = [
+         base directory filepath parsec range
+       ];
        jailbreak = true;
        homepage = "https://bitbucket.org/robertmassaioli/splitter";
        description = "Use numerical ranges to split out certain lines from a file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "splot" = callPackage
@@ -119926,7 +122959,7 @@ self: {
        sha256 = "0xk5p2ikrzrmhvl69cl36sskcqgfnhxbbdlyp7bzl5pny0l0h9in";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bytestring-lexing cairo colour containers HUnit mtl
          strptime template-haskell time vcs-revision
        ];
@@ -119942,7 +122975,7 @@ self: {
        pname = "spool";
        version = "0.1";
        sha256 = "1svkz3cxkyi6f3akakjfk1cvij85xy69v52d88gh97xgiawp5346";
-       buildDepends = [ base bytestring vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
        description = "Convert between ByteString and Vector.Storable without copying";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119952,10 +122985,10 @@ self: {
      mkDerivation {
        pname = "spoon";
        version = "0.3.1";
-       revision = "1";
        sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr";
+       revision = "1";
        editedCabalFile = "e46c5e919cc9d0c7b0f671cddb631ef0979622a1e2250c59c7e491a799944527";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        description = "Catch errors thrown from pure computations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119970,7 +123003,7 @@ self: {
        sha256 = "0xkarfm0c0931dz6yjs7pb5s2zizz1psnx9gfri5jq16skxk2nhd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory extensible-exceptions filepath parsec
        ];
        homepage = "http://github.com/elginer/SpoonUtilities";
@@ -119987,7 +123020,7 @@ self: {
        pname = "spoty";
        version = "0.1.0.2";
        sha256 = "0p1mn8yixlyj2al98mxzs10m0klqqmmdfjcwc9xax97xp4ixjcm3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring lens lens-aeson pipes text
          unordered-containers wreq
        ];
@@ -120007,7 +123040,9 @@ self: {
        sha256 = "1q6cdgn1bf6dz6brd237ypw3cn0arbf9sm8ghzfngz20k0rbgcj1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base explicit-exception transformers utility-ht ];
+       libraryHaskellDepends = [
+         base explicit-exception transformers utility-ht
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Spreadsheet";
        description = "Read and write spreadsheets from and to CSV files in a lazy way";
        license = stdenv.lib.licenses.bsd3;
@@ -120019,7 +123054,7 @@ self: {
        pname = "spritz";
        version = "0.1.0.0";
        sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk";
-       buildDepends = [ base lens mtl vector ];
+       libraryHaskellDepends = [ base lens mtl vector ];
        homepage = "https://github.com/relrod/spritz";
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
@@ -120033,8 +123068,8 @@ self: {
        pname = "spsa";
        version = "0.2.0.0";
        sha256 = "0jj08bkvmg8cj0lp7j8sd2ksanyrr5i2xxcz4kfwkrlyf8zhqxrh";
-       buildDepends = [ base hmatrix mtl random ];
-       testDepends = [
+       libraryHaskellDepends = [ base hmatrix mtl random ];
+       testHaskellDepends = [
          base hmatrix HUnit QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -120055,11 +123090,11 @@ self: {
        sha256 = "1b3nhx009mzwl7n9d1bka4i9mwdh1gq08bsfmcnw9s7527nhn0ph";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory filemanip filepath fsnotify json process
          system-filepath time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs directory filemanip filepath fsnotify HUnit json
          process QuickCheck system-filepath test-framework
          test-framework-hunit test-framework-quickcheck2 time unix
@@ -120067,6 +123102,7 @@ self: {
        homepage = "https://bitbucket.org/ssaasen/spy";
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple" = callPackage
@@ -120077,7 +123113,7 @@ self: {
        pname = "sql-simple";
        version = "0.3.1";
        sha256 = "1vhg8ijpa64qalgza5sr3j8y1ihk6ys5lyf34vwcmjv8nlpyhpwh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers exceptions monad-control text transformers
          transformers-base
        ];
@@ -120096,7 +123132,7 @@ self: {
        pname = "sql-simple-mysql";
        version = "0.3.0";
        sha256 = "1i9xgzl3pjxii4mgx8az5gmygxq2vn1km7kmndwy07qkh26ynd7p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class mysql mysql-simple sql-simple text
        ];
        jailbreak = true;
@@ -120114,7 +123150,7 @@ self: {
        pname = "sql-simple-pool";
        version = "0.3.0";
        sha256 = "14pradqy01vsd2cngvcbwvrwq5r3c5a00awi6j5vmkb51dycizh9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class monad-control resource-pool sql-simple text
          time
        ];
@@ -120133,7 +123169,7 @@ self: {
        pname = "sql-simple-postgresql";
        version = "0.3.0";
        sha256 = "0dk2829zkcwxyqw0p2nsrm9gw527cmggdslhflrylg8xr1ag6zs1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class postgresql-simple sql-simple text
        ];
        jailbreak = true;
@@ -120149,7 +123185,7 @@ self: {
        pname = "sql-simple-sqlite";
        version = "0.3.0";
        sha256 = "07ji17b4q9b8w9q9r8digb218qkjcrxfc24113p0f3pmgbwci3f1";
-       buildDepends = [ base sql-simple sqlite-simple ];
+       libraryHaskellDepends = [ base sql-simple sqlite-simple ];
        jailbreak = true;
        homepage = "https://github.com/philopon/sql-simple";
        description = "sqlite backend for sql-simple";
@@ -120163,12 +123199,11 @@ self: {
        pname = "sql-words";
        version = "0.1.3.1";
        sha256 = "17dma51naynrxhvljwp7s3sadnmfqgallxsq7l763z6d0a25zkn9";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck quickcheck-simple ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Simple idea SQL keywords data constructor into OverloadedString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlite" = callPackage
@@ -120179,10 +123214,10 @@ self: {
        pname = "sqlite";
        version = "0.5.2.2";
        sha256 = "1hlyv2w4q2dlcsz18fqbmqf7nwsbzyh184ynzfnz5svvc8j9hbrp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory pretty time utf8-string
        ];
-       extraLibraries = [ sqlite ];
+       librarySystemDepends = [ sqlite ];
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) sqlite;};
@@ -120196,11 +123231,11 @@ self: {
        pname = "sqlite-simple";
        version = "0.4.9.0";
        sha256 = "18v03yqq9jxyvxq93rh20sxak4ffsshhpq9v9lrz1lk9vnhy9pw1";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          direct-sqlite text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base16-bytestring bytestring direct-sqlite HUnit text time
        ];
        homepage = "http://github.com/nurpax/sqlite-simple";
@@ -120216,7 +123251,7 @@ self: {
        pname = "sqlite-simple-typed";
        version = "0.1.0.0";
        sha256 = "00flij4wv8ga0bpnnai6gwwga1fkra9kr3y9yw30j7czwl5r2h0r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta sqlite sqlite-simple template-haskell
          typedquery utf8-string
        ];
@@ -120233,7 +123268,7 @@ self: {
        pname = "sqlvalue-list";
        version = "0.2";
        sha256 = "1r9y3p355rl57pnm84flx734zzjxnnc53fkcfdkykxi5wi5j05v0";
-       buildDepends = [ base convertible HDBC template-haskell ];
+       libraryHaskellDepends = [ base convertible HDBC template-haskell ];
        description = "Class and instances for conversion to list of SqlValue";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120248,7 +123283,7 @@ self: {
        sha256 = "18nia9c5zvcwd3sbj1h53kfcfa2ihfmff74ab2lfi97dgrq5p1n4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal directory factory filepath mtl QuickCheck random
          toolshed unix
        ];
@@ -120267,7 +123302,7 @@ self: {
        pname = "sr-extra";
        version = "1.46.3.1";
        sha256 = "0ssrv6h50kycxzb84s5j61mg78xyb4hyda2zxshnlqz0gbq134sr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bzlib containers directory filepath HUnit mtl
          network-uri old-locale old-time pretty process pureMD5 QuickCheck
          random regex-compat time unix Unixutils zlib
@@ -120287,7 +123322,7 @@ self: {
        sha256 = "05ydsh4ippapxcx7j3fq8s64qiskcrmndgvilxkdp4qhxyi80gj9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory hslogger MissingH network parsec process
          regex-compat unix
        ];
@@ -120302,7 +123337,7 @@ self: {
        pname = "srcloc";
        version = "0.5.1.0";
        sha256 = "1zssd6jxdhzl5wcygbmzq1s82i7m7rav6nm1m6kl5b68g77gc7g6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Data types for managing source code locations";
        license = stdenv.lib.licenses.bsd3;
@@ -120314,7 +123349,7 @@ self: {
        pname = "srec";
        version = "0.1.0";
        sha256 = "028sb4znvdqsygipcsf44j0xazk03pdfkirzrczmxcd11srh3h1k";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://tomahawkins.org";
        description = "Parsing and processing s-records";
        license = stdenv.lib.licenses.bsd3;
@@ -120329,7 +123364,7 @@ self: {
        pname = "sscgi";
        version = "0.3.0";
        sha256 = "0pkhk6xhh1404yncyl62mjyp7mc2i06ihy243r0mq7qyy7ak417r";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive containers Glob
          MonadCatchIO-mtl mtl transformers utf8-string
        ];
@@ -120352,13 +123387,13 @@ self: {
        pname = "ssh";
        version = "0.3.1";
        sha256 = "1v4xrnc7h5r0nlcv3m129phf6qpp48fvkgv9yxf0fy1i3lp52krj";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-string binary bytestring
          cereal containers crypto-api crypto-pubkey-types
          cryptohash-cryptoapi HsOpenSSL integer-gmp network process random
          RSA SHA SimpleAES split transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory filepath HUnit libssh2
          pseudomacros QuickCheck tasty tasty-hunit tasty-quickcheck
          template-haskell th-lift-instances
@@ -120380,10 +123415,10 @@ self: {
        sha256 = "0q34zx8cn0gs91c4x4bicmygfaary5kk42ib62jk0hlrh3rzdi7c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers keyword-args nagios-check parsec
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec keyword-args nagios-check parsec
        ];
        jailbreak = true;
@@ -120401,7 +123436,7 @@ self: {
        sha256 = "0794vsv043ppydzyjxnh06m4l3gbnga7x8nwsamh8skrzjfwn6jq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers curl directory hdaemonize hslogger mtl process
          regex-compat stm unix
        ];
@@ -120422,7 +123457,13 @@ self: {
        sha256 = "1nr30nrldjd3q1iw3l967x3v1rvl9afz1p87hhhkvpy60gri8m7c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attempt attoparsec aws base base64-bytestring blaze-builder
+         bytestring case-insensitive cereal conduit containers cryptohash
+         data-default http-conduit http-types mtl network-conduit text wai
+         wai-extra warp
+       ];
+       executableHaskellDepends = [
          attempt attoparsec aws base base64-bytestring blaze-builder
          bytestring case-insensitive cereal conduit containers cryptohash
          data-default http-conduit http-types mtl network-conduit text wai
@@ -120445,10 +123486,10 @@ self: {
        sha256 = "1siyjj75k1nsncpqwz53algbnvgbmr4syw45rfj1cpq4qbfwlcgm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary bytestring cmdargs containers deepseq directory
-         iteratee
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory iteratee
        ];
+       executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120462,7 +123503,8 @@ self: {
        sha256 = "1z01611d380rgn64b0sbwxfbz7m8lgwhkc3lljpih6nsdn9hwrq5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        homepage = "https://github.com/BartMassey/ssv";
        description = "Comma-separated-value (CSV) read, show and write routines";
        license = stdenv.lib.licenses.mit;
@@ -120474,7 +123516,7 @@ self: {
        pname = "stable-heap";
        version = "0.1.0.0";
        sha256 = "14wx42lmk2vd6v356q5cbd78y9xdnmkwcn6ddpnkyzq331hk23s1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://hub.darcs.net/jmcarthur/stable-heap";
        description = "Purely functional stable heaps (fair priority queues)";
        license = stdenv.lib.licenses.mit;
@@ -120486,7 +123528,7 @@ self: {
        pname = "stable-maps";
        version = "0.0.5";
        sha256 = "1sjidykbj5f692di93nml0frazvyw9kxyhjwbyyvrb9gwgc2ms3w";
-       buildDepends = [ base containers ghc-prim ];
+       libraryHaskellDepends = [ base containers ghc-prim ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/stable-maps";
        description = "Heterogeneous maps keyed by StableNames";
@@ -120499,7 +123541,7 @@ self: {
        pname = "stable-memo";
        version = "0.3.1";
        sha256 = "1rv578311cvn7ym08vxxi18dhic50w7ms6cjn77vh032b8fxr3gx";
-       buildDepends = [ base ghc-prim hashtables ];
+       libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120515,11 +123557,12 @@ self: {
        sha256 = "0mcb983sdwfsf39gd8zsls7pgndqrnnzvxsz8kn9c5nqjxwdll4p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder bytestring cereal containers mtl objectid
          text
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers mtl objectid text ];
+       testHaskellDepends = [
          base bytestring bytestring-arbitrary cereal containers mtl objectid
          QuickCheck tasty tasty-quickcheck text
        ];
@@ -120548,26 +123591,31 @@ self: {
      mkDerivation {
        pname = "stack";
        version = "9.9.9";
-       revision = "4";
        sha256 = "1kpsza23b22mg970c2qs943khzad38imzsa1xzki2a3xvfiadana";
+       revision = "4";
        editedCabalFile = "5ff7356010e14ec43684d11fcec6e34f47f794cc48a258919568cc27c72ffd34";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base base16-bytestring base64-bytestring
-         bifunctors binary blaze-builder bytestring Cabal conduit
-         conduit-combinators conduit-extra containers cryptohash
-         cryptohash-conduit deepseq directory either enclosed-exceptions
-         exceptions fast-logger file-embed filepath hashable http-client
-         http-client-tls http-conduit http-types lifted-base monad-control
-         monad-logger monad-loops mtl old-locale optparse-applicative
-         optparse-simple path persistent persistent-sqlite
-         persistent-template pretty process resourcet safe split stm
+         bifunctors binary bytestring Cabal conduit conduit-combinators
+         conduit-extra containers cryptohash cryptohash-conduit deepseq
+         directory enclosed-exceptions exceptions fast-logger file-embed
+         filepath hashable http-client http-client-tls http-conduit
+         http-types lifted-base monad-control monad-logger monad-loops mtl
+         old-locale optparse-applicative path persistent persistent-sqlite
+         persistent-template pretty process resourcet safe stm
          streaming-commons tar template-haskell temporary text time
          transformers transformers-base unix unordered-containers vector
          vector-binary-instances void word8 yaml zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base blaze-builder bytestring conduit containers directory either
+         exceptions filepath hashable http-client http-conduit monad-logger
+         mtl old-locale optparse-applicative optparse-simple path process
+         resourcet split text transformers unordered-containers
+       ];
+       testHaskellDepends = [
          async base bytestring Cabal conduit conduit-extra containers
          cryptohash directory exceptions filepath hspec http-conduit
          monad-logger path process resourcet temporary text transformers
@@ -120587,10 +123635,10 @@ self: {
        pname = "stack-prism";
        version = "0.1.4";
        sha256 = "1lw42nkbzsc7mg8fnspjsply67ashrnbkml797fz2nvic84l8820";
-       buildDepends = [
+       libraryHaskellDepends = [
          base profunctors tagged template-haskell transformers
        ];
-       testDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
@@ -120606,7 +123654,7 @@ self: {
        pname = "stackage";
        version = "0.7.3.2";
        sha256 = "0npry3yxbfyz97q19b405h40mb4rypgkhlp78hgl7zqbxk28ysza";
-       buildDepends = [
+       libraryHaskellDepends = [
          base stackage-build-plan stackage-cabal stackage-cli
          stackage-install stackage-sandbox stackage-setup stackage-update
          stackage-upload
@@ -120628,10 +123676,13 @@ self: {
        sha256 = "1slqkcmvnrbbg50qdf368q5h7svngw77b984mpg39p44mc7ghwyg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring Cabal containers directory exceptions
-         filepath http-client http-client-tls mtl optparse-applicative
-         stackage-cli stackage-types text time yaml
+         filepath http-client http-client-tls mtl stackage-types text time
+         yaml
+       ];
+       executableHaskellDepends = [
+         aeson base optparse-applicative stackage-cli text
        ];
        homepage = "https://github.com/fpco/stackage-build-plan";
        description = "Calculate and print (in different formats) Stackage build plans";
@@ -120649,7 +123700,8 @@ self: {
        sha256 = "0797izw5451mqr41a22xvv5c6c0936hi44cfmp9rzhj6mh92iwzj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
          base bytestring exceptions http-client http-client-tls http-types
          optparse-applicative parsec process stackage-cli system-fileio text
        ];
@@ -120669,11 +123721,12 @@ self: {
        sha256 = "10asq1zg7b4zqsn51ap03809j0bxrwh1gacc387wdi1p3zakn88n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit directory either exceptions filepath hashable
          optparse-applicative optparse-simple process split text
          transformers unordered-containers
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "https://www.stackage.org/package/stackage-cli";
        description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
@@ -120699,20 +123752,23 @@ self: {
        sha256 = "0dlsgm9bbib45591m7kj9vai48r4n0zvkwm4vd4c78rj54qhnq9n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 async base
          base16-bytestring blaze-html byteable bytestring Cabal
          classy-prelude-conduit conduit conduit-extra containers cryptohash
          cryptohash-conduit data-default-class directory filepath
          html-conduit http-client http-client-tls http-conduit mime-types
-         monad-unlift mono-traversable mtl old-locale optparse-applicative
-         optparse-simple process resourcet semigroups stackage-cli
-         stackage-install stackage-metadata stackage-types stackage-update
-         stm streaming-commons system-fileio system-filepath tar temporary
-         text time transformers unix-compat utf8-string xml-conduit
-         xml-types yaml zlib
+         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
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base http-client http-client-tls optparse-applicative
+         optparse-simple stackage-cli stackage-update system-filepath text
+       ];
+       testHaskellDepends = [
          base Cabal classy-prelude-conduit containers hspec http-client
          http-client-tls QuickCheck text yaml
        ];
@@ -120734,11 +123790,12 @@ self: {
        sha256 = "0xdqd1q1xy0qax4c2dn1qa0qphvq01xy3wzdp7rr2xnd23ikmbs6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bytestring containers cryptohash directory
          filepath http-client http-client-tls http-types process stm tar
          text
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/fpco/stackage-install";
        description = "Secure download of packages for cabal-install";
        license = stdenv.lib.licenses.mit;
@@ -120756,11 +123813,14 @@ self: {
        sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base base16-bytestring bytestring Cabal conduit containers
-         cryptohash directory filepath http-client http-client-tls pretty
-         resourcet stackage-install stackage-update tar text transformers
-         yaml zlib
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal conduit containers directory filepath
+         pretty resourcet tar text transformers zlib
+       ];
+       executableHaskellDepends = [
+         base base16-bytestring bytestring Cabal conduit containers
+         cryptohash directory filepath http-client http-client-tls resourcet
+         stackage-install stackage-update tar text transformers yaml
        ];
        homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool";
        description = "Grab current metadata for all packages";
@@ -120778,7 +123838,8 @@ self: {
        sha256 = "0d5i2wszn4sv797gzdv84abvdm3nzaa1lgn2gp4ywj1iqbbszbns";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
          attoparsec base bytestring conduit-combinators conduit-extra
          directory filepath optparse-applicative process stackage-cli text
        ];
@@ -120799,7 +123860,8 @@ self: {
        sha256 = "1101sb822v42zjjgabn4s80qyvn6nvzkfagaxpzjm6dp5svl3biv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
          aeson base bytestring classy-prelude-conduit cryptohash
          cryptohash-conduit directory filepath http-client-tls http-conduit
          http-types optparse-applicative process stackage-cli text
@@ -120819,7 +123881,7 @@ self: {
        pname = "stackage-types";
        version = "1.1.0";
        sha256 = "0ynfnkpzvgd54x294w4ga8nyg8lrmcwg3bhlwdlxs2fcffaazi81";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base Cabal containers exceptions hashable safe semigroups
          text time unordered-containers vector
        ];
@@ -120836,7 +123898,8 @@ self: {
        sha256 = "1lw30fvscnb3n29lavw16am41adrvby1v2vbh7yykbr80pkb3hvj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
+       libraryHaskellDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/fpco/stackage-update";
        description = "Update your package index incrementally (requires git)";
        license = stdenv.lib.licenses.mit;
@@ -120853,10 +123916,12 @@ self: {
        sha256 = "0fxkscyzpl6ph28100b0l663rjny9vp2jrhcca19dc0jzj0kfdgi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory filepath http-client
-         http-client-tls http-types optparse-applicative process
-         stackage-cli temporary text
+         http-client-tls http-types process temporary text
+       ];
+       executableHaskellDepends = [
+         base optparse-applicative stackage-cli
        ];
        homepage = "https://github.com/fpco/stackage-upload";
        description = "A more secure version of cabal upload which uses HTTPS";
@@ -120873,7 +123938,7 @@ self: {
        sha256 = "02j10ws9n7xc2gvmpd146vrg7khawll9y3904h28k5d6ffk6qr14";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath optparse-applicative
        ];
        homepage = "http://documentup.com/feuerbach/standalone-haddock";
@@ -120887,7 +123952,7 @@ self: {
        pname = "star-to-star";
        version = "1.0";
        sha256 = "1nxkb1rdw6lhka49r6xdjskipyig09jzrvp82hx8a1xnqb9cyrrj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "the * -> * types, operators, and covariant instances";
        license = "unknown";
      }) {};
@@ -120898,7 +123963,7 @@ self: {
        pname = "star-to-star-contra";
        version = "1.0";
        sha256 = "1kmpjm51jzk4pv6qggvwjvfqvqnr5z7znfbhiscvcq89j1842x53";
-       buildDepends = [ base star-to-star ];
+       libraryHaskellDepends = [ base star-to-star ];
        description = "contravariant instances for * -> * types and operators";
        license = "unknown";
      }) {};
@@ -120909,7 +123974,9 @@ self: {
        pname = "starling";
        version = "0.3.0";
        sha256 = "0i0f19k2b5y6vb0jngqwnf035csgiaqjgiw37wvj8vs2lbh907bp";
-       buildDepends = [ base binary bytestring failure transformers ];
+       libraryHaskellDepends = [
+         base binary bytestring failure transformers
+       ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~aslatter/starling";
        description = "A memcached client";
@@ -120926,7 +123993,7 @@ self: {
        sha256 = "0rdkxyhy62h87vdq08znqpjhg4wriwvbmn0pwak9nqsd5xk6slka";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory EdisonCore FTGL haskell98 mtl OpenGL
          random SDL
        ];
@@ -120944,7 +124011,7 @@ self: {
        pname = "stash";
        version = "0.1";
        sha256 = "01h3s19agw2aa6a0hw8f9k2qibmckqllvnx2yy2w2p1xlw8g9jwm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring directory hashable text vector
        ];
        description = "To be written";
@@ -120957,7 +124024,7 @@ self: {
        pname = "state";
        version = "0.1";
        sha256 = "0j5hbh0rkcwfigvskmgb0hql95qs0cjbys61c6sni2hc719bshx6";
-       buildDepends = [ arrows base mtl ];
+       libraryHaskellDepends = [ arrows base mtl ];
        jailbreak = true;
        description = "Data.State";
        license = "LGPL";
@@ -120969,8 +124036,8 @@ self: {
        pname = "state-plus";
        version = "0.1.1";
        sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1";
-       buildDepends = [ base mtl ];
-       testDepends = [ base checkers mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base checkers mtl QuickCheck ];
        jailbreak = true;
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
@@ -120982,7 +124049,7 @@ self: {
        pname = "state-record";
        version = "0.0.1";
        sha256 = "1y9ql1dlv2kf564x153gyw5h967pjn5zilfq88px8rqmkydqix7g";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/ktvoelker/state-record";
        description = "Better records for State monad states";
        license = "GPL";
@@ -120995,8 +124062,8 @@ self: {
        pname = "stateWriter";
        version = "0.2.3";
        sha256 = "19rhkl39mlkyrj0i1qsmncnlj5nsvp8vp1vjhl43qmcbxfxflc0l";
-       buildDepends = [ base mtl transformers ];
-       testDepends = [ base free hspec mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl transformers ];
+       testHaskellDepends = [ base free hspec mtl QuickCheck ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121009,7 +124076,7 @@ self: {
        sha256 = "122vv9h3rxn126chm5bj4rkxd7mbzndy73ck5nlmnhhxyks25d26";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base polyparse ];
+       executableHaskellDepends = [ base polyparse ];
        homepage = "http://tomahawkins.org";
        description = "Compiles Rhapsody statecharts to C";
        license = stdenv.lib.licenses.bsd3;
@@ -121021,7 +124088,7 @@ self: {
        pname = "stateful-mtl";
        version = "1.0.7";
        sha256 = "19645rqfqbcvngq8hj7bryl35lgx7p5k55vgsxa1a2hm2kq8vm5h";
-       buildDepends = [ base MaybeT mtl ];
+       libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121033,7 +124100,7 @@ self: {
        pname = "stateref";
        version = "0.3";
        sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
-       buildDepends = [ base mtl stm ];
+       libraryHaskellDepends = [ base mtl stm ];
        homepage = "http://code.haskell.org/~mokus/stateref/";
        description = "Abstraction for things that work like IORef";
        license = stdenv.lib.licenses.publicDomain;
@@ -121045,7 +124112,9 @@ self: {
        pname = "statestack";
        version = "0.2.0.4";
        sha256 = "0swj3f2vc56a5y2qxp2pq8nxkwngcw2lm87dmaikymchbqb832hd";
-       buildDepends = [ base mtl transformers transformers-compat ];
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
        description = "Simple State-like monad transformer with saveable and restorable state";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121056,7 +124125,7 @@ self: {
        pname = "statethread";
        version = "0.1.1";
        sha256 = "05clniwqk4i3zz22jzbjj2x9cgkxb2ks7mccjyp3gyy4zbm2xlmz";
-       buildDepends = [ applicative base transformers ];
+       libraryHaskellDepends = [ applicative base transformers ];
        jailbreak = true;
        description = "The ST monad and STRefs";
        license = stdenv.lib.licenses.bsd3;
@@ -121071,8 +124140,10 @@ self: {
        pname = "statgrab";
        version = "0.1.3";
        sha256 = "1rckyxg1px6v69rbr1ldy107b1q5rrh89dawlrdjzwbnmxjgbvj5";
-       buildDepends = [ async base bytestring time transformers ];
-       extraLibraries = [ statgrab ];
+       libraryHaskellDepends = [
+         async base bytestring time transformers
+       ];
+       librarySystemDepends = [ statgrab ];
        homepage = "http://github.com/brendanhay/statgrab";
        description = "Collect system level metrics and statistics";
        license = "unknown";
@@ -121085,7 +124156,7 @@ self: {
        pname = "static-canvas";
        version = "0.2.0.2";
        sha256 = "1lphx10wljylsbjwlw5p7bsjh5gf2fj1sl09556y814r11a6rjff";
-       buildDepends = [ base double-conversion free mtl text ];
+       libraryHaskellDepends = [ base double-conversion free mtl text ];
        homepage = "https://github.com/jeffreyrosenbluth/static-canvas";
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
@@ -121097,7 +124168,7 @@ self: {
        pname = "static-hash";
        version = "0.0.1";
        sha256 = "0nkgx4s389027zi23wmbc6wqnmplvjvbrsbyzy7zn41mbwmzqz8l";
-       buildDepends = [ array base containers hashable primes ];
+       libraryHaskellDepends = [ array base containers hashable primes ];
        description = "Immutable hash";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121111,11 +124182,11 @@ self: {
        pname = "static-resources";
        version = "0.1.7";
        sha256 = "0wf9kpn1l2iq00m1ms46vn2lrnyy8ip1z54ya2h4kqarcy5sr8m9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath hslogger MissingH mtl old-time process syb
          time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory hslogger HUnit MissingH mtl old-time syb
          test-framework test-framework-hunit test-framework-quickcheck2 time
        ];
@@ -121129,7 +124200,7 @@ self: {
        pname = "staticanalysis";
        version = "0.0.0.3";
        sha256 = "0b6y8yi0cfisi58pxxx1gnd1vab2i8f5wb3gzv1dfsxx5hl6jlwf";
-       buildDepends = [ base MissingH ];
+       libraryHaskellDepends = [ base MissingH ];
        description = "Reusable static analysis interfaces and modules";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -121144,11 +124215,11 @@ self: {
        pname = "statistics";
        version = "0.13.2.3";
        sha256 = "1gbghzbacfrm7vn24ssx7wz9sycafxk9b306zm6cdlsr954v296n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary deepseq erf math-functions monad-par mwc-random
          primitive vector vector-algorithms vector-binary-instances
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary erf HUnit ieee754 math-functions mwc-random primitive
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector vector-algorithms
@@ -121166,7 +124237,7 @@ self: {
        pname = "statistics-dirichlet";
        version = "0.6.3";
        sha256 = "1sx7hxv5gvzr270h4lb76dihcqcqwgdm6mq2394s407iipb2clbw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq hmatrix-special nonlinear-optimization vector
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
@@ -121180,7 +124251,7 @@ self: {
        pname = "statistics-fusion";
        version = "1.0.1";
        sha256 = "17w7vz0jarbyf9y72bn9yg134q6ja5ymfyl1v9nx94glbhbybrlf";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://code.haskell.org/~dons/code/statistics-fusion";
        description = "An implementation of high performance, minimal statistics functions";
        license = stdenv.lib.licenses.bsd3;
@@ -121195,7 +124266,7 @@ self: {
        pname = "statistics-hypergeometric-genvar";
        version = "0.1.0.0";
        sha256 = "05j83vaklwi73yr4q4yq5f36wzmbas73lxkj0dkg0w1ss97syv7m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base math-functions mwc-random primitive statistics
        ];
        jailbreak = true;
@@ -121212,7 +124283,7 @@ self: {
        pname = "statistics-linreg";
        version = "0.3";
        sha256 = "02c9xrd3b8iy7bwgsf1r06smi88k3sgpqv2ivr782wl0dcbc4wv2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base MonadRandom random random-shuffle safe statistics vector
        ];
        homepage = "http://github.com/alpmestan/statistics-linreg";
@@ -121228,7 +124299,7 @@ self: {
        sha256 = "08ig4nrlqshxmiar739zfbs95hlrp8l212hszh4zs0w2x4i3s17f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base statistics text vector ];
+       executableHaskellDepends = [ base statistics text vector ];
        jailbreak = true;
        homepage = "http://github.com/cheecheeo/stats/";
        description = "command line statistics";
@@ -121243,7 +124314,7 @@ self: {
        pname = "statsd";
        version = "0.1.0.1";
        sha256 = "13bcqms31rvzs3lfbmx43wqkmp21jbzj326yn971334cf722f0a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring monad-control mtl network random
        ];
        jailbreak = true;
@@ -121260,7 +124331,7 @@ self: {
        pname = "statsd-datadog";
        version = "0.2.0.0";
        sha256 = "1c9kgyzfk5xdxsjkjhs6vbiz03mqm41qr0ycyfxc11v0wl78yazk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring monad-control network text transformers-base
        ];
        homepage = "https://bitbucket.org/dpwiz/statsd-datadog";
@@ -121274,7 +124345,7 @@ self: {
        pname = "statvfs";
        version = "0.2";
        sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Get unix filesystem statistics with statfs, statvfs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121285,11 +124356,10 @@ self: {
        pname = "stb-image";
        version = "0.2.1";
        sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52";
-       buildDepends = [ base bitmap bytestring ];
+       libraryHaskellDepends = [ base bitmap bytestring ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stb-truetype" = callPackage
@@ -121298,7 +124368,7 @@ self: {
        pname = "stb-truetype";
        version = "0.1.2";
        sha256 = "1hbbi7hax5fw5zb7ashfs5paixqzqrrr64lwisda80dskdazld4m";
-       buildDepends = [ array base bytestring containers ];
+       libraryHaskellDepends = [ array base bytestring containers ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's TrueType rasterizer library";
        license = stdenv.lib.licenses.publicDomain;
@@ -121311,7 +124381,7 @@ self: {
        pname = "stdata";
        version = "0.0.4";
        sha256 = "0ijir2knl4vc1cpzzmf32wcjfdc958li1wd7w5vdmgk4bx45kybf";
-       buildDepends = [ base parsec syb template-haskell ];
+       libraryHaskellDepends = [ base parsec syb template-haskell ];
        jailbreak = true;
        description = "Structure Data Library";
        license = stdenv.lib.licenses.bsd3;
@@ -121328,10 +124398,13 @@ self: {
        sha256 = "1blwf18qvsrhkxfakyznr3ljr35dw6d027jybr2hh4a5yfqn6zyd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          data-binary-ieee754 split text time unix-time zlib
        ];
+       executableHaskellDepends = [
+         aeson base base64-bytestring binary bytestring split text
+       ];
        jailbreak = true;
        homepage = "https://github.com/gitfoxi/Stdf";
        description = "Parse Structured Test Data Format (STDF)";
@@ -121346,7 +124419,7 @@ self: {
        sha256 = "071ial002ip6lsm422wf9xzq7ka70h4va67382smkbgiinbma5g4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory parsec transformers ];
+       executableHaskellDepends = [ base directory parsec transformers ];
        jailbreak = true;
        description = "List and launch steam games from the cli";
        license = stdenv.lib.licenses.mit;
@@ -121362,12 +124435,13 @@ self: {
        sha256 = "1wqhjg6xw2k863fkfhq0i706c399xsv7z7gaf61x7l9wrc91pcbn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base fsnotify process regex-tdfa system-filepath text time unix
        ];
        homepage = "https://github.com/schell/steeloverseer";
        description = "A file watcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stemmer" = callPackage
@@ -121376,7 +124450,7 @@ self: {
        pname = "stemmer";
        version = "0.5.1";
        sha256 = "0jiwwhwyqnbwzfn0vhd6d4f2zq6aazh18fbhm8w7zjc3cz0cr4m0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.github.com/bgamari/stemmer";
        description = "Haskell bindings to the Snowball stemming library";
        license = stdenv.lib.licenses.bsd3;
@@ -121388,8 +124462,10 @@ self: {
        pname = "step-function";
        version = "0.1.1.0";
        sha256 = "03pdpm1glmaqhqzr2cp08iy84c1vjhq0fq7yavmcrx94hxfw1zfd";
-       buildDepends = [ base ];
-       testDepends = [ base Cabal cabal-test-quickcheck QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base Cabal cabal-test-quickcheck QuickCheck
+       ];
        homepage = "https://github.com/jonpetterbergman/step-function";
        description = "Step functions, staircase functions or piecewise constant functions";
        license = stdenv.lib.licenses.bsd3;
@@ -121402,7 +124478,7 @@ self: {
        pname = "stepwise";
        version = "1.0.2";
        sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121414,7 +124490,7 @@ self: {
        pname = "stickyKeysHotKey";
        version = "0.1.0.1";
        sha256 = "18p0yxfw9wnzk0yxdvlm3g23k8zq5nb707411i92z5m82l6pkpmi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "get and set STICKYKEYS.SKF_HOTKEYACTIVE";
        license = stdenv.lib.licenses.bsd3;
@@ -121427,8 +124503,8 @@ self: {
        pname = "stitch";
        version = "0.3.2.0";
        sha256 = "1h8n7ry8wmzvz4bjfg6vsd7ssy17y54h2pzgjdlfam8yfcly2bb7";
-       buildDepends = [ base containers text transformers ];
-       testDepends = [ base Cabal hspec text ];
+       libraryHaskellDepends = [ base containers text transformers ];
+       testHaskellDepends = [ base Cabal hspec text ];
        description = "lightweight CSS DSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121439,7 +124515,7 @@ self: {
        pname = "stm";
        version = "2.4.4";
        sha256 = "0gc8zvdijp3rwmidkpxv76b4i0dc8dw6nbd92rxl4vxl0655iysx";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121450,7 +124526,7 @@ self: {
        pname = "stm-channelize";
        version = "0.1.1";
        sha256 = "1aj4zibq54ssbb7smkxjrjl24d9vccgjpl2b9261yqyg692cz9hm";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Transactional I/O for duplex streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121461,7 +124537,7 @@ self: {
        pname = "stm-chans";
        version = "3.0.0.4";
        sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Additional types of channels for STM";
        license = stdenv.lib.licenses.bsd3;
@@ -121473,8 +124549,8 @@ self: {
        pname = "stm-chunked-queues";
        version = "0.1.0.0";
        sha256 = "0264air2mhwbya2sxskrh4z1bs8il7d9iv4vm6wyz8zxxc95v1nj";
-       buildDepends = [ async base stm ];
-       testDepends = [ async base HUnit stm tasty tasty-hunit ];
+       libraryHaskellDepends = [ async base stm ];
+       testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
        homepage = "http://github.com/kholdstare/stm-chunked-queues/";
        description = "Chunked Communication Queues";
        license = stdenv.lib.licenses.bsd3;
@@ -121493,12 +124569,12 @@ self: {
        pname = "stm-conduit";
        version = "2.6.1";
        sha256 = "0cd99aj9azlr6d9bayjyrbigbzll9yfny7qan1wnrh413i1z1x0p";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base cereal cereal-conduit conduit conduit-combinators
          conduit-extra directory ghc-prim lifted-async lifted-base
          monad-control monad-loops resourcet stm stm-chans transformers void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-combinators directory doctest HUnit QuickCheck
          resourcet stm stm-chans test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
@@ -121517,11 +124593,11 @@ self: {
        pname = "stm-containers";
        version = "0.2.9";
        sha256 = "0p2lyz1s98cxdcqfamqyx7dxxa4fzxr0a93cbm7lnmzfjvk48p52";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude focus hashable list-t loch-th placeholders primitive
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude
          placeholders primitive QuickCheck transformers unordered-containers
        ];
@@ -121537,8 +124613,8 @@ self: {
        pname = "stm-delay";
        version = "0.1.1.1";
        sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi";
-       buildDepends = [ base stm ];
-       testDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [ base stm ];
        homepage = "https://github.com/joeyadams/haskell-stm-delay";
        description = "Updatable one-shot timer polled with STM";
        license = stdenv.lib.licenses.bsd3;
@@ -121553,11 +124629,11 @@ self: {
        pname = "stm-firehose";
        version = "0.2.1";
        sha256 = "0y4q3qj3ih2xcn0mhd4jszb1d5l87abkvlmhdvx9d1407bw9j99r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder conduit http-types network-conduit stm stm-chans
          stm-conduit transformers wai warp
        ];
-       testDepends = [ base hspec HUnit stm ];
+       testHaskellDepends = [ base hspec HUnit stm ];
        jailbreak = true;
        description = "Conduits and STM operations for fire hoses";
        license = stdenv.lib.licenses.bsd3;
@@ -121570,10 +124646,9 @@ self: {
        pname = "stm-io-hooks";
        version = "1.1.0";
        sha256 = "0dg2za2p7h9wb9lbs2yb07pdhq9sn4mdxxfmq179d9kinq94009m";
-       buildDepends = [ array base containers mtl stm ];
+       libraryHaskellDepends = [ array base containers mtl stm ];
        description = "STM with IO hooks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-lifted" = callPackage
@@ -121581,10 +124656,10 @@ self: {
      mkDerivation {
        pname = "stm-lifted";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1x3yxxyik0vyh3p530msxh2a1aylmh8zab05qpq7nfl5m9v6v090";
+       revision = "1";
        editedCabalFile = "d313721a31d8e7ccc725c3a1542f4ac3f8c84fbcad10094cd1067c133edc6c54";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        description = "Software Transactional Memory lifted to MonadIO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121595,7 +124670,7 @@ self: {
        pname = "stm-linkedlist";
        version = "0.1.0.0";
        sha256 = "1x65z38dx0qi55fmbarc1827wpl4j08m23nklq8854y7kqznf9kr";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Mutable, doubly linked lists for STM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121606,7 +124681,7 @@ self: {
        pname = "stm-orelse-io";
        version = "0.1";
        sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://nonempty.org/software/stm-orelse-io";
        description = "Choose between the return value of an STM operation and an IO action";
        license = stdenv.lib.licenses.bsd3;
@@ -121618,8 +124693,8 @@ self: {
        pname = "stm-promise";
        version = "0.0.3.1";
        sha256 = "07wrbj88gwdbsczjr225g0z1ai1v13mdg71gl9qsmipqs0s0pfwc";
-       buildDepends = [ base mtl process stm unix ];
-       testDepends = [ base QuickCheck stm ];
+       libraryHaskellDepends = [ base mtl process stm unix ];
+       testHaskellDepends = [ base QuickCheck stm ];
        homepage = "http://www.github.com/danr/stm-promise";
        description = "Simple STM Promises for IO computations and external processes";
        license = stdenv.lib.licenses.gpl3;
@@ -121631,7 +124706,7 @@ self: {
        pname = "stm-queue-extras";
        version = "0.2.0.0.1";
        sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100";
-       buildDepends = [ base stm stm-chans ];
+       libraryHaskellDepends = [ base stm stm-chans ];
        description = "Extra queue utilities for STM";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -121642,7 +124717,7 @@ self: {
        pname = "stm-sbchan";
        version = "0.1";
        sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s";
-       buildDepends = [ base stm stm-tlist ];
+       libraryHaskellDepends = [ base stm stm-tlist ];
        homepage = "https://github.com/joeyadams/haskell-stm-sbchan";
        description = "Bounded channel for STM where item sizes can vary";
        license = stdenv.lib.licenses.bsd3;
@@ -121654,7 +124729,7 @@ self: {
        pname = "stm-split";
        version = "0.0.0.1";
        sha256 = "05338nbfhwmyy8njynznmbv0lddqs4kzs5x132992xq346dvvww8";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "TMVars, TVars and TChans with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121665,7 +124740,9 @@ self: {
        pname = "stm-stats";
        version = "0.2.0.0";
        sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa";
-       buildDepends = [ base containers stm template-haskell time ];
+       libraryHaskellDepends = [
+         base containers stm template-haskell time
+       ];
        description = "retry statistics for STM transactions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121676,7 +124753,7 @@ self: {
        pname = "stm-tlist";
        version = "0.1.1";
        sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/joeyadams/haskell-stm-tlist";
        description = "Mutable, singly-linked list in STM";
        license = stdenv.lib.licenses.bsd3;
@@ -121688,7 +124765,7 @@ self: {
        pname = "stmcontrol";
        version = "0.1";
        sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24";
-       buildDepends = [ base haskell98 mtl stm ];
+       libraryHaskellDepends = [ base haskell98 mtl stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html";
        description = "Control communication among retrying transactions";
        license = stdenv.lib.licenses.bsd3;
@@ -121703,7 +124780,7 @@ self: {
        pname = "stomp-conduit";
        version = "0.1.0";
        sha256 = "1qzr5fkffs96clxkvm7lf7kfafijv8fsri6k0j85wrarx3qdgapa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit mime mtl resourcet stomp-queue stompl
        ];
        homepage = "http://github.com/toschoo/mom";
@@ -121719,7 +124796,7 @@ self: {
        pname = "stomp-patterns";
        version = "0.1.0";
        sha256 = "0rdk9h7blj7j5kiwy7zq2kb4wxxs19xk3lg73c0srrvbclb0qgbw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mime mtl split stomp-queue stompl time
        ];
        homepage = "http://github.com/toschoo/mom";
@@ -121736,7 +124813,7 @@ self: {
        pname = "stomp-queue";
        version = "0.2.2";
        sha256 = "1kymwwj7yjdsyykqdqcnvgphbb1ypx7hi5a2wvx1wzv53lrspa9c";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra mime mtl
          network-conduit-tls split stompl time utf8-string
        ];
@@ -121753,7 +124830,7 @@ self: {
        pname = "stompl";
        version = "0.3.0";
        sha256 = "1ip50w8f26362h1s3kb0qzv15dq264j0vbmqw5v0s40gbwmpv2aj";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring mime split text utf8-string
        ];
        homepage = "http://github.com/toschoo/mom";
@@ -121767,7 +124844,7 @@ self: {
        pname = "storable";
        version = "0.1";
        sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://anna.fi.muni.cz/~xjanous3/gitweb/?p=storable.git;a=summary";
        description = "Storable type class for variable-sized data";
        license = stdenv.lib.licenses.bsd3;
@@ -121779,7 +124856,7 @@ self: {
        pname = "storable-complex";
        version = "0.2.2";
        sha256 = "01kwwkpbfjrv26vj83cd92px5qbq1bpgxj0r45534aksqhany1xb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/cartazio/storable-complex";
        description = "Storable instance for Complex";
        license = stdenv.lib.licenses.bsd3;
@@ -121791,7 +124868,7 @@ self: {
        pname = "storable-endian";
        version = "0.2.5";
        sha256 = "04j1nk0wga4dqrqvhm8yd9h9194db1n3yrnhg8s3gsc0jk7yw1p2";
-       buildDepends = [ base byteorder ];
+       libraryHaskellDepends = [ base byteorder ];
        description = "Storable instances with endianness";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121804,7 +124881,7 @@ self: {
        sha256 = "1mv2s4r7dqkl2fy0wjnywyr2zi2g53nkn0z72mgr8drkzdszzxx1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base transformers utility-ht ];
+       libraryHaskellDepends = [ base transformers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/storable-record/";
        description = "Elegant definition of Storable instances for records";
        license = stdenv.lib.licenses.bsd3;
@@ -121816,7 +124893,7 @@ self: {
        pname = "storable-static-array";
        version = "0.6.1.0";
        sha256 = "0akdh6v2cdq38jw8v69bn3m50g6wxanh0plikq4hj5mfrkg6xsxm";
-       buildDepends = [ array base tagged vector ];
+       libraryHaskellDepends = [ array base tagged vector ];
        jailbreak = true;
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
        license = stdenv.lib.licenses.bsd3;
@@ -121829,7 +124906,7 @@ self: {
        pname = "storable-tuple";
        version = "0.0.2";
        sha256 = "03qls46rwc3za730r6pv63rrnjq4vkh3h2vjhx9082dqa9q7vqqd";
-       buildDepends = [ base storable-record utility-ht ];
+       libraryHaskellDepends = [ base storable-record utility-ht ];
        homepage = "http://code.haskell.org/~thielema/storable-tuple/";
        description = "Storable instance for pairs and triples";
        license = stdenv.lib.licenses.bsd3;
@@ -121843,10 +124920,12 @@ self: {
        pname = "storablevector";
        version = "0.2.10";
        sha256 = "0195j9b0p5217jdai4lwyhfwihnxgsqxcbzpa375wsa66kxjk7bl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base non-negative QuickCheck syb transformers unsafe utility-ht
        ];
-       testDepends = [ base bytestring QuickCheck random utility-ht ];
+       testHaskellDepends = [
+         base bytestring QuickCheck random utility-ht
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
@@ -121860,7 +124939,7 @@ self: {
        pname = "storablevector-carray";
        version = "0.0";
        sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i";
-       buildDepends = [ base carray storablevector utility-ht ];
+       libraryHaskellDepends = [ base carray storablevector utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and carray";
        license = stdenv.lib.licenses.bsd3;
@@ -121877,9 +124956,11 @@ self: {
        sha256 = "1qgnakr01f28iarq1qd5x86919fj7zwf19nb80w7757l0dhdjb6m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring old-time storablevector stream-fusion
-         utility-ht
+       libraryHaskellDepends = [
+         base storablevector stream-fusion utility-ht
+       ];
+       executableHaskellDepends = [
+         base binary bytestring old-time stream-fusion
        ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
@@ -121896,7 +124977,7 @@ self: {
        pname = "str";
        version = "0.1.0.0";
        sha256 = "093bgzjj183g48gapmjvbrbp7ns7wfcf94ishgwy84gajpkyb6sr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring Crypto hashable MissingH text
          utf8-string
        ];
@@ -121917,7 +124998,7 @@ self: {
        sha256 = "02m8znx5spg8mjphbqw4kw5mavjki8hjfqf6x9j9i0xsja88958p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson async base bytestring bytestring-builder cmdargs connection
          containers curl curl-aeson network stm text time
          unordered-containers vector
@@ -121932,7 +125013,7 @@ self: {
        pname = "stream-fusion";
        version = "0.1.2.5";
        sha256 = "006fz03jdwd9d0kwf8ma3077xxmg6zym94pwbb4sx1xcn7zf4yc6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://hackage.haskell.org/trac/ghc/ticket/915";
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
@@ -121947,7 +125028,7 @@ self: {
        sha256 = "0311j6a378pm26g9qqfjpnjq7909qj69fhiw253ln603z5q5gkc6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base logict ];
+       libraryHaskellDepends = [ base logict ];
        jailbreak = true;
        homepage = "http://github.com/sebfisch/stream-monad";
        description = "Simple, Fair and Terminating Backtracking Monad";
@@ -121963,7 +125044,7 @@ self: {
        pname = "streamed";
        version = "0.2";
        sha256 = "0dql0vxw28nr60979zhhc9frwqhg6cmj8g03r4m8zlb6anqwv7xa";
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core alsa-seq base containers data-accessor
          data-accessor-transformers event-list midi midi-alsa non-negative
          random transformers utility-ht
@@ -121984,11 +125065,11 @@ self: {
        pname = "streaming-commons";
        version = "0.1.12.1";
        sha256 = "1msg18bvz1cxfh745m3jgxf65x7jncqwwpfi538x24qsn788vgfm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base blaze-builder bytestring directory network process
          random stm text transformers unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array async base blaze-builder bytestring deepseq hspec network
          QuickCheck text unix zlib
        ];
@@ -122005,8 +125086,8 @@ self: {
        pname = "streaming-histogram";
        version = "0.1.0.0";
        sha256 = "1sm05hx5llab6ng6d27rz44kd6njk85axkn3bs3nm03pr85c9xq7";
-       buildDepends = [ base containers criterion ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers criterion ];
+       testHaskellDepends = [
          base containers tasty tasty-hunit tasty-quickcheck
        ];
        license = stdenv.lib.licenses.asl20;
@@ -122018,7 +125099,7 @@ self: {
        pname = "streamproc";
        version = "1.6.2";
        sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/peti/streamproc";
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
@@ -122032,13 +125113,12 @@ self: {
        pname = "streams";
        version = "3.2.1";
        sha256 = "1xyrsb55dg7v3pris0hc0yqdlqaymxb6g286wrbc7h2lva5wrva4";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base comonad distributive semigroupoids semigroups
        ];
        homepage = "http://github.com/ekmett/streams/issues";
        description = "Various Haskell 2010 stream comonads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict" = callPackage
@@ -122047,7 +125127,7 @@ self: {
        pname = "strict";
        version = "0.3.2";
        sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html";
        description = "Strict data types and String IO";
        license = stdenv.lib.licenses.bsd3;
@@ -122061,7 +125141,7 @@ self: {
        pname = "strict-base-types";
        version = "0.3.0";
        sha256 = "03z38yxig43qq4xw9hinzzfarzy7176s5gfv8rsjnild8sa0bsvb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors binary deepseq ghc-prim lens QuickCheck
          strict
        ];
@@ -122075,10 +125155,10 @@ self: {
      mkDerivation {
        pname = "strict-concurrency";
        version = "0.2.4.1";
-       revision = "1";
        sha256 = "128sbh5fnv02v2xdjlk7cb525bfckqyj7fyz5399nfycs0nj2f89";
+       revision = "1";
        editedCabalFile = "e9b8d4599f2eae037bb3b6008284513dbb50af7d3ab42e617b76577bdea656a1";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/strict-concurrency";
        description = "Strict concurrency abstractions";
@@ -122092,7 +125172,7 @@ self: {
        pname = "strict-ghc-plugin";
        version = "0.1.1";
        sha256 = "0hx1zp99npwdp5w3q93xfidcw59lxskilmbqc80xi97d4w4h8jrb";
-       buildDepends = [ base ghc syb ];
+       libraryHaskellDepends = [ base ghc syb ];
        homepage = "http://thoughtpolice.github.com/strict-ghc-plugin";
        description = "Compiler plugin for making Haskell strict";
        license = stdenv.lib.licenses.bsd3;
@@ -122104,7 +125184,7 @@ self: {
        pname = "strict-identity";
        version = "0.1.0.0";
        sha256 = "1fzcim7baycdb60z5icdw5flj1a3dfn6xscpyif6l94c1538g3i1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/cartazio/strict-identity";
        description = "Strict Identity Monad, handy for writing fast code!";
@@ -122117,7 +125197,7 @@ self: {
        pname = "strict-io";
        version = "0.2.1";
        sha256 = "003pfzjixa04qyx4db0rgk7y72nk2xwlb29aigmdmfn80xbmw9md";
-       buildDepends = [ base deepseq extensible-exceptions ];
+       libraryHaskellDepends = [ base deepseq extensible-exceptions ];
        jailbreak = true;
        description = "A library wrapping standard IO modules to provide strict IO";
        license = stdenv.lib.licenses.bsd3;
@@ -122131,7 +125211,9 @@ self: {
        sha256 = "0z28ifg21xgzh75ird41mp40a4rrc5p0wrnbhrxv92ih6pf5zmah";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process unix ];
+       executableHaskellDepends = [
+         base directory filepath process unix
+       ];
        description = "Find a local optimum of strictness annotations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122142,7 +125224,7 @@ self: {
        pname = "strictly";
        version = "1.0.0.0";
        sha256 = "1a3azrg9ksb4kmbckjqw3krxj0app6q19ighd6k3z7xpf682qx3c";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        jailbreak = true;
        homepage = "https://github.com/DanBurton/strictly#readme";
        description = "Combinators for strictifying functions";
@@ -122166,7 +125248,7 @@ self: {
        pname = "string-class";
        version = "0.1.6.4";
        sha256 = "0hh2xcbf7sjsv15jgldpy5njjvkkkxwlg2g9961z9fn94zyi7854";
-       buildDepends = [ base bytestring tagged text ];
+       libraryHaskellDepends = [ base bytestring tagged text ];
        jailbreak = true;
        homepage = "https://github.com/bairyn/string-class";
        description = "String class library";
@@ -122179,7 +125261,7 @@ self: {
        pname = "string-combinators";
        version = "0.6.0.5";
        sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/basvandijk/string-combinators";
        description = "Polymorphic functions to build and combine stringlike values";
        license = stdenv.lib.licenses.bsd3;
@@ -122191,7 +125273,7 @@ self: {
        pname = "string-conv";
        version = "0.1";
        sha256 = "0zjmlkjmdiqnfnb9qqam6bkipwqz5iwy4bjy9xcs20ljf01586l6";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        description = "Standardized conversion between string types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122202,7 +125284,7 @@ self: {
        pname = "string-conversions";
        version = "0.4";
        sha256 = "1bi4mjnz0srb01n0k73asizp5h2ir7j3whxai9wprqvz7kdscr0s";
-       buildDepends = [ base bytestring text utf8-string ];
+       libraryHaskellDepends = [ base bytestring text utf8-string ];
        description = "Simplifies dealing with different types for strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122213,7 +125295,7 @@ self: {
        pname = "string-convert";
        version = "2.0.1";
        sha256 = "0lx9bc7czwzbf8rky8k02kgi6w3pjfz6ydig9i9ll83zy70l9208";
-       buildDepends = [ base bytestring text utf8-string ];
+       libraryHaskellDepends = [ base bytestring text utf8-string ];
        homepage = "https://bitbucket.org/tdammers/string-convert";
        description = "Provide universal string conversions between any two string-like types";
        license = stdenv.lib.licenses.bsd3;
@@ -122225,7 +125307,7 @@ self: {
        pname = "string-qq";
        version = "0.0.2";
        sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -122236,7 +125318,7 @@ self: {
        pname = "string-quote";
        version = "0.0.1";
        sha256 = "1pfkd3lwdphvl00gly7zbpvsmlw6b2d5568rxyqmq2qw6vzf9134";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122247,8 +125329,8 @@ self: {
        pname = "string-similarity";
        version = "0.1.0.0";
        sha256 = "0k03krg3m03bxk9i5ph5ipks9b0j8yqsal0haf8fyjq83xs1hbmv";
-       buildDepends = [ base suffixtree ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base suffixtree ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "http://github.com/mwotton/string-similarity";
        description = "longest common substring";
        license = stdenv.lib.licenses.bsd3;
@@ -122260,7 +125342,7 @@ self: {
        pname = "stringable";
        version = "0.1.3";
        sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7";
-       buildDepends = [ base bytestring system-filepath text ];
+       libraryHaskellDepends = [ base bytestring system-filepath text ];
        description = "A Stringable type class, in the spirit of Foldable and Traversable";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122271,8 +125353,8 @@ self: {
        pname = "stringbuilder";
        version = "0.5.0";
        sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9";
-       buildDepends = [ base ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        description = "A writer monad for multi-line string literals";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122285,8 +125367,8 @@ self: {
        pname = "stringlike";
        version = "0.0.0";
        sha256 = "0wrhma5g73lnyazbb11z2xhd7fdz93mb1kgbqxjn1prhlc3j7ahy";
-       buildDepends = [ base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
          base bytestring QuickCheck quickcheck-instances test-framework
          test-framework-quickcheck2 text
        ];
@@ -122305,8 +125387,8 @@ self: {
        pname = "stringprep";
        version = "1.0.0";
        sha256 = "0ha4cvzdppd514xh9315v3nvrn1q4xd74gifdqpszw98hj2mw0b0";
-       buildDepends = [ base containers text text-icu ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers text text-icu ];
+       testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th text
          text-icu
        ];
@@ -122320,7 +125402,7 @@ self: {
        pname = "strings";
        version = "1.1";
        sha256 = "1xz9v3w5s13yhk7iy9dw6i8s2jc6c0b1ci96dwmcq9a1n3l3ng4v";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "http://hub.darcs.net/scravy/strings";
        description = "Functions for working with strings, including Text, ByteString, etc";
        license = stdenv.lib.licenses.mit;
@@ -122332,7 +125414,7 @@ self: {
        pname = "stringsearch";
        version = "0.3.6.6";
        sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9";
-       buildDepends = [ array base bytestring containers ];
+       libraryHaskellDepends = [ array base bytestring containers ];
        homepage = "https://bitbucket.org/dafis/stringsearch";
        description = "Fast searching, splitting and replacing of ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -122344,7 +125426,7 @@ self: {
        pname = "stringtable-atom";
        version = "0.0.7";
        sha256 = "1wp6w12bflrqcwi09y7s1crj72n4pbj8bkpwj2ia5gaqn5x56wjs";
-       buildDepends = [ base binary bytestring containers syb ];
+       libraryHaskellDepends = [ base binary bytestring containers syb ];
        homepage = "http://github.com/audreyt/stringtable-atom/";
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
        license = stdenv.lib.licenses.bsd3;
@@ -122358,7 +125440,7 @@ self: {
        pname = "stripe";
        version = "0.8.3";
        sha256 = "1lqz116lvj2444sf2j58dg1nkjwaxm9abrizp1zqkmixbl7ykaqh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types mtl text time
          unordered-containers utf8-string
        ];
@@ -122377,18 +125459,17 @@ self: {
        pname = "stripe-haskell";
        version = "0.1.4.1";
        sha256 = "066jcinjg430p4mwy1wdc5pkp3y43isv3z70w2lqdsyl2q3cgzx0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring either HsOpenSSL hspec http-streams
          io-streams mtl random text time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring either HsOpenSSL hspec http-streams random
          text time transformers
        ];
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strive" = callPackage
@@ -122400,15 +125481,14 @@ self: {
        pname = "strive";
        version = "2.1.0";
        sha256 = "08jirx24wnfpknlgkcz605sn9nwb0g5hv75vgrms5gbq65gkg9s2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default gpolyline http-conduit
          http-types template-haskell text time transformers
        ];
-       testDepends = [ base bytestring hlint markdown-unlit time ];
+       testHaskellDepends = [ base bytestring hlint markdown-unlit time ];
        homepage = "http://taylor.fausak.me/strive/";
        description = "A Haskell client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -122417,7 +125497,7 @@ self: {
        pname = "strptime";
        version = "1.0.10";
        sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd";
-       buildDepends = [ base bytestring text time ];
+       libraryHaskellDepends = [ base bytestring text time ];
        description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122431,20 +125511,21 @@ self: {
        pname = "structural-induction";
        version = "0.3";
        sha256 = "1wykd33phjmz2aky2dynsxmrmxqpkh4h41majq57lh3dag87cwax";
-       buildDepends = [ base containers genifunctors mtl pretty safe ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers genifunctors mtl pretty safe
+       ];
+       testHaskellDepends = [
          base geniplate language-haskell-extract mtl pretty QuickCheck safe
          testing-feat
        ];
        homepage = "http://www.github.com/danr/structural-induction";
        description = "Instantiate structural induction schemas for algebraic data types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "structured-haskell-mode" = callPackage
-    ({ mkDerivation, applicative-quoters, base, descriptive, emacs
-     , ghc-prim, haskell-src-exts, text
+    ({ mkDerivation, applicative-quoters, base, descriptive, ghc-prim
+     , haskell-src-exts, text
      }:
      mkDerivation {
        pname = "structured-haskell-mode";
@@ -122452,19 +125533,13 @@ self: {
        sha256 = "1pcy83ic95l7k3839py4m10zlx4s4pk4n3bsx3mb7n8rp8zngcv2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          applicative-quoters base descriptive ghc-prim haskell-src-exts text
        ];
-       buildTools = [ emacs ];
-       postInstall = ''
-         emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el
-         install -d $out/share/emacs/site-lisp
-         install "elisp/"*.el "elisp/"*.elc  $out/share/emacs/site-lisp
-       '';
        homepage = "https://github.com/chrisdone/structured-haskell-mode";
        description = "Structured editing Emacs mode for Haskell";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) emacs;};
+     }) {};
 
   "structured-mongoDB" = callPackage
     ({ mkDerivation, array, base, bson, bytestring, compact-string-fix
@@ -122475,7 +125550,7 @@ self: {
        pname = "structured-mongoDB";
        version = "0.3";
        sha256 = "0f4s4zi6h53jhcj3f43a2arra02fk1i2almdm6x2mjy1mzhdkjdx";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bson bytestring compact-string-fix containers
          monad-control mongoDB mtl old-time template-haskell transformers
          transformers-base
@@ -122498,12 +125573,12 @@ self: {
        pname = "structures";
        version = "0.2";
        sha256 = "000misbp9fsnmzhqi7na9b56h45c18ac86j7gfaxv7fgqz82zis8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers contravariant deepseq free ghc ghc-prim hashable
          hybrid-vectors lens monad-st parallel primitive semigroups
          transformers vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath hlint
          QuickCheck semigroups tasty tasty-quickcheck tasty-th
          unordered-containers
@@ -122525,11 +125600,11 @@ self: {
        pname = "stunclient";
        version = "0.1.0.1";
        sha256 = "0i9sbicwx6d3vsp2fxjr31msd1n5nqh1vxb2hn4in5n8y6d32qlx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal crypto-api cryptohash cryptohash-cryptoapi
          digest network random stringprep text transformers unbounded-delays
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal digest network QuickCheck random
          test-framework test-framework-quickcheck2 text transformers
          unbounded-delays
@@ -122549,7 +125624,7 @@ self: {
        sha256 = "075rbdhlrz88qkwx54jrmb4h4jq8q5wk4ncb858llaswcbsfgl8w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bullet bytestring containers directory elerea GLFW-b
          lambdacube-bullet lambdacube-engine mtl random vector
        ];
@@ -122570,11 +125645,15 @@ self: {
        sha256 = "055kvwf158m91kx2y3ysiqpjgf15w6r8ryzm4yj0jhy48ymgil5j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
          aeson base bytestring cmdargs containers directory filepath
          haskell-src-exts mtl strict syb yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring cmdargs containers directory filepath
          haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
          yaml
@@ -122590,7 +125669,7 @@ self: {
        pname = "stylized";
        version = "0.1.3";
        sha256 = "09gacqlq3vlnsnbjjr44pjypw9v3amg8sqsxg0xwl8ricxpww774";
-       buildDepends = [ ansi-terminal base ];
+       libraryHaskellDepends = [ ansi-terminal base ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/lucid/Stylized";
        description = "Ways to output stylized text on ANSI consoles";
@@ -122608,13 +125687,15 @@ self: {
        pname = "subhask";
        version = "0.1.0.1";
        sha256 = "17r26mccarr9m7wxvax3bmwz94gcaxg732797js1qa12fdnbsn8m";
-       buildDepends = [
+       libraryHaskellDepends = [
          approximate base bloomfilter bytes bytestring cassava containers
          deepseq erf gamma ghc-prim hmatrix hyperloglog lens monad-primitive
          MonadRandom mtl parallel pipes primitive QuickCheck semigroups
          template-haskell vector
        ];
-       testDepends = [ base test-framework test-framework-quickcheck2 ];
+       testHaskellDepends = [
+         base test-framework test-framework-quickcheck2
+       ];
        jailbreak = true;
        homepage = "http://github.com/mikeizbicki/subhask";
        description = "Type safe interface for programming in subcategories of Hask";
@@ -122628,7 +125709,7 @@ self: {
        pname = "subnet";
        version = "0.0.1.2";
        sha256 = "199kslgxlhxv8zx3mj5pxgicjxyff7vzjhw13fwfxcf9pa9289nv";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/gcganley/subnet";
        description = "subnetting calculator";
        license = stdenv.lib.licenses.mit;
@@ -122640,7 +125721,7 @@ self: {
        pname = "subtitleParser";
        version = "0.5";
        sha256 = "1kkr6zbnv777gnv2lwq3pyxq3vv5r24f4avwv5g4dds3y8d8mv3q";
-       buildDepends = [ attoparsec base containers text ];
+       libraryHaskellDepends = [ attoparsec base containers text ];
        homepage = "https://patch-tag.com/r/rubenAst/subtitleParser/home";
        description = "A parser for .srt and .sub files";
        license = stdenv.lib.licenses.bsd3;
@@ -122654,7 +125735,7 @@ self: {
        sha256 = "0pvcwwz6i4mpmir0s2xnjy27j2cnbi4l9lxhlmxcsw4yz4spdgcl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base split ];
+       executableHaskellDepends = [ base split ];
        description = "Modify SRT subtitle files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122667,7 +125748,8 @@ self: {
        sha256 = "0wa2yfz5y90dq9mf3xyl7126rvjldnaa32gmg253bfv6hjvk4hhp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HUnit vector ];
+       libraryHaskellDepends = [ base vector ];
+       executableHaskellDepends = [ base HUnit ];
        jailbreak = true;
        homepage = "https://github.com/VictorDenisov/suffixarray";
        description = "n log n implementation of suffix array";
@@ -122680,7 +125762,7 @@ self: {
        pname = "suffixtree";
        version = "0.2.2.1";
        sha256 = "1ddk2hp27al9jzcgkrhv7v1i7knci4l22flkgb2r94h96z5nhfq6";
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        homepage = "https://github.com/bos/suffixtree";
        description = "Efficient, lazy suffix tree implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -122694,7 +125776,7 @@ self: {
        sha256 = "1hlzckm5c1dih79nmwy2gk4fjnn4kxzp3pk0adfyhldapkq6wpmq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        homepage = "http://sugarj.org";
        description = "Library-based syntactic extensibility for Haskell";
        license = "GPL";
@@ -122706,7 +125788,7 @@ self: {
        pname = "suitable";
        version = "0.1.1";
        sha256 = "1pvw7zgvfr0z2gjy224gd92ayh20j3v97rdlqmq6k6g4yabdpgci";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122718,7 +125800,7 @@ self: {
        pname = "sundown";
        version = "0.6";
        sha256 = "09xh3pbyarflfjk17bn2isgpmsq49d6gmq7z918kf4c32fc7x6yb";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/bitonic/sundown";
        description = "Bindings to the sundown markdown library";
        license = stdenv.lib.licenses.publicDomain;
@@ -122732,7 +125814,7 @@ self: {
        pname = "sunlight";
        version = "0.6.0.0";
        sha256 = "1q90fxv40jz5ngh6xi1n6xjx6hh1as223wjjhchk6k0y0frdg55x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal directory old-locale process random time
          tuple
        ];
@@ -122752,7 +125834,7 @@ self: {
        pname = "sunroof-compiler";
        version = "0.2";
        sha256 = "1r03aw55s4vnpbfk0n39li0aai3wvm209pqdimfkkk3kkan648cz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean containers data-default data-reify mtl operational
          semigroups tagged template-haskell transformers vector-space
        ];
@@ -122774,7 +125856,7 @@ self: {
        sha256 = "0bcxai3gq1akbcxqkkj0n52a43zqcnw865bnngy9b4z26b43kj5k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Boolean containers data-default directory filepath parallel-io
          process QuickCheck random semigroups shake stm sunroof-compiler
          sunroof-server
@@ -122797,7 +125879,7 @@ self: {
        pname = "sunroof-server";
        version = "0.2.1";
        sha256 = "11acyb846wga6g6zcvlaffh299qn0l8jic8syg76cchm3l3348d5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers data-default filepath kansas-comet scientific
          scotty semigroups stm sunroof-compiler tagged text time
          transformers unordered-containers vector vector-space
@@ -122820,7 +125902,7 @@ self: {
        sha256 = "1v8nqcfdn2dasiv24lny73bc0xz2d26wvvybhxw6s7dz4bkb9kiw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hosc hsc3 opensoundcontrol-ht process random transformers
        ];
        homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
@@ -122840,7 +125922,7 @@ self: {
        sha256 = "1m3h6d49bjwhldbf4khyp6p8k4vr05m5392nk3d33x3d9pfhl20k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          alsa-seq array base containers data-accessor
          data-accessor-transformers event-list hosc hsc3 midi midi-alsa
          non-negative opensoundcontrol-ht random supercollider-ht
@@ -122861,7 +125943,12 @@ self: {
        sha256 = "1fjy25fm7hz495dnxl9jw0asfhl23ykyax1w4q4yvkpmx8ars9wd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal containers directory filepath ];
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath
+       ];
+       executableHaskellDepends = [
+         base Cabal containers directory filepath
+       ];
        jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/superdoc/";
        description = "Additional documentation markup and Unicode support";
@@ -122879,7 +125966,7 @@ self: {
        sha256 = "0jnip7wahy4z1jiablqzvmbk40as1ala65m7da7gsp0xvf2q7hwf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers cpphs directory filepath haskell-src-exts mtl
          process time uniplate
        ];
@@ -122896,7 +125983,9 @@ self: {
        pname = "supervisor";
        version = "0.1.1.0";
        sha256 = "1gdgqm89ig236hkrz8sjgy3shqnl961401qgavs4qpqw7r2xk8vx";
-       buildDepends = [ base containers exceptions monadloc mtl ];
+       libraryHaskellDepends = [
+         base containers exceptions monadloc mtl
+       ];
        homepage = "http://github.com/agocorona/supervisor";
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
@@ -122909,7 +125998,7 @@ self: {
        pname = "suspend";
        version = "0.2.0.0";
        sha256 = "0wphk3dabba6rgd9lkxbsmq5vivvyy6b4jfxfndqb53yhdj5nkrg";
-       buildDepends = [ base lifted-base transformers-base ];
+       libraryHaskellDepends = [ base lifted-base transformers-base ];
        description = "Simple package that allows for long thread suspensions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122923,7 +126012,7 @@ self: {
        pname = "svg-tree";
        version = "0.3.1";
        sha256 = "1fnj7d2nw4p9m46wp64gz99ssggxd0rz4737732hpk9vr5xq78lc";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
        ];
@@ -122941,7 +126030,7 @@ self: {
        sha256 = "0bkhh1klwp3lgsx0s62bpdhsw9sa1cdw8gjijj9npnygznbi7jhj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base haskell98 language-c pretty svgutils syb xml
        ];
        jailbreak = true;
@@ -122959,9 +126048,9 @@ self: {
        pname = "svgcairo";
        version = "0.13.0.3";
        sha256 = "0jbcz46n5324vf9i05y8zdjp4ayid2frggsadm5nr8h9mnd4vncz";
-       buildDepends = [ base cairo glib mtl text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ librsvg ];
+       libraryHaskellDepends = [ base cairo glib mtl text ];
+       libraryPkgconfigDepends = [ librsvg ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
@@ -122975,7 +126064,8 @@ self: {
        sha256 = "131mic1c09adcphry7153bviiib59avxrd7dgwny0vdmw23cgfs1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath xml ];
+       libraryHaskellDepends = [ base xml ];
+       executableHaskellDepends = [ base filepath xml ];
        jailbreak = true;
        homepage = "https://patch-tag.com/r/twistedsquare/svgutils/home";
        description = "Helper functions for dealing with SVG files";
@@ -122988,7 +126078,7 @@ self: {
        pname = "svm";
        version = "1.0.0.1";
        sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://github.com/andrewdougherty/svm";
        description = "A support vector machine written in Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -123000,7 +126090,7 @@ self: {
        pname = "svm-light-utils";
        version = "0.1.2";
        sha256 = "1p2rnx045zw9qqd88m5ldx5p3xmbsi6rkdh1bfk6ab1a0krjiifa";
-       buildDepends = [ attoparsec base bytestring containers ];
+       libraryHaskellDepends = [ attoparsec base bytestring containers ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/svm-light-utils";
        description = "Parsers and formatters for the SVMlight input file format";
@@ -123015,7 +126105,7 @@ self: {
        pname = "svm-simple";
        version = "0.2.7.1";
        sha256 = "07s9mly01ar6c3p4fdl7wsi5j4bziagjjlbssr7x6s3ab5r8k9vd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bindings-svm bytestring containers deepseq directory
          monad-par mwc-random vector
        ];
@@ -123034,10 +126124,10 @@ self: {
        pname = "svndump";
        version = "0.4.5";
        sha256 = "0m6agn9riamsadf13w1g6i0nx59xl812112xdkqh0zl34rf5hkwp";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers filepath old-locale text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring directory doctest filepath zlib
        ];
        homepage = "http://github.com/jwiegley/svndump/";
@@ -123054,8 +126144,10 @@ self: {
        pname = "swagger";
        version = "0.2.2";
        sha256 = "1hpc569n34kr1nkrwlx76pc0yp9icr8j5cxliwjqffnh7x2czzqr";
-       buildDepends = [ aeson base bytestring text time transformers ];
-       testDepends = [ aeson base bytestring tasty tasty-hunit ];
+       libraryHaskellDepends = [
+         aeson base bytestring text time transformers
+       ];
+       testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
        description = "Implementation of swagger data model";
        license = "unknown";
      }) {};
@@ -123068,11 +126160,11 @@ self: {
        pname = "swapper";
        version = "0.1";
        sha256 = "0a9g6cv7pvwna11cz1xc274rs0dgyhb84hqqdg5zyga7kkx0i06l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq happstack-data happstack-state
          parallel
        ];
-       extraLibraries = [ tokyocabinet ];
+       librarySystemDepends = [ tokyocabinet ];
        homepage = "http://github.com/roman-smrz/swapper/";
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
@@ -123090,7 +126182,7 @@ self: {
        sha256 = "0g3xq3abwkv6rs7kvv6niwdhx50c90ys1zrrzspx2g47c9fbs2iq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base containers fixplate mtl pretty random
          random-shuffle readline system-fileio system-filepath text
        ];
@@ -123107,7 +126199,7 @@ self: {
        pname = "swf";
        version = "1.0.1";
        sha256 = "1jx5941kb97w4zpgz7m1r2x2lxllmi1i9a9nmwflinyj74xxg1rl";
-       buildDepends = [ base mtl pretty ];
+       libraryHaskellDepends = [ base mtl pretty ];
        homepage = "http://www.n-heptane.com/nhlab";
        description = "A library for creating Shockwave Flash (SWF) files";
        license = stdenv.lib.licenses.bsd3;
@@ -123122,7 +126214,7 @@ self: {
        pname = "swift-lda";
        version = "0.7.0.0";
        sha256 = "0cjvj7v8kjabv6a146hwgyk8k6b4z7gz4yrhz3d0nxa86ilvjl9q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ghc-prim mwc-random primitive vector
        ];
        homepage = "https://bitbucket.org/gchrupala/colada";
@@ -123142,11 +126234,12 @@ self: {
        sha256 = "07h5677d1liap81z3gvjab5yjib2vbmzvhfzqqmkjg7grk1dblld";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath hashable intern mtl network-uri
          old-locale polyparse semigroups text time
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base containers hashable HUnit network-uri old-locale semigroups
          test-framework test-framework-hunit text time
        ];
@@ -123167,7 +126260,7 @@ self: {
        sha256 = "0anl5h5lwc6b7whkg83ziyizq5w2mlcpv0akcl0ahgjl4mxnmiwd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          asn1-encoding asn1-types base bytestring crypto-pubkey
          crypto-random directory filepath hourglass http-types network pem
          resourcet transformers wai wai-extra wai-middleware-static warp
@@ -123185,8 +126278,8 @@ self: {
        pname = "syb";
        version = "0.5.1";
        sha256 = "0iiqz5mamk1nsij99rypms7dhx5flm2n02k1x6miqgnhg075zc41";
-       buildDepends = [ base ];
-       testDepends = [ base containers HUnit mtl ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers HUnit mtl ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
        description = "Scrap Your Boilerplate";
        license = stdenv.lib.licenses.bsd3;
@@ -123198,7 +126291,7 @@ self: {
        pname = "syb-extras";
        version = "0.3";
        sha256 = "1l1637kf1f7n5nvcp2hv516qah7baykh5w2wmil2b909k75iq2x9";
-       buildDepends = [ base eq prelude-extras ];
+       libraryHaskellDepends = [ base eq prelude-extras ];
        homepage = "http://github.com/ekmett/syb-extras/";
        description = "Higher order versions of the Scrap Your Boilerplate classes";
        license = stdenv.lib.licenses.bsd3;
@@ -123212,10 +126305,10 @@ self: {
      mkDerivation {
        pname = "syb-with-class";
        version = "0.6.1.6";
-       revision = "1";
        sha256 = "1c61hig293lxyr2kdri3rp6wkns921fiwwmml9zhrhrrryfr0p2n";
+       revision = "1";
        editedCabalFile = "e894d322dfc9c36c33058bfcbecbe6d36e620556a9713108b008120f7981cd7c";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers template-haskell
        ];
        description = "Scrap Your Boilerplate With Class";
@@ -123228,7 +126321,7 @@ self: {
        pname = "syb-with-class-instances-text";
        version = "0.0.1";
        sha256 = "0vnpqk89nxs0anx62mzasl9wrcscw18vwc284y067ryb086aj2hf";
-       buildDepends = [ base syb-with-class text ];
+       libraryHaskellDepends = [ base syb-with-class text ];
        description = "Scrap Your Boilerplate With Class Text instance";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123245,12 +126338,12 @@ self: {
        sha256 = "1yjvjfkg623kpnzpkknljfgcizyf3jsvkncz49yjsy9j2iklqg2k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo comonad-transformers data-default data-lens
          data-lens-template gtk optparse-applicative parsec transformers
          void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base parsec smallcheck test-framework test-framework-smallcheck
          void
        ];
@@ -123267,7 +126360,9 @@ self: {
        pname = "sym";
        version = "0.11.1";
        sha256 = "140wy1l2y71v70fhl1z4sa5dvasz5f98w2knayhd7lvw15cglmbj";
-       buildDepends = [ array base containers hashable QuickCheck ];
+       libraryHaskellDepends = [
+         array base containers hashable QuickCheck
+       ];
        homepage = "https://github.com/akc/sym";
        description = "Permutations, patterns, and statistics";
        license = stdenv.lib.licenses.bsd3;
@@ -123279,7 +126374,7 @@ self: {
        pname = "sym-plot";
        version = "0.2.0";
        sha256 = "0186i6c3dyvs5pa4fh0b284wgpm10pgwax9prahirnq8whph94p2";
-       buildDepends = [ base diagrams-cairo diagrams-lib sym ];
+       libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        jailbreak = true;
        homepage = "http://github.com/akc/sym-plot";
        description = "Plot permutations; an addition to the sym package";
@@ -123293,7 +126388,7 @@ self: {
        pname = "symbol";
        version = "0.2.4";
        sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A 'Symbol' type for fast symbol comparison";
        license = stdenv.lib.licenses.bsd3;
@@ -123305,7 +126400,7 @@ self: {
        pname = "sync";
        version = "0.1";
        sha256 = "10c2divizmjij5w7x2ky6dzhq6y6wr6qq1pwl7wlhgv663y9yalk";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123323,13 +126418,13 @@ self: {
        sha256 = "1mkrap2qhfhnisz28vb4hjl5fmfi8r48n1igvv4c0qf9nclhfbhd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base base16-bytestring byteable bytestring Cabal cereal
          containers cryptohash directory exceptions filepath io-streams mtl
          process random regex-compat temporary text time transformers unix
          zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base base16-bytestring byteable bytestring Cabal cereal
          containers cryptohash directory exceptions filepath io-streams mtl
          process random regex-compat temporary text time transformers unix
@@ -123339,6 +126434,7 @@ self: {
        homepage = "https://github.com/ekarayel/sync-mht";
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synchronous-channels" = callPackage
@@ -123347,10 +126443,9 @@ self: {
        pname = "synchronous-channels";
        version = "0.2";
        sha256 = "0xzpjq3h3mqdi553v7p6xm3i74nvbhz5igjlhfh6snlmr7p1cdvb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Synchronous communication channels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syncthing-hs" = callPackage
@@ -123365,12 +126460,12 @@ self: {
        pname = "syncthing-hs";
        version = "0.3.0.0";
        sha256 = "0mancdrf3miicjcsrszxgv5bnka9nvbcsynyw4ljn19c2mk2628r";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring connection containers either exceptions
          http-client http-client-tls lens regex-posix text time
          time-locale-compat transformers unordered-containers vector wreq
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers data-default derive either
          exceptions http-client http-types lens quickcheck-instances
          scientific tasty tasty-hunit tasty-quickcheck text transformers
@@ -123379,7 +126474,6 @@ self: {
        homepage = "https://github.com/jetho/syncthing-hs";
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synt" = callPackage
@@ -123392,8 +126486,13 @@ self: {
        sha256 = "12d9ilb81vcm24s8whk2cbq1nxlrzdsr7049962q6b0vkrk64v5v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ argparser base haskell-src-exts regexpr split ];
-       testDepends = [
+       libraryHaskellDepends = [
+         argparser base haskell-src-exts regexpr split
+       ];
+       executableHaskellDepends = [
+         argparser base haskell-src-exts regexpr split
+       ];
+       testHaskellDepends = [
          argparser base haskell-src-exts hpc hspec regexpr split Synt
        ];
        jailbreak = true;
@@ -123413,11 +126512,11 @@ self: {
        pname = "syntactic";
        version = "2.1";
        sha256 = "1r2b11xw235qsv6z6qqssrmgd1wcbr28vmlqs7vlb4h0yhpkd1i3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints containers data-hash deepseq mtl safe tagged
          template-haskell tree-view
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers QuickCheck tagged tasty tasty-golden
          tasty-quickcheck tasty-th utf8-string
        ];
@@ -123432,7 +126531,7 @@ self: {
        pname = "syntactical";
        version = "0.1";
        sha256 = "1sqnmarmdm4mha28h8gbp3jddlig84v7zqn53a29047w3877g3gw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Distfix expression parsing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123444,10 +126543,10 @@ self: {
      mkDerivation {
        pname = "syntax";
        version = "1.0.0.0";
-       revision = "1";
        sha256 = "1dhbzbf1zlpfjhnacqfhzvjznwlzv39c12a3y8ivqhplnkmqsm7x";
+       revision = "1";
        editedCabalFile = "7f3d7f3a8c8aedb78145f4d8a992815cdb644d839a5431b23e5fad0a62d7dd5c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens mono-traversable scientific semi-iso text vector
        ];
        description = "Reversible parsing and pretty-printing";
@@ -123463,7 +126562,7 @@ self: {
        pname = "syntax-attoparsec";
        version = "1.0.0.0";
        sha256 = "1ygikzc7s967bh9yz19r9zd2r1jychlf04cylbigaakrxnnkj4hi";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring scientific semi-iso syntax text vector
        ];
        description = "Syntax instances for Attoparsec";
@@ -123481,7 +126580,7 @@ self: {
        sha256 = "1szfapnlcgr19cipm4q68w7p52sw2hapks63vcnn9qfjnav17ljr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base lens scientific semi-iso syntax syntax-attoparsec
          syntax-printer text
        ];
@@ -123500,7 +126599,7 @@ self: {
        sha256 = "1bgv2y97rk5jr2gkl4d1pm19v3pl1gziz4sxnlv9w539dna0dwim";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base containers lens scientific semi-iso syntax
          syntax-attoparsec syntax-printer text
        ];
@@ -123516,7 +126615,9 @@ self: {
        pname = "syntax-pretty";
        version = "0.2.0.0";
        sha256 = "1dyv0d998lbjndiw05hz9rmiazzz3rvw8hqdx5npb6yjmq237zmf";
-       buildDepends = [ base pretty scientific semi-iso syntax text ];
+       libraryHaskellDepends = [
+         base pretty scientific semi-iso syntax text
+       ];
        description = "Syntax instance for pretty, the pretty printing library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123530,7 +126631,7 @@ self: {
        pname = "syntax-printer";
        version = "1.0.0.0";
        sha256 = "051gkxj9qgrmjp8jl48nb7487y2hd6ymrzjl62k2faa0cfz6sbqz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring scientific semi-iso semigroupoids syntax
          text vector
        ];
@@ -123548,7 +126649,7 @@ self: {
        pname = "syntax-trees";
        version = "0.1.2";
        sha256 = "19lgaiql3d8v6w8dl0a7adrfw63ch5376dz6y4jzndrwzi43p9sb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
        description = "Convert between different Haskell syntax trees";
@@ -123564,7 +126665,7 @@ self: {
        pname = "syntax-trees-fork-bairyn";
        version = "0.1.2.5";
        sha256 = "1n4k8m4zl5phxyrh6s46ijxcba9iljyh7zvhrrzzaw3d00nfvqg6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
        description = "Convert between different Haskell syntax trees. Bairyn's fork.";
@@ -123585,12 +126686,12 @@ self: {
        sha256 = "1n5r7061x8212a8wfv0j9g28l79lxgbymr1f0m1qgzkhqf80gz3d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary bytestring containers directory event-list
-         filepath gnuplot non-negative numeric-prelude numeric-quest
-         old-time process QuickCheck random sox storable-record
-         storablevector transformers utility-ht
+       libraryHaskellDepends = [
+         array base binary bytestring containers event-list filepath gnuplot
+         non-negative numeric-prelude numeric-quest process QuickCheck
+         random sox storable-record storablevector transformers utility-ht
        ];
+       executableHaskellDepends = [ directory old-time ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell";
@@ -123610,7 +126711,7 @@ self: {
        sha256 = "0k4hnhldrqjxz391p45rc125d2v8pbx23qxsvfs4hwra886imny3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa
          non-negative numeric-prelude old-time random sox storablevector
          synthesizer-core synthesizer-dimensional synthesizer-midi
@@ -123634,14 +126735,14 @@ self: {
        pname = "synthesizer-core";
        version = "0.7.1";
        sha256 = "0h3dj4j9ha1db2lw3vd7zai05ivm9lfydaynq2bxqhz77s07skzf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq event-list
          explicit-exception filepath non-empty non-negative numeric-prelude
          numeric-quest process QuickCheck random sample-frame-np sox
          storable-record storable-tuple storablevector stream-fusion
          transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers event-list non-empty non-negative numeric-prelude
          QuickCheck random storable-tuple storablevector utility-ht
        ];
@@ -123662,7 +126763,7 @@ self: {
        sha256 = "1y3jnlzpgs0n42vf5ami98c3nc1kz645spxirdaqn60f3ig4bvzb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring event-list non-negative numeric-prelude random sox
          storable-record storablevector synthesizer-core transformers
          utility-ht
@@ -123683,7 +126784,7 @@ self: {
        sha256 = "07jhdd73vrhlvx6aq6rdd78qk8vfy2jcc9vrdrf8y6ikq6ir99rb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base event-list non-negative numeric-prelude random
          synthesizer-core transformers UniqueLogicNP utility-ht
        ];
@@ -123707,13 +126808,13 @@ self: {
        sha256 = "04mzsdwf8n31nqjlv7ryylx64mvhcfkx6r8jq1yijvnb1pih4vk2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers event-list filepath llvm-extra llvm-tf midi
          non-empty non-negative numeric-prelude random sox storable-record
          storable-tuple storablevector synthesizer-core synthesizer-midi tfp
          transformers unsafe utility-ht vault
        ];
-       testDepends = [
+       testHaskellDepends = [
          base llvm-extra llvm-tf numeric-prelude QuickCheck random
          storablevector synthesizer-core tfp utility-ht
        ];
@@ -123736,7 +126837,7 @@ self: {
        sha256 = "0xsfjgh82nxpwrhpllhjxxzaj42cxb5cbbpgwd1b1bsv67441h2x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq event-list midi non-negative numeric-prelude sox
          storable-record storablevector synthesizer-core
@@ -123755,8 +126856,8 @@ self: {
        pname = "sys-auth-smbclient";
        version = "2.0.0.0";
        sha256 = "00j1ss8xsnd8m0v0p9r9mampbczclzanzcli2qrxcl4j9vkp2mb7";
-       buildDepends = [ base process text ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base process text ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/kkazuo/sys-auth-smbclient";
        description = "Auth with smbclient command";
        license = stdenv.lib.licenses.mit;
@@ -123771,11 +126872,11 @@ self: {
        pname = "sys-process";
        version = "0.1.6";
        sha256 = "04f6mbkc61qx8wjf95kwxhrqhv2qprl2wa73rkgsq8nc18gicf3q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors directory filepath lens mtl notzero process
          semigroupoids semigroups transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/sys-process";
@@ -123789,7 +126890,7 @@ self: {
        pname = "system-argv0";
        version = "0.1.1";
        sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
-       buildDepends = [ base bytestring system-filepath text ];
+       libraryHaskellDepends = [ base bytestring system-filepath text ];
        homepage = "https://john-millikin.com/software/haskell-filesystem/";
        description = "Get argv[0] as a FilePath";
        license = stdenv.lib.licenses.mit;
@@ -123803,10 +126904,10 @@ self: {
        pname = "system-canonicalpath";
        version = "0.3.2.0";
        sha256 = "031m5j7xglxdgp3rkgf2v37jya1a3hhjp3mxbfyyjl27wv7pzhjy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude directory system-filepath text
        ];
-       testDepends = [ base basic-prelude chell system-filepath ];
+       testHaskellDepends = [ base basic-prelude chell system-filepath ];
        homepage = "https://github.com/d12frosted/CanonicalPath";
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
@@ -123821,8 +126922,12 @@ self: {
        pname = "system-command";
        version = "0.0.10";
        sha256 = "11lfr6xm5xpvq4244pc7a0psy2m1krz0b1jd9pdw6kzn5ammi1b2";
-       buildDepends = [ base directory filepath process transformers ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       libraryHaskellDepends = [
+         base directory filepath process transformers
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/system-command";
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
@@ -123836,8 +126941,10 @@ self: {
        pname = "system-fileio";
        version = "0.3.16.3";
        sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i";
-       buildDepends = [ base bytestring system-filepath text time unix ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring system-filepath text time unix
+       ];
+       testHaskellDepends = [
          base bytestring chell system-filepath temporary text time
          transformers unix
        ];
@@ -123854,8 +126961,8 @@ self: {
        pname = "system-filepath";
        version = "0.4.13.4";
        sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l";
-       buildDepends = [ base bytestring deepseq text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq text ];
+       testHaskellDepends = [
          base bytestring chell chell-quickcheck QuickCheck text
        ];
        homepage = "https://github.com/fpco/haskell-filesystem";
@@ -123869,7 +126976,7 @@ self: {
        pname = "system-gpio";
        version = "0.0.2";
        sha256 = "1i718k96xvsfl9rh1x4n5ra88838wd6rzmj3p70bfkxxrsvv1zi4";
-       buildDepends = [ array base ghc-prim ];
+       libraryHaskellDepends = [ array base ghc-prim ];
        homepage = "https://github.com/luzhuomi/system-gpio/";
        description = "GPIO wrapper libary for Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
@@ -123881,7 +126988,7 @@ self: {
        pname = "system-inotify";
        version = "0.1";
        sha256 = "0ndw4vcvvf7p6nb5vn91mhbj4w9lmgm4cl0jzsks4mxs625bv4lg";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://darcs.imperialviolet.org/system-inotify";
        description = "Binding to Linux's inotify interface";
        license = stdenv.lib.licenses.bsd3;
@@ -123897,7 +127004,11 @@ self: {
        sha256 = "1c27y14867dd6706kp9n9y287vi7vqfzd2qr9365mk2854zvqifw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory either haskell-src-meta template-haskell text time
+         transformers unix
+       ];
+       executableHaskellDepends = [
          base directory either haskell-src-meta template-haskell text time
          transformers unix
        ];
@@ -123914,7 +127025,7 @@ self: {
        pname = "system-posix-redirect";
        version = "1.1.0.1";
        sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        description = "A toy module to temporarily redirect a program's stdout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123929,12 +127040,12 @@ self: {
        pname = "system-random-effect";
        version = "0.4.1.3";
        sha256 = "1gfzyjap173brh0i4plgad0409hpah98wsf9w0n7mcr2ysrvjdmb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-api extensible-effects
          mersenne-random-pure64 primitive statistics vector
          vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base extensible-effects HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -123951,7 +127062,7 @@ self: {
        pname = "system-time-monotonic";
        version = "0.2";
        sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
        description = "Simple library for using the system's monotonic clock";
        license = stdenv.lib.licenses.bsd3;
@@ -123966,11 +127077,11 @@ self: {
        pname = "system-util";
        version = "0.2";
        sha256 = "0sjgsm4n3imnl45zgpvs1vd10wmgci2am03kpjphbqgi5bdywzqk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory either filepath semigroups system-lifted
          template-haskell transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory easy-data either filepath hspec quickcheck-instances
          semigroups system-lifted template-haskell transformers
        ];
@@ -123991,11 +127102,16 @@ self: {
        sha256 = "12c05aqgxfqfsc5hbwlfwy6rhcx29ywz6ai86009y45hx9iii4cb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers murmur-hash parsec
          template-haskell
        ];
-       extraLibraries = [ libossp_uuid ];
+       librarySystemDepends = [ libossp_uuid ];
+       executableHaskellDepends = [
+         base binary bytestring containers murmur-hash parsec
+         template-haskell
+       ];
+       executableSystemDepends = [ libossp_uuid ];
        homepage = "http://github.com/solidsnack/system-uuid/";
        description = "Bindings to system UUID functions";
        license = stdenv.lib.licenses.bsd3;
@@ -124007,8 +127123,10 @@ self: {
        pname = "systemd";
        version = "1.0.0";
        sha256 = "10iyiw0m543bx9j9vdnz2lpnc3944i7ff9vbpdivvgv5z7gd17yn";
-       buildDepends = [ base bytestring network transformers unix ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [
+         base bytestring network transformers unix
+       ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/erebe/systemd";
        description = "Systemd facilities (Socket activation, Notify)";
@@ -124021,7 +127139,7 @@ self: {
        pname = "syz";
        version = "0.2.0.0";
        sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y";
-       buildDepends = [ base syb ];
+       libraryHaskellDepends = [ base syb ];
        homepage = "http://www.cs.indiana.edu/~adamsmd/papers/scrap_your_zippers/";
        description = "Scrap Your Zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -124036,13 +127154,12 @@ self: {
        pname = "t-regex";
        version = "0.1.0.0";
        sha256 = "0g1sv92cglcvdcq320rwdndmq80nyy1yljl6hm86mjppha20dnxl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta lens mtl
          QuickCheck recursion-schemes template-haskell transformers
        ];
        description = "Matchers and grammars using tree regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ta" = callPackage
@@ -124053,7 +127170,7 @@ self: {
        pname = "ta";
        version = "0.1";
        sha256 = "1i9d34gdxrc0gnny5zgp73m0si9583i8w0gw97mqpyha4pzz6hxx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim mtl Takusen template-haskell time
        ];
        jailbreak = true;
@@ -124071,7 +127188,9 @@ self: {
        sha256 = "1aqi8ivmlzi5j8kxjcwyd2nbz9jpp6q3xya8acsni5fis9l4757w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base csv optparse-applicative process split ];
+       executableHaskellDepends = [
+         base csv optparse-applicative process split
+       ];
        jailbreak = true;
        homepage = "https://github.com/danchoi/table";
        description = "Simple tool to generate tables from DSV input";
@@ -124084,7 +127203,7 @@ self: {
        pname = "table-tennis";
        version = "0.1.0.3";
        sha256 = "1v5g4fbbspgm4smjxk499a0grh5xsr18688kmivql8knhxh1351k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A table tennis game tracking engine";
        license = stdenv.lib.licenses.mit;
@@ -124100,7 +127219,9 @@ self: {
        sha256 = "0dc1qdjlwxqjfb286knmbam6y9w9wlr6ah7l2ndq33yia4n2jp8b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cgi containers html mtl parsec QuickCheck ];
+       executableHaskellDepends = [
+         base cgi containers html mtl parsec QuickCheck
+       ];
        description = "An interactive theorem prover based on semantic tableaux";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124115,12 +127236,12 @@ self: {
        pname = "tables";
        version = "0.4.1.1";
        sha256 = "1bv51i0bn0nlgi0zj8sjdch6m9dd8ncmnksz699fa28cn57ln64p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cereal comonad containers deepseq hashable lens
          profunctors safecopy template-haskell transformers
          transformers-compat unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory doctest filepath lens transformers
          unordered-containers
        ];
@@ -124140,7 +127261,7 @@ self: {
        pname = "tablestorage";
        version = "0.2.1.0";
        sha256 = "03j8cqq85i9wikw772swazbvyv1dcw0mnhmqq3slydl0axi12yr8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring conduit crypto-api cryptohash
          HTTP http-conduit http-types mtl network old-locale resourcet SHA
          time transformers utf8-string xml
@@ -124161,7 +127282,7 @@ self: {
        sha256 = "1qcay15g6g2c9h6vfc7pi7rl4d8fsl09vrq33pdqvgg2fp2xclh3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers gtk hint parallel process regex-base
          regex-posix
        ];
@@ -124176,7 +127297,7 @@ self: {
        pname = "tabular";
        version = "0.2.2.7";
        sha256 = "1ysgq7rrks7f98nnvxil8xz1q27hxdgz4szbjhqwzbwd209dmy0k";
-       buildDepends = [ base csv html mtl ];
+       libraryHaskellDepends = [ base csv html mtl ];
        homepage = "http://hub.darcs.net/kowey/tabular";
        description = "Two-dimensional data tables with rendering functions";
        license = stdenv.lib.licenses.bsd3;
@@ -124196,13 +127317,16 @@ self: {
        sha256 = "0igwq5gmfki61igrs6v51pm8r3wz8pzv6iz8dw30nmqgr3ypddlw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers dbus dyre enclosed-exceptions filepath gtk
          gtk-traymanager HStringTemplate HTTP mtl network network-uri
          old-locale parsec process safe split stm text time
          time-locale-compat transformers utf8-string X11 xdg-basedir xmonad
          xmonad-contrib
        ];
+       executableHaskellDepends = [
+         base dyre filepath gtk safe xdg-basedir
+       ];
        homepage = "http://github.com/travitch/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
@@ -124214,7 +127338,7 @@ self: {
        pname = "tag-bits";
        version = "0.1.1.2";
        sha256 = "0crn1g3dh97s3b55z0pkvjm9h89kq99c2agk687vr0vij6r5di65";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/tag-bits";
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
@@ -124229,7 +127353,7 @@ self: {
        pname = "tag-stream";
        version = "0.2.1";
        sha256 = "160kyp1w3y3zg0hj198v5a3jvhpfdy0y0lfz4r2d8azay4f1pkmn";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring enumerator
        ];
        homepage = "http://github.com/yihuang/tag-stream";
@@ -124247,7 +127371,7 @@ self: {
        sha256 = "143bnz73fyy8swm37p0pjg9zagpgzi8mcvixvswla6fiszgc203p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
          transformers utility-ht xml-basic
        ];
@@ -124262,7 +127386,7 @@ self: {
        pname = "tagged";
        version = "0.8.1";
        sha256 = "1hc2qzhhz5p1xd8k03sklrdnhcflkwhgpl82k6fam8yckww9ipav";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
@@ -124274,7 +127398,7 @@ self: {
        pname = "tagged-binary";
        version = "0.2.0.0";
        sha256 = "0ibp4hmzg4c4dn88ws7x1j5wc6cbz3j2hymyaw2qkac3j4phzqrm";
-       buildDepends = [ base binary bytestring pureMD5 ];
+       libraryHaskellDepends = [ base binary bytestring pureMD5 ];
        description = "Provides tools for serializing data tagged with type information";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -124284,14 +127408,15 @@ self: {
      mkDerivation {
        pname = "tagged-exception-core";
        version = "2.1.0.0";
-       revision = "1";
        sha256 = "1w4020qb6f5vnym13a4jrha62vj7rqz3nfsrsxa34dl04y63jcax";
+       revision = "1";
        editedCabalFile = "8f3f0eba857169c03927f8605ed326b7a4a5395582aeac4edcee44369b4c9689";
-       buildDepends = [ base exceptions mmorph mtl transformers ];
+       libraryHaskellDepends = [
+         base exceptions mmorph mtl transformers
+       ];
        homepage = "https://github.com/trskop/tagged-exception";
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-list" = callPackage
@@ -124304,7 +127429,7 @@ self: {
        pname = "tagged-list";
        version = "1.1";
        sha256 = "1gdkq9d6hc25z9y8wcsjq10vz25fw40hz2hbp8jfwczhchdxy35s";
-       buildDepends = [
+       libraryHaskellDepends = [
          AbortT-transformers base binary natural-number type-equality
          type-level-natural-number type-level-natural-number-induction
          type-level-natural-number-operations
@@ -124321,7 +127446,9 @@ self: {
        pname = "tagged-th";
        version = "0.1";
        sha256 = "1qqysn5zrkx2q3rv8ynf6nmy5rwdqk6niw0fphg5kyrg72h31s69";
-       buildDepends = [ base tagged template-haskell type-spine ];
+       libraryHaskellDepends = [
+         base tagged template-haskell type-spine
+       ];
        jailbreak = true;
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
        license = stdenv.lib.licenses.bsd3;
@@ -124336,7 +127463,7 @@ self: {
        pname = "tagged-transformer";
        version = "0.8";
        sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad contravariant distributive exceptions mtl reflection
          semigroupoids tagged
        ];
@@ -124352,7 +127479,7 @@ self: {
        pname = "tagging";
        version = "0.1";
        sha256 = "012lcbp2c9a38s4l2i9jaiqcxaidk93v7gxcnf9lplixrnzczy93";
-       buildDepends = [ base bytestring pcre-light ];
+       libraryHaskellDepends = [ base bytestring pcre-light ];
        homepage = "git://github.com/jre2/HaskellTagging.git";
        description = "Library for tagging data";
        license = stdenv.lib.licenses.bsd3;
@@ -124366,23 +127493,23 @@ self: {
      mkDerivation {
        pname = "taggy";
        version = "0.2.0";
-       revision = "1";
        sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3";
+       revision = "1";
        editedCabalFile = "0343ad030ba4e9fd651b383e92c213c6c4a6560ec33f561cfcfa9c5493deb50b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup text unordered-containers
          vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
          attoparsec base blaze-html blaze-markup directory hspec
          hspec-attoparsec text unordered-containers vector
        ];
        homepage = "http://github.com/alpmestan/taggy";
        description = "Efficient and simple HTML/XML parsing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taggy-lens" = callPackage
@@ -124393,14 +127520,15 @@ self: {
        pname = "taggy-lens";
        version = "0.1.2";
        sha256 = "05m2c9q0rz4y0zz6n3dqf0hhzfvk0mp1692jxykg86c802d7pkib";
-       buildDepends = [ base lens taggy text unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base lens taggy text unordered-containers
+       ];
+       testHaskellDepends = [
          base doctest hspec lens taggy text unordered-containers
        ];
        homepage = "http://github.com/alpmestan/taggy-lens";
        description = "Lenses for the taggy html/xml parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taglib" = callPackage
@@ -124409,9 +127537,9 @@ self: {
        pname = "taglib";
        version = "0.1.1";
        sha256 = "16qyfy8rxaab0q9j2v00h4j5d3la95acfhmp32x1hdxz1rwr6zfp";
-       buildDepends = [ base bytestring utf8-string ];
-       extraLibraries = [ taglib ];
-       pkgconfigDepends = [ taglib ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
+       librarySystemDepends = [ taglib ];
+       libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib (ID3 tag library)";
        license = "LGPL";
      }) { inherit (pkgs) taglib;};
@@ -124424,10 +127552,10 @@ self: {
        pname = "taglib-api";
        version = "0.1.1.3";
        sha256 = "1ahbwi28yjigbkgfv52iaaqalmmlc4d09fa65l0yczxrs7rzchmj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl text transformers
        ];
-       pkgconfigDepends = [ taglib ];
+       libraryPkgconfigDepends = [ taglib ];
        jailbreak = true;
        description = "An FFI layer over TagLib's C bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -124441,7 +127569,9 @@ self: {
        pname = "tagset-positional";
        version = "0.3.0";
        sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf";
-       buildDepends = [ base binary containers parsec text text-binary ];
+       libraryHaskellDepends = [
+         base binary containers parsec text text-binary
+       ];
        jailbreak = true;
        homepage = "https://github.com/kawu/tagset-positional";
        description = "Positional tags and tagsets";
@@ -124454,7 +127584,7 @@ self: {
        pname = "tagshare";
        version = "0.0";
        sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "TagShare - explicit sharing with tags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124467,7 +127597,7 @@ self: {
        sha256 = "13b6zy6346r3cxhaivys84fnxarg8wbv7r2znazfjdkqil8n5a1j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers text ];
+       libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "http://community.haskell.org/~ndm/tagsoup/";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
@@ -124484,7 +127614,11 @@ self: {
        sha256 = "1yxb1lmayqqlnxx4jgcbvya8llfgdbbr8rvcxwicwjrq3xsjl8km";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers data-accessor explicit-exception tagsoup
+         transformers utility-ht xml-basic
+       ];
+       executableHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
          old-time tagsoup transformers utility-ht xml-basic
        ];
@@ -124501,7 +127635,7 @@ self: {
        pname = "tagsoup-parsec";
        version = "0.0.8";
        sha256 = "0h62kqls8nrq5wqxbzvxav4kfn1lxc6qm5vg8dhkvqdp5z6xnkzk";
-       buildDepends = [ base parsec tagsoup ];
+       libraryHaskellDepends = [ base parsec tagsoup ];
        homepage = "http://www.killersmurf.com";
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
@@ -124517,11 +127651,11 @@ self: {
        pname = "tagstream-conduit";
        version = "0.5.5.3";
        sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring case-insensitive conduit
          conduit-extra data-default resourcet text transformers xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit hspec HUnit QuickCheck resourcet text
        ];
        homepage = "http://github.com/yihuang/tagstream-conduit";
@@ -124535,10 +127669,9 @@ self: {
        pname = "takahashi";
        version = "0.2.2.0";
        sha256 = "0flr87m1yjxcv1r64bvrx1gm9dpp6xvj2lj14pi99pipywgw4kgs";
-       buildDepends = [ base lens monad-skeleton mtl ];
+       libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "takusen-oracle" = callPackage
@@ -124551,9 +127684,12 @@ self: {
        sha256 = "1d57zcv409d3w6qz8n1c8k93wqrqvgynm327vx3w8p7kqs20yaad";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl old-time QuickCheck random time ];
-       buildTools = [ sqlplus ];
-       extraLibraries = [ clntsh ];
+       libraryHaskellDepends = [ base mtl old-time time ];
+       librarySystemDepends = [ clntsh ];
+       libraryToolDepends = [ sqlplus ];
+       executableHaskellDepends = [
+         base mtl old-time QuickCheck random time
+       ];
        homepage = "https://github.com/paulrzcz/takusen-oracle.git";
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
@@ -124576,7 +127712,7 @@ self: {
        sha256 = "0g7gwqaykvn2r7zbddcvcr4qjs78n0w0cvzk9sfm51i0xgmx3llg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson array base binary blaze-builder blaze-html bytestring cmdargs
          conduit containers deepseq derive directory dlist fclabels filepath
          hamlet http-types HUnit lifted-base monad-control mtl old-locale
@@ -124600,7 +127736,7 @@ self: {
        pname = "tamarin-prover-term";
        version = "0.8.5.1";
        sha256 = "17wq4hr7wfxw5x52jzk8882197zq1lwdqk5yr9wagsbn7hldmaa5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring containers deepseq derive
          directory dlist HUnit mtl parsec process safe split syb
          tamarin-prover-utils
@@ -124623,7 +127759,7 @@ self: {
        pname = "tamarin-prover-theory";
        version = "0.8.6.0";
        sha256 = "1xc11mrzfg1v8ilp7yb1zlg2359w14szhbdy86pbfzbjl31852l3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cmdargs containers deepseq derive
          directory dlist fclabels filepath HUnit mtl parallel parsec process
          safe syb tamarin-prover-term tamarin-prover-utils time transformers
@@ -124645,7 +127781,7 @@ self: {
        pname = "tamarin-prover-utils";
        version = "0.8.5.1";
        sha256 = "11phn05fb8s80g6zk6sly8wi1rl8i3rnymkr99la8abr8yw12j3c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring binary blaze-builder bytestring containers
          deepseq dlist fclabels mtl parsec pretty SHA syb time transformers
        ];
@@ -124662,7 +127798,7 @@ self: {
        pname = "tamper";
        version = "0.4.1";
        sha256 = "1nkfcai9l6z6hvjixq8nny1466f8shc5432hr8l17llqcwpbzv5p";
-       buildDepends = [ base containers mtl safe text ];
+       libraryHaskellDepends = [ base containers mtl safe text ];
        description = "An HTML templating system similar to Blaze, implemented as a monad transformer of sorts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124674,7 +127810,9 @@ self: {
        pname = "tar";
        version = "0.4.1.0";
        sha256 = "05875pc5ns1fsbl9qgr8sqh29xl4mhvj0pwsa9z4afxv6h6328bm";
-       buildDepends = [ base bytestring directory filepath time ];
+       libraryHaskellDepends = [
+         base bytestring directory filepath time
+       ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124687,8 +127825,10 @@ self: {
        pname = "tar";
        version = "0.4.2.1";
        sha256 = "102hjlrqfb9d0mvz2bdrj0wg7hvhvzbv4f8gsvxz0wfnq7k0mb9g";
-       buildDepends = [ array base bytestring directory filepath time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         array base bytestring directory filepath time
+       ];
+       testHaskellDepends = [
          array base bytestring directory filepath old-time QuickCheck tasty
          tasty-quickcheck time
        ];
@@ -124702,7 +127842,7 @@ self: {
        pname = "tardis";
        version = "0.3.0.0";
        sha256 = "15f88b5qg4v1ah60y0jxkww9n6z7gvnkslx4inckh6m6c7yvj8k6";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/DanBurton/tardis";
        description = "Bidirectional state monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -124713,28 +127853,27 @@ self: {
      , exceptions, filepath, ghc, ghc-paths, ghc-prim, liquid-fixpoint
      , liquidhaskell, mtl, pretty, process, syb, tagged, tasty
      , tasty-hunit, template-haskell, text, text-format, th-lift
-     , transformers, unordered-containers, vector, z3
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "target";
        version = "0.1.3.0";
        sha256 = "0przmavzzcbyxkqj1wffiissxz9fdlrx2q8lpxgmsamadd46xq66";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory exceptions filepath ghc ghc-paths
          liquid-fixpoint liquidhaskell mtl pretty process syb tagged
          template-haskell text text-format th-lift transformers
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers deepseq ghc ghc-prim liquid-fixpoint
          liquidhaskell mtl tagged tasty tasty-hunit template-haskell
          unordered-containers
        ];
-       buildTools = [ z3 ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) z3;};
+     }) {};
 
   "task" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
@@ -124747,7 +127886,7 @@ self: {
        sha256 = "0z4f4hs2c7xl6c134bqhk81wzxhb6yf7fsar2fnqvahviaqqgzqn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring containers csv-enumerator
          directory filepath old-locale random text time unix
        ];
@@ -124765,8 +127904,12 @@ self: {
        pname = "taskpool";
        version = "0.1.0";
        sha256 = "02r7y882sfj7m3yaj68v40f4065ajiig2b25v55svh13jars7c3n";
-       buildDepends = [ async base containers fgl stm transformers ];
-       testDepends = [ async base containers fgl hspec stm transformers ];
+       libraryHaskellDepends = [
+         async base containers fgl stm transformers
+       ];
+       testHaskellDepends = [
+         async base containers fgl hspec stm transformers
+       ];
        description = "Manage pools of possibly interdependent tasks using STM and async";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -124780,7 +127923,7 @@ self: {
        pname = "tasty";
        version = "0.10.1.2";
        sha256 = "0c5p86ljqa7id6rlkj4p4wy53m9p77f6nayr8ybhcqsjprpb5q4i";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal async base containers deepseq mtl
          optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays
        ];
@@ -124797,7 +127940,7 @@ self: {
        pname = "tasty-ant-xml";
        version = "1.0.1";
        sha256 = "1wb9lm9rbk46g9cm2lpcrzh59zpcy270p824agg61bj1xb9jymsc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers generic-deriving ghc-prim mtl stm tagged tasty
          transformers xml
        ];
@@ -124815,11 +127958,11 @@ self: {
        pname = "tasty-golden";
        version = "2.3.0.1";
        sha256 = "19jlfxhgrphsv7nfwsfil5ci2snlm9qsqwswnzn68pa3440zqiji";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers deepseq directory filepath mtl
          optparse-applicative process tagged tasty temporary-rc
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory filepath process tasty tasty-hunit temporary-rc
        ];
        homepage = "https://github.com/feuerbach/tasty-golden";
@@ -124835,7 +127978,7 @@ self: {
        pname = "tasty-hspec";
        version = "1.1";
        sha256 = "15ly6jf4kgdc15k6b584d99j18xb41alas62gyakw5sf8y0y02i6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tasty tasty-quickcheck
          tasty-smallcheck
        ];
@@ -124852,7 +127995,7 @@ self: {
        pname = "tasty-html";
        version = "0.4.1";
        sha256 = "0a4j8w4gm8wr9pgmkkahadl5k2sd19za9f6x323f01v4ff455hwg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers filepath generic-deriving mtl
          stm tagged tasty text transformers
        ];
@@ -124867,7 +128010,7 @@ self: {
        pname = "tasty-hunit";
        version = "0.9.2";
        sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf";
-       buildDepends = [ base tasty ];
+       libraryHaskellDepends = [ base tasty ];
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "HUnit support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
@@ -124879,7 +128022,7 @@ self: {
        pname = "tasty-hunit-adapter";
        version = "1.0";
        sha256 = "0626islqqkncdma8790z2z47r8x90y9v7fj0p5nhkw6mpy6p0ifg";
-       buildDepends = [ base HUnit tasty tasty-hunit ];
+       libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
        jailbreak = true;
        homepage = "https://github.com/jstolarek/tasty-hunit-adapter";
        description = "Use existing HUnit tests with tasty";
@@ -124900,13 +128043,13 @@ self: {
        sha256 = "0zjbs7ax5nrxcg1njnrliavablda5rgjciq2h3nycvic8r1g9p7x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring cmdargs containers directory either
          haskell-src-exts language-haskell-extract lens mtl parsec
          regex-posix split system-filepath tasty tasty-quickcheck text
          transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory haskell-src-exts lens
          mtl QuickCheck quickcheck-property-comb regex-posix split stm
          stringbuilder system-filepath tasty tasty-quickcheck text
@@ -124926,8 +128069,8 @@ self: {
        pname = "tasty-kat";
        version = "0.0.3";
        sha256 = "14yvlpli6cv6bn3kh8mlfp4x1l6ns4fvmfv6hmj75cvxyzq029d7";
-       buildDepends = [ base bytestring tasty ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring tasty ];
+       testHaskellDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/vincenthz/tasty-kat";
@@ -124942,7 +128085,9 @@ self: {
        pname = "tasty-program";
        version = "1.0.3";
        sha256 = "18q6b8z5hh1jybr9i72ark95hwz8kg6zbh40ghgwsf6n3ijyfn8n";
-       buildDepends = [ base deepseq directory filepath process tasty ];
+       libraryHaskellDepends = [
+         base deepseq directory filepath process tasty
+       ];
        homepage = "https://github.com/jstolarek/tasty-program";
        description = "Use tasty framework to test whether a program executes correctly";
        license = stdenv.lib.licenses.bsd3;
@@ -124956,8 +128101,8 @@ self: {
        pname = "tasty-quickcheck";
        version = "0.8.3.2";
        sha256 = "1q1fghmsjrdl6jkcnajmsvw4d893m6cyhzpai9vvrhxy9vdy0l1v";
-       buildDepends = [ base QuickCheck tagged tasty ];
-       testDepends = [ base pcre-light tasty tasty-hunit ];
+       libraryHaskellDepends = [ base QuickCheck tagged tasty ];
+       testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "QuickCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
@@ -124971,7 +128116,7 @@ self: {
        pname = "tasty-rerun";
        version = "1.1.4";
        sha256 = "1c0mbjfgg0s2p1cmlyd8gnmmc6wk5ih5v9jr11bln54myyjywq8m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl optparse-applicative reducers split stm tagged
          tasty transformers
        ];
@@ -124990,12 +128135,12 @@ self: {
        pname = "tasty-silver";
        version = "3.1.7";
        sha256 = "1mplisyhps9n3kw2w3fjanc14cr6vbyr4xdydq76za9dmx07kd3l";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal async base bytestring containers deepseq directory
          filepath mtl optparse-applicative process process-extras regex-tdfa
          stm tagged tasty temporary text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory filepath process tasty tasty-hunit temporary
          transformers
        ];
@@ -125010,7 +128155,7 @@ self: {
        pname = "tasty-smallcheck";
        version = "0.8.0.1";
        sha256 = "0yckfbz8na8ccyw2911i3a4hd3fdncclk3ng5343hs5cylw6y4sm";
-       buildDepends = [ async base smallcheck tagged tasty ];
+       libraryHaskellDepends = [ async base smallcheck tagged tasty ];
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "SmallCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
@@ -125024,7 +128169,7 @@ self: {
        pname = "tasty-th";
        version = "0.1.3";
        sha256 = "1fl5pagm9bdqvp7v54ilkr91m667rxw1jifwfdhrikr938aqrzx3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base language-haskell-extract tasty template-haskell
        ];
        homepage = "http://github.com/bennofs/tasty-th";
@@ -125038,7 +128183,7 @@ self: {
        pname = "tau";
        version = "6.2831";
        sha256 = "10vw3y3vimqpb22amhk7n0d0jni46j60iva1gqa28ky8lhqq8ssz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Tau, the ratio between any circle's circumference and radius";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125052,7 +128197,7 @@ self: {
        pname = "tbox";
        version = "0.1.0";
        sha256 = "0qsc4mdiryrf3pqzzjvx57iz92xagp7692h312q2pm412zg6p1vy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary cautious-file containers directory filepath
          IfElse monad-loops mtl random safe-failure stm-io-hooks
        ];
@@ -125071,7 +128216,7 @@ self: {
        pname = "tcache-AWS";
        version = "0.0.1";
        sha256 = "18hi8jvc117pxjhpb891hqlsbi4wvmd6nr3vwnqqr7rcw2dsmnwv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base bytestring conduit http-conduit network TCache text
        ];
        description = "tcache using Amazon Web Services as default persistence mechanism";
@@ -125088,7 +128233,7 @@ self: {
        sha256 = "0ljfn9dvyncl205mrnpic5j0633gnzka03gjc4dmccsqq0c1wjm7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring tokyocabinet-haskell utf8-string
        ];
        homepage = "http://bitcheese.net/wiki/code/tccli";
@@ -125103,8 +128248,8 @@ self: {
        pname = "tce-conf";
        version = "1.1";
        sha256 = "1c3wr9rab7835dfg9qmxhprb2r21iyig1wkvwl49h7brhmhxzpnh";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers HUnit ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers HUnit ];
        homepage = "http://hub.darcs.net/dino/tce-conf";
        description = "Very simple config file reading";
        license = stdenv.lib.licenses.bsd3;
@@ -125116,7 +128261,7 @@ self: {
        pname = "tconfig";
        version = "0.5.2";
        sha256 = "05cnlbrdddbrdwlm8s7b76ydwrn49vaifdgaklfhv8rzz9dfpvbr";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Simple text configuration file parser library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125127,7 +128272,7 @@ self: {
        pname = "tcp";
        version = "0.0.2";
        sha256 = "1wqkfnkd2di9a6h0br33fd7jaf1yqpaf7kjnpjwp52l4xv04ajlv";
-       buildDepends = [ base containers old-time ];
+       libraryHaskellDepends = [ base containers old-time ];
        homepage = "http://www.cl.cam.ac.uk/~pes20/Netsem/";
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -125145,13 +128290,13 @@ self: {
        pname = "tdd-util";
        version = "0.3.0.1";
        sha256 = "1d9avxpj2d90agd2pvc905j7jfa4rssl7bnrp2fmky4hfcbqa8ly";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HUnit lens MonadCatchIO-transformers parallel-io
          process QuickCheck random system-posix-redirect tagged
          test-framework test-framework-hunit test-framework-quickcheck2 time
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit lens MonadCatchIO-transformers parallel-io
          process QuickCheck random string-class system-posix-redirect tagged
          test-framework test-framework-hunit test-framework-quickcheck2 time
@@ -125170,7 +128315,7 @@ self: {
        pname = "tdoc";
        version = "0.4.6";
        sha256 = "0gslj3z3lnh2wl7ljg8rza6kmmgfmgv94hgla75nblirvyka8v48";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring template-haskell transformers xhtml
        ];
        homepage = "https://github.com/np/tdoc";
@@ -125184,7 +128329,7 @@ self: {
        pname = "teams";
        version = "0.0.2.3";
        sha256 = "04jq7qdh0kr55a7a3gkjc8dgn130bp0kqh8qcmf284wz981vj9gd";
-       buildDepends = [ base containers fgl graphviz ];
+       libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125195,10 +128340,10 @@ self: {
      mkDerivation {
        pname = "teeth";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1hxii574qdxcbh10f4bgwyaxf83inqj9vrcwk7vkffv6pg349xcl";
+       revision = "1";
        editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/expipiplus1/teeth";
        description = "Dental data types";
@@ -125213,11 +128358,12 @@ self: {
        pname = "telegram";
        version = "0.1.0.0";
        sha256 = "1ci6606fx5cisb9yrjh0mkd549w2j3h1vzj3zm2zsl9gr7agvh4n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default http-conduit url utf8-string
        ];
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tellbot" = callPackage
@@ -125231,7 +128377,7 @@ self: {
        sha256 = "0mm7yyyxs3dvqsrs1xd4mq7byfn55rwri26k9xq3l4k9v7sxbgx8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bifunctors bytestring containers errors http-conduit mtl
          network regex-posix split tagsoup text time transformers
        ];
@@ -125246,7 +128392,7 @@ self: {
        pname = "template";
        version = "0.2.0.10";
        sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg";
-       buildDepends = [ base mtl text ];
+       libraryHaskellDepends = [ base mtl text ];
        description = "Simple string substitution";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125257,7 +128403,7 @@ self: {
        pname = "template-default";
        version = "0.1.1";
        sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd";
-       buildDepends = [ base data-default template-haskell ];
+       libraryHaskellDepends = [ base data-default template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/haskell-pkg-janitors/template-default";
        description = "declaring Default instances just got even easier";
@@ -125271,7 +128417,7 @@ self: {
        pname = "template-haskell";
        version = "2.10.0.0";
        sha256 = "1y0dikbpy98n9g1rwb6swng86cch815x5ipj8kfjgpjgs0c3i2im";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125282,7 +128428,9 @@ self: {
        pname = "template-haskell-util";
        version = "0.1.1.0";
        sha256 = "032gkb6pgd5l8ih48971ckiy7spvvr6fcmjx4ysiyyaj7hra174f";
-       buildDepends = [ base GenericPretty ghc-prim template-haskell ];
+       libraryHaskellDepends = [
+         base GenericPretty ghc-prim template-haskell
+       ];
        homepage = "https://github.com/HaskellZhangSong/TemplateHaskellUtils";
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
@@ -125298,11 +128446,11 @@ self: {
        pname = "template-hsml";
        version = "0.2.0.3";
        sha256 = "1lnw1rhxj66zn34p8ca2dx98326l40w8kj6nrxxhff0v30myxa1g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup haskell-src-exts haskell-src-meta parsec
          template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          base parsec QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -125320,7 +128468,7 @@ self: {
        pname = "templatepg";
        version = "0.2.6";
        sha256 = "1i5ais5nlga3qv0w2fg5fdkfxikks9yg6fgwqx7agcrxp4wpqcb7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring haskell-src-meta mtl network old-locale
          parsec regex-compat regex-posix template-haskell time utf8-string
        ];
@@ -125338,8 +128486,8 @@ self: {
        pname = "templater";
        version = "0.0.3.0";
        sha256 = "0j00bb915j5d9a416gjqng08zcqfwbv24k2rqmb0mbmzz768viz4";
-       buildDepends = [ attoparsec base text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
          base hspec hspec-attoparsec HUnit QuickCheck text
        ];
        homepage = "https://github.com/geraud/templater";
@@ -125356,7 +128504,7 @@ self: {
        pname = "tempodb";
        version = "0.2.2.5";
        sha256 = "00z02hl31ad497rvxjxx5khb20ql6irkgpdvsg5m7axq8bi3d5fl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers HsOpenSSL HTTP
          http-streams io-streams mtl old-locale text time
        ];
@@ -125376,7 +128524,7 @@ self: {
        pname = "temporal-csound";
        version = "0.4.3.1";
        sha256 = "1c7difs3svrq1ka8bdf61vvg9b29baqd086l19a84f0734q5ph19";
-       buildDepends = [
+       libraryHaskellDepends = [
          base csound-catalog csound-expression temporal-media
          temporal-music-notation temporal-music-notation-western
        ];
@@ -125392,7 +128540,7 @@ self: {
        pname = "temporal-media";
        version = "0.6.0";
        sha256 = "0mpi97lqh4mqv6flgcrwzbv8ihlxhxzf5z2xd87wxpzvcglx2n0n";
-       buildDepends = [ base Boolean ];
+       libraryHaskellDepends = [ base Boolean ];
        homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
        license = stdenv.lib.licenses.bsd3;
@@ -125404,7 +128552,9 @@ self: {
        pname = "temporal-music-notation";
        version = "0.4.1";
        sha256 = "09mx6bfz0lxyy7z0srl4372qv42fyymc5pqxkyxj7mhf872y4biv";
-       buildDepends = [ base data-default temporal-media vector ];
+       libraryHaskellDepends = [
+         base data-default temporal-media vector
+       ];
        homepage = "https://github.com/anton-k/temporal-music-notation";
        description = "music notation";
        license = stdenv.lib.licenses.bsd3;
@@ -125418,7 +128568,7 @@ self: {
        pname = "temporal-music-notation-demo";
        version = "0.4.0";
        sha256 = "1jd9yd9ay9xmlmpm4wnkpd0ic69xlg8igqbagrycc6kv4zf1p20z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary data-default HCodecs temporal-music-notation
        ];
        homepage = "https://github.com/anton-k/temporal-music-notation-demo";
@@ -125432,7 +128582,7 @@ self: {
        pname = "temporal-music-notation-western";
        version = "0.4.0";
        sha256 = "012pv4l5r3ijnyid7b8h1lpifjs7cf3k4a13f6773r93qfgvxpkc";
-       buildDepends = [ base temporal-music-notation ];
+       libraryHaskellDepends = [ base temporal-music-notation ];
        homepage = "https://github.com/anton-k/temporal-music-notation-western";
        description = "western music notation";
        license = stdenv.lib.licenses.bsd3;
@@ -125446,7 +128596,7 @@ self: {
        pname = "temporary";
        version = "1.2.0.3";
        sha256 = "0is67bmsjmbbw6wymhis8wyq9gax3sszm573p5719fx2c9z9r24a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory exceptions filepath transformers unix
        ];
        homepage = "http://www.github.com/batterseapower/temporary";
@@ -125462,7 +128612,7 @@ self: {
        pname = "temporary-rc";
        version = "1.2.0.3";
        sha256 = "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory exceptions filepath transformers unix
        ];
        homepage = "http://www.github.com/feuerbach/temporary";
@@ -125478,10 +128628,10 @@ self: {
        pname = "temporary-resourcet";
        version = "0.1.0.0";
        sha256 = "1nxl8ivp5sd250w7pwm4f1kas5g1ikij3z39px717ys1xvk1r81h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory exceptions filepath resourcet transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory resourcet tasty tasty-hunit transformers
        ];
        homepage = "http://www.github.com/ttuegel/temporary-resourcet";
@@ -125499,11 +128649,11 @@ self: {
        sha256 = "0hv5b09vly9zakjfgi4bnjx503ny334dhg13g5ma85rp3dbsjvsn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base directory executable-path filepath haskeline mtl
          uniplate utf8-string
        ];
-       buildTools = [ happy ];
+       executableToolDepends = [ happy ];
        jailbreak = true;
        description = "Interpreter for the FRP language Tempus";
        license = stdenv.lib.licenses.bsd3;
@@ -125516,8 +128666,8 @@ self: {
        pname = "tensor";
        version = "0.3.0.1";
        sha256 = "03m612xvx3p44za0g291xir89lcgm4pk885lpy3wshp0987ij1nf";
-       buildDepends = [ base ghc-prim random vector ];
-       testDepends = [ base QuickCheck random ];
+       libraryHaskellDepends = [ base ghc-prim random vector ];
+       testHaskellDepends = [ base QuickCheck random ];
        homepage = "http://noaxiom.org/tensor";
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
@@ -125532,11 +128682,11 @@ self: {
        pname = "term-rewriting";
        version = "0.2";
        sha256 = "07axcgr8llrj8icaysi1awq29p8vgpakvv56shvjrcgjf9ar0m11";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl multiset parsec
          union-find-array
        ];
-       testDepends = [ base containers HUnit QuickCheck ];
+       testHaskellDepends = [ base containers HUnit QuickCheck ];
        jailbreak = true;
        homepage = "http://cl-informatik.uibk.ac.at/software/haskell-rewriting/";
        description = "Term Rewriting Library";
@@ -125552,8 +128702,9 @@ self: {
        sha256 = "0hv72kkpx6narykfbf6m59gq4l8gym6fm52n1zzazac1802zw0dv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
@@ -125568,8 +128719,10 @@ self: {
        pname = "terminal-progress-bar";
        version = "0.0.1.4";
        sha256 = "0ldvii23ks446xrd27aklh8s8pn1yi3dzhhzl05gipjqbhq3lsx3";
-       buildDepends = [ base base-unicode-symbols stm stm-chans ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base base-unicode-symbols stm stm-chans
+       ];
+       testHaskellDepends = [
          base base-unicode-symbols HUnit test-framework test-framework-hunit
        ];
        homepage = "https://github.com/roelvandijk/terminal-progress-bar";
@@ -125583,7 +128736,7 @@ self: {
        pname = "terminal-size";
        version = "0.3.2";
        sha256 = "0vm6xrm5j60h01lgn7srhsx2698aq6k5jkbc84bi5zh5w63fsdyp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Get terminal window height and width";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125594,7 +128747,7 @@ self: {
        pname = "termination-combinators";
        version = "0.1";
        sha256 = "1k32s5vzkxnsawj8vdscyfc96hk0s97zpj1mgw1hk93hwcrxn9wh";
-       buildDepends = [ base containers contravariant ];
+       libraryHaskellDepends = [ base containers contravariant ];
        jailbreak = true;
        homepage = "http://www.github.com/batterseapower/termination-combinators";
        description = "Termination combinators for forcing non-terminating algorithms to terminate";
@@ -125607,8 +128760,8 @@ self: {
        pname = "terminfo";
        version = "0.4.0.1";
        sha256 = "1qsspg1kqk68ja217fn3anv1j8arr1pwzzb5m74zpxpjaqb02153";
-       buildDepends = [ base ];
-       extraLibraries = [ ncurses ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ ncurses ];
        homepage = "https://github.com/judah/terminfo";
        description = "Haskell bindings to the terminfo library";
        license = stdenv.lib.licenses.bsd3;
@@ -125622,10 +128775,10 @@ self: {
        pname = "terminfo-hs";
        version = "0.1.0.1";
        sha256 = "1bbf37c34l8q12hy9yhw1jcjzcb1g87r850pxhwyzsikwhf75g81";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers directory errors filepath
        ];
-       testDepends = [ base directory errors filepath QuickCheck ];
+       testHaskellDepends = [ base directory errors filepath QuickCheck ];
        description = "A pure-Haskell (no FFI) module for accessing terminfo databases";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125636,8 +128789,8 @@ self: {
        pname = "terrahs";
        version = "0.9";
        sha256 = "0gciz8nvn7x1lclzihvwy8v1c53p6frb1q32ckpmsqw7xiasqlhb";
-       buildDepends = [ base haskell98 old-time ];
-       extraLibraries = [ terralib4c translib ];
+       libraryHaskellDepends = [ base haskell98 old-time ];
+       librarySystemDepends = [ terralib4c translib ];
        jailbreak = true;
        homepage = "http://lucc.ess.inpe.br/doku.php?id=terrahs";
        description = "A Haskell GIS Programming Environment";
@@ -125654,7 +128807,9 @@ self: {
        sha256 = "064s43a7iq2rr643x4ahibgjanyq3v5h6qcgvc68j1dycq56snnl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl process syb transformers ];
+       executableHaskellDepends = [
+         base containers mtl process syb transformers
+       ];
        homepage = "http://mbays.freeshell.org/tersmu";
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
@@ -125671,7 +128826,7 @@ self: {
        sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers hostname old-locale
          random regex-posix time xml
        ];
@@ -125688,10 +128843,10 @@ self: {
        pname = "test-framework-doctest";
        version = "0.2.1.2";
        sha256 = "01k0kcsbc41zaric5zgnhfnrp9dd19brv4d3p22vly7a7bmn6n0q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base doctest test-framework test-framework-hunit
        ];
-       testDepends = [ base test-framework ];
+       testHaskellDepends = [ base test-framework ];
        jailbreak = true;
        description = "Test.Framework wrapper for DocTest";
        license = stdenv.lib.licenses.bsd3;
@@ -125706,7 +128861,7 @@ self: {
        pname = "test-framework-golden";
        version = "1.1.3.3";
        sha256 = "1sfgr91zn7iwgj1p1s3298mswv29rbxz4x4086r8mav7prd0ww36";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring filepath mtl process temporary test-framework
        ];
        homepage = "https://github.com/feuerbach/test-framework-golden";
@@ -125721,7 +128876,9 @@ self: {
        pname = "test-framework-hunit";
        version = "0.3.0.1";
        sha256 = "1h0h55kf6ff25nbfx1mhliwyknc0glwv3zi78wpzllbjbs7gvyfk";
-       buildDepends = [ base extensible-exceptions HUnit test-framework ];
+       libraryHaskellDepends = [
+         base extensible-exceptions HUnit test-framework
+       ];
        homepage = "https://batterseapower.github.io/test-framework/";
        description = "HUnit support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
@@ -125733,7 +128890,7 @@ self: {
        pname = "test-framework-program";
        version = "1.1";
        sha256 = "10p6xxxbfx3yr71wdbvk7qhm3xkxq3a1dv4hgcirzynsdfk36s3z";
-       buildDepends = [ base directory process test-framework ];
+       libraryHaskellDepends = [ base directory process test-framework ];
        description = "Test framework support for running simple test programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125746,7 +128903,7 @@ self: {
        pname = "test-framework-quickcheck";
        version = "0.3.0";
        sha256 = "0g8sh3x3mhns03svccgbdbw8crzpzmahp1hr1fs6ag66fqr8p9mv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq extensible-exceptions QuickCheck random test-framework
        ];
        jailbreak = true;
@@ -125763,10 +128920,10 @@ self: {
      mkDerivation {
        pname = "test-framework-quickcheck2";
        version = "0.3.0.3";
-       revision = "1";
        sha256 = "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc";
+       revision = "1";
        editedCabalFile = "14fdf07c345e9460882b975851739afc2cf62f0c9930c38d0fee5b0943351638";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions QuickCheck random test-framework
        ];
        homepage = "https://batterseapower.github.io/test-framework/";
@@ -125783,11 +128940,11 @@ self: {
        pname = "test-framework-sandbox";
        version = "0.1.0";
        sha256 = "0bfj0l189dh52dipdnxcqllk2h6g4dwcwcw5pll2my3n7r78pn7v";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base lifted-base mtl temporary test-framework
          test-sandbox transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit test-framework test-sandbox test-sandbox-hunit
        ];
        homepage = "http://gree.github.io/haskell-test-sandbox/";
@@ -125804,8 +128961,8 @@ self: {
        pname = "test-framework-skip";
        version = "1.0";
        sha256 = "1avs36j6a846a3qiy0f23qnld1swgpngidb3098dcib2rbw4p3n9";
-       buildDepends = [ base test-framework ];
-       testDepends = [
+       libraryHaskellDepends = [ base test-framework ];
+       testHaskellDepends = [
          base HUnit QuickCheck smallcheck test-framework
          test-framework-hunit test-framework-quickcheck2
          test-framework-smallcheck
@@ -125821,7 +128978,9 @@ self: {
        pname = "test-framework-smallcheck";
        version = "0.2";
        sha256 = "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0";
-       buildDepends = [ base smallcheck test-framework transformers ];
+       libraryHaskellDepends = [
+         base smallcheck test-framework transformers
+       ];
        homepage = "https://github.com/feuerbach/smallcheck";
        description = "Support for SmallCheck tests in test-framework";
        license = stdenv.lib.licenses.bsd3;
@@ -125833,8 +128992,8 @@ self: {
        pname = "test-framework-testing-feat";
        version = "0.1.0.1";
        sha256 = "0pf07psqc4ihg0wrqqm127hd9qjbllmqw9lzf1ridg6r3xs63994";
-       buildDepends = [ base test-framework testing-feat ];
-       testDepends = [ base test-framework testing-feat ];
+       libraryHaskellDepends = [ base test-framework testing-feat ];
+       testHaskellDepends = [ base test-framework testing-feat ];
        homepage = "http://github.com/jfischoff/test-framework-testing-feat";
        description = "A test framework provider for testing-feat";
        license = stdenv.lib.licenses.bsd3;
@@ -125848,7 +129007,7 @@ self: {
        pname = "test-framework-th";
        version = "0.2.4";
        sha256 = "12lw7yj02jb9s0i7rb98jjam43j2h0gzmnbj9zi933fx7sg0sy4b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts language-haskell-extract regex-posix
          template-haskell test-framework
        ];
@@ -125865,7 +129024,7 @@ self: {
        pname = "test-framework-th-prime";
        version = "0.0.8";
        sha256 = "0gb7bpdxzsd8fnh4ck4p1ks7nxrk7fsw97x90d4zjds5hnw3hchr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cpphs haskell-src-exts template-haskell test-framework
        ];
        description = "Template Haskell for test framework";
@@ -125878,8 +129037,8 @@ self: {
        pname = "test-invariant";
        version = "0.4.5.0";
        sha256 = "0ck3kk7pmj1679ddmrysx5j3y27619ar1b2pny45mskz3g6vyvrh";
-       buildDepends = [ base QuickCheck ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/knupfer/test-invariant";
        description = "Provide common invariants to be checked with QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -125891,7 +129050,7 @@ self: {
        pname = "test-pkg";
        version = "0.3.0.0";
        sha256 = "0fncybd3sxrbnrd4l1hri18rhfg9h0fm3k4305iwh4l65fbwg2n8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Just tests Hackage";
        license = stdenv.lib.licenses.bsd3;
@@ -125909,13 +129068,13 @@ self: {
        pname = "test-sandbox";
        version = "0.1.5";
        sha256 = "1cknqblzf2wqq46casmfq00lx4zh3y9g07bqsbchxbq4xmd000js";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers data-default directory filepath
          lifted-base monad-control monad-loops mtl network process random
          random-shuffle regex-posix temporary transformers transformers-base
          transformers-compat unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory hastache heredoc hspec
          hspec-expectations-lifted mtl process QuickCheck regex-posix
          template-haskell text transformers transformers-compat unix
@@ -125938,12 +129097,17 @@ self: {
        sha256 = "1yqh5b3gzmwqf0wj491pmkvbn9jzpg36bh427vkl1w6yj5c4ha7x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory hastache http-conduit
+         lifted-base network process shelly test-sandbox text unix wai
+         wai-extra warp yaml yesod yesod-core
+       ];
+       executableHaskellDepends = [
          aeson base bytestring containers directory hastache http-conduit
          lifted-base network optparse-applicative process shelly
          test-sandbox text unix wai wai-extra warp yaml yesod yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cabal-test-bin hspec hspec-test-sandbox process
          shakespeare test-sandbox text unix
        ];
@@ -125957,7 +129121,7 @@ self: {
        pname = "test-sandbox-hunit";
        version = "0.1.1";
        sha256 = "1pdxwbs3508s9j1409bvpjipbqz8ymch633r6gyrirmr1r1zp3dy";
-       buildDepends = [ base HUnit lifted-base test-sandbox ];
+       libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "HUnit convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
@@ -125971,7 +129135,7 @@ self: {
        pname = "test-sandbox-quickcheck";
        version = "0.1.0";
        sha256 = "0gijq6qwcljq2kvh08nffb6d9qblwpj4hw2jlxidvxy1hzbsgiyi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl QuickCheck random test-sandbox transformers
        ];
        homepage = "http://gree.github.io/haskell-test-sandbox/";
@@ -125985,8 +129149,8 @@ self: {
        pname = "test-shouldbe";
        version = "0.2.1.1";
        sha256 = "0wagfhljym2mnwpxld8dcf4qcdbp3d9liyf9mcigd4kiy5sdhfx4";
-       buildDepends = [ base HUnit ];
-       testDepends = [ base hspec hspec-discover silently ];
+       libraryHaskellDepends = [ base HUnit ];
+       testHaskellDepends = [ base hspec hspec-discover silently ];
        jailbreak = true;
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
@@ -126000,8 +129164,12 @@ self: {
        pname = "test-simple";
        version = "0.1.7";
        sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka";
-       buildDepends = [ base mtl QuickCheck state-plus template-haskell ];
-       testDepends = [ base executable-path mtl process QuickCheck ];
+       libraryHaskellDepends = [
+         base mtl QuickCheck state-plus template-haskell
+       ];
+       testHaskellDepends = [
+         base executable-path mtl process QuickCheck
+       ];
        jailbreak = true;
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
@@ -126015,7 +129183,7 @@ self: {
        sha256 = "0lppzyh0qxqry8a2d1yqrin51kizw2hl937pxg2a6pi34grlhdd0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Small test package";
        license = "unknown";
@@ -126028,10 +129196,12 @@ self: {
      mkDerivation {
        pname = "testing-feat";
        version = "0.4.0.2";
-       revision = "1";
        sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j";
+       revision = "1";
        editedCabalFile = "0168dde1e9ac0e7a1f80a33c12a6c5d2b7c5e59e4dcd060ffb8d82f100c4dd3f";
-       buildDepends = [ base mtl QuickCheck tagshare template-haskell ];
+       libraryHaskellDepends = [
+         base mtl QuickCheck tagshare template-haskell
+       ];
        description = "Functional Enumeration of Algebraic Types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126042,7 +129212,7 @@ self: {
        pname = "testing-type-modifiers";
        version = "0.1.0.1";
        sha256 = "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Data type modifiers for property based testing";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -126055,7 +129225,7 @@ self: {
        pname = "testloop";
        version = "0.1.1.0";
        sha256 = "1bygfdcnd0y60jhyp34zkss2cxr3s2jq6ysxm0w9c4vhl361ib7z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal directory filepath fsnotify hint mtl system-filepath
          time unix
        ];
@@ -126073,7 +129243,9 @@ self: {
        pname = "testpack";
        version = "2.1.3.0";
        sha256 = "1rq5d64d7j3gpgbfxmfr4xmzizjy0ricw5ghrakv8gzvxmi2bn4p";
-       buildDepends = [ base containers HUnit mtl QuickCheck random ];
+       libraryHaskellDepends = [
+         base containers HUnit mtl QuickCheck random
+       ];
        jailbreak = true;
        homepage = "https://github.com/jgoerzen/testpack";
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
@@ -126088,7 +129260,7 @@ self: {
        sha256 = "0a0kw5546z5jydk6dq2p16p2kpwv7fnmy1m907m3x6n580i1vh3l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath gtk ];
+       executableHaskellDepends = [ base filepath gtk ];
        homepage = "http://code.haskell.org/~dons/code/testpattern";
        description = "Display a monitor test pattern";
        license = stdenv.lib.licenses.bsd3;
@@ -126102,7 +129274,9 @@ self: {
        pname = "testrunner";
        version = "0.9.1";
        sha256 = "1887g3wn5mnlbxj4vbzv0zm3gwaj9ycr9sk7hy27qbb2x7c30iaw";
-       buildDepends = [ base HUnit QuickCheck random regex-compat stm ];
+       libraryHaskellDepends = [
+         base HUnit QuickCheck random regex-compat stm
+       ];
        description = "Easy unit test driver framework";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126116,7 +129290,7 @@ self: {
        sha256 = "10wlw1frkaa3j8mb8lxgpvxcx87m8wdpca3mli9c5kirdm51vjgw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT random ];
+       executableHaskellDepends = [ base GLUT random ];
        homepage = "http://d.hatena.ne.jp/mokehehe/20080921/tetris";
        description = "A 2-D clone of Tetris";
        license = stdenv.lib.licenses.bsd3;
@@ -126131,7 +129305,8 @@ self: {
        sha256 = "1q41kphll7xhbccwyvlsvk5vxisig23ipmcqf7v9qc3rx1hb0p0w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers deepseq parsec ];
+       libraryHaskellDepends = [ base containers deepseq parsec ];
+       executableHaskellDepends = [ base containers deepseq parsec ];
        jailbreak = true;
        homepage = "http://textmining.lt/tex2txt/";
        description = "LaTeX to plain-text conversion";
@@ -126150,10 +129325,11 @@ self: {
        sha256 = "1wy2rr18wsn9q06arrxibahpsnr8bqrzsimmpgwji6nxpzc95x51";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers mtl network-uri pandoc-types parsec syb xml
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
        ];
-       testDepends = [
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
@@ -126171,11 +129347,11 @@ self: {
        pname = "texrunner";
        version = "0.0.1.0";
        sha256 = "1p7q9fz6f56wcm9q0xap17xc2r9a01qf8gdlrbdgryv25fp0lhcs";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring directory filepath io-streams mtl
          process temporary
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit lens test-framework test-framework-hunit
        ];
        description = "Functions for running Tex from Haskell";
@@ -126193,10 +129369,10 @@ self: {
        pname = "text";
        version = "1.2.1.3";
        sha256 = "0gzqx5cpkdhshbz9xss51mpyq23pnf8dwjz4h3irbv2ryaa4qdlq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base binary bytestring deepseq directory ghc-prim HUnit
          integer-gmp QuickCheck quickcheck-unicode random test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -126214,7 +129390,7 @@ self: {
        pname = "text-and-plots";
        version = "0.2.1.0";
        sha256 = "0fjwjdr6pbqfzlyi75apfclsq07qld4yj4h574pgyc22lnk2z9z8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers markdown text
          unordered-containers
        ];
@@ -126229,7 +129405,7 @@ self: {
        pname = "text-binary";
        version = "0.2.1";
        sha256 = "00paqwnngd9l88zhah9wqg4wr41mrs30xm49w8xq337yxcvz48nz";
-       buildDepends = [ base binary text ];
+       libraryHaskellDepends = [ base binary text ];
        homepage = "https://github.com/kawu/text-binary";
        description = "Binary instances for text types";
        license = stdenv.lib.licenses.bsd3;
@@ -126243,7 +129419,7 @@ self: {
        pname = "text-format";
        version = "0.3.1.1";
        sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base double-conversion ghc-prim integer-gmp old-locale text
          time transformers
        ];
@@ -126258,7 +129434,7 @@ self: {
        pname = "text-format-simple";
        version = "1.1.0";
        sha256 = "0iqs3v03kirjczlp7jpqdqzrfvqsbm260g110abkbpbxws3szqhk";
-       buildDepends = [ base MissingH ];
+       libraryHaskellDepends = [ base MissingH ];
        description = "Simple text formatting library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126272,13 +129448,13 @@ self: {
        pname = "text-icu";
        version = "0.7.0.1";
        sha256 = "0y3z5jda7v2iyll2148ivxfd2yhp27d3ryxrspp0cdq394klqxp2";
-       buildDepends = [ base bytestring deepseq text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq text ];
+       librarySystemDepends = [ icu ];
+       testHaskellDepends = [
          array base bytestring deepseq directory ghc-prim HUnit QuickCheck
          random test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
-       extraLibraries = [ icu ];
        homepage = "https://github.com/bos/text-icu";
        description = "Bindings to the ICU library";
        license = stdenv.lib.licenses.bsd3;
@@ -126292,12 +129468,12 @@ self: {
        pname = "text-icu-translit";
        version = "0.1.0.7";
        sha256 = "1qfmkydayqj1knlvfs1l6nq42a4y81k5z2g87lvzafrylyjjd002";
-       buildDepends = [ base text ];
-       testDepends = [
+       libraryHaskellDepends = [ base text ];
+       librarySystemDepends = [ icu ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 text
          text-icu
        ];
-       extraLibraries = [ icu ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) icu;};
@@ -126310,7 +129486,7 @@ self: {
        pname = "text-json-qq";
        version = "0.4.1";
        sha256 = "137m593yz5gl6jj7mi1f9kjsgi1np4n6707aqp94iw0qzxj8hdhg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta json json-qq parsec template-haskell
        ];
        homepage = "http://github.com/finnsson/text-json-qq";
@@ -126327,7 +129503,7 @@ self: {
        pname = "text-latin1";
        version = "0.3";
        sha256 = "1cs09qwkcljbnckakzr1wnpclkzjb0in3nnz6fpjyl4mxp5bqaw9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive data-checked hashable text
        ];
        homepage = "https://github.com/mvv/text-latin1";
@@ -126346,16 +129522,16 @@ self: {
        sha256 = "12r0bcj83qfaaj6q1sw21dh3y4c82rxas1s5nzyn650pfnpvv2mq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring containers dlist
          semigroups transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring QuickCheck quickcheck-simple random semigroups
        ];
        description = "Parser and Printer for LDAP text data stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-locale-encoding" = callPackage
@@ -126364,7 +129540,7 @@ self: {
        pname = "text-locale-encoding";
        version = "0.1.0.2";
        sha256 = "1ls41s45qwrmmac8k1gryvxbhhczqy2wanwanw48m7xnbv52p9fg";
-       buildDepends = [ base bytestring bytestring-handle text ];
+       libraryHaskellDepends = [ base bytestring bytestring-handle text ];
        homepage = "https://github.com/exbb2/text-locale-encoding";
        description = "Encode and decode Text to/from ByteString using TextEncoding";
        license = stdenv.lib.licenses.bsd3;
@@ -126376,8 +129552,8 @@ self: {
        pname = "text-manipulate";
        version = "0.2.0.1";
        sha256 = "0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0";
-       buildDepends = [ base text ];
-       testDepends = [ base tasty tasty-hunit text ];
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base tasty tasty-hunit text ];
        homepage = "https://github.com/brendanhay/text-manipulate";
        description = "Case conversion, word boundary manipulation, and textual subjugation";
        license = "unknown";
@@ -126391,8 +129567,10 @@ self: {
        pname = "text-normal";
        version = "0.2.1.0";
        sha256 = "10cxvn450q2fdjxly72m20x2yikkvwx3dvyqs7b992c2dr1zc1iv";
-       buildDepends = [ base deepseq text text-icu ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base deepseq text text-icu ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        homepage = "https://github.com/joelteon/text-normal.git";
        description = "Unicode-normalized text";
        license = stdenv.lib.licenses.mit;
@@ -126404,11 +129582,11 @@ self: {
      mkDerivation {
        pname = "text-position";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8";
+       revision = "1";
        editedCabalFile = "45fd633a94e0a13dbaeeb1791725a72d185f54027569e967f8006f07df67d586";
-       buildDepends = [ base regex-applicative ];
-       testDepends = [ base QuickCheck regex-applicative ];
+       libraryHaskellDepends = [ base regex-applicative ];
+       testHaskellDepends = [ base QuickCheck regex-applicative ];
        jailbreak = true;
        homepage = "http://rel4tion.org/projects/text-position/";
        description = "Handling positions in text and position-tagging it";
@@ -126423,10 +129601,10 @@ self: {
        pname = "text-printer";
        version = "0.4";
        sha256 = "0jcixgxln4c12nzmj50g3mmslki6f083xjrm9hr6hqvqzffxny5q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pretty semigroups text text-latin1
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/mvv/text-printer";
@@ -126442,8 +129620,10 @@ self: {
        pname = "text-regex-replace";
        version = "0.1.1.0";
        sha256 = "0p8xjw6srlb23giqrb3qay1hd1jq3gd9im0v7fnr8yifc0ri6piz";
-       buildDepends = [ attoparsec base text text-icu ];
-       testDepends = [ base hspec QuickCheck smallcheck text text-icu ];
+       libraryHaskellDepends = [ attoparsec base text text-icu ];
+       testHaskellDepends = [
+         base hspec QuickCheck smallcheck text text-icu
+       ];
        jailbreak = true;
        description = "Easy replacement when using text-icu regexes";
        license = stdenv.lib.licenses.asl20;
@@ -126455,7 +129635,7 @@ self: {
        pname = "text-register-machine";
        version = "0.4.0";
        sha256 = "0g0iihfin5vjfk69r7jjw4vs3l1k3f0kkg3bbc4xqm274vd72bph";
-       buildDepends = [ base containers mtl vector ];
+       libraryHaskellDepends = [ base containers mtl vector ];
        jailbreak = true;
        homepage = "https://github.com/acfoltzer/text-register-machine";
        description = "A Haskell implementation of the 1# Text Register Machine";
@@ -126469,7 +129649,7 @@ self: {
        pname = "text-render";
        version = "0.1.0.2";
        sha256 = "17fgnddp4cfh9l6vlwyq4fnrws56gxxgdvq06fnvz0x8rd0c72wp";
-       buildDepends = [ base classy-prelude mtl parsec text ];
+       libraryHaskellDepends = [ base classy-prelude mtl parsec text ];
        homepage = "http://github.com/thinkpad20/text-render";
        description = "A type class for rendering objects as text, pretty-printing, etc";
        license = stdenv.lib.licenses.mit;
@@ -126486,12 +129666,12 @@ self: {
        pname = "text-show";
        version = "2";
        sha256 = "152nccaz9m337rrv7i6z1vjj73xdcp410fgxcs8imhr125fs6r2z";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base-compat bytestring bytestring-builder containers
          generic-deriving ghc-prim integer-gmp nats semigroups tagged
          template-haskell text transformers void
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base base-compat base-orphans bytestring bytestring-builder
          generic-deriving ghc-prim hspec nats QuickCheck
          quickcheck-instances tagged text transformers transformers-compat
@@ -126514,13 +129694,13 @@ self: {
        pname = "text-show-instances";
        version = "2.0.1";
        sha256 = "1k5lwkfg8vrrmhm0xir1shplygvh2xki2dw13z56xrkkm8ygv3cx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          haskeline hoopl hpc old-locale old-time pretty random semigroups
          tagged template-haskell terminfo text text-show time transformers
          transformers-compat unix unordered-containers vector xhtml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-prim haskeline hoopl hpc hspec old-locale old-time pretty
          QuickCheck quickcheck-instances random semigroups tagged
@@ -126537,11 +129717,11 @@ self: {
      mkDerivation {
        pname = "text-stream-decode";
        version = "0.1.0.5";
-       revision = "1";
        sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy";
+       revision = "1";
        editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd";
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base bytestring deepseq hspec text ];
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base bytestring deepseq hspec text ];
        homepage = "http://github.com/fpco/text-stream-decode";
        description = "Streaming decoding functions for UTF encodings. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -126555,8 +129735,8 @@ self: {
        pname = "text-utf7";
        version = "0.1.0.0";
        sha256 = "0kcbw9gb8mwvc4p10m0g5gplgi38qlnnc0plaw22l1qdkx0k8ilv";
-       buildDepends = [ base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
          base bytestring quickcheck-instances tasty tasty-hunit
          tasty-quickcheck text
        ];
@@ -126573,7 +129753,7 @@ self: {
        pname = "text-xml-generic";
        version = "0.1.1";
        sha256 = "1w3gqv94yj1j71qhs1s6sxnxax8ahxwsz7brv0w79sg3r9akl31h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers haskell98 mtl not-in-base split syb
          template-haskell xml
        ];
@@ -126589,7 +129769,7 @@ self: {
        pname = "text-xml-qq";
        version = "0.1";
        sha256 = "0311in43n89bk1fg4y9qglvbbl47ygvcvr0f7zpr8bpaqbb1ard5";
-       buildDepends = [ base parsec template-haskell xml ];
+       libraryHaskellDepends = [ base parsec template-haskell xml ];
        homepage = "http://www.github.com/finnsson/text-xml-qq";
        description = "Quasiquoter for xml. XML DSL in Haskell.";
        license = stdenv.lib.licenses.bsd3;
@@ -126602,7 +129782,7 @@ self: {
        pname = "text-zipper";
        version = "0.2.1";
        sha256 = "1a4kzn2s0ah1sizbdj6fks8zb4wmsx8cqjml4id9xj94zp4akq2r";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        description = "A text editor zipper library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126615,8 +129795,8 @@ self: {
        pname = "text1";
        version = "0.0.3";
        sha256 = "0l3xh8hv5xwfib63llikhnp4w3jx8nwc2rmj4sy7yd5acxgj39sc";
-       buildDepends = [ base binary lens semigroups text ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary lens semigroups text ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/text1";
@@ -126630,7 +129810,7 @@ self: {
        pname = "textPlot";
        version = "0.2";
        sha256 = "0sy5lf5aa3yl3wy199ifb14cnkq5xghcv8m9ny9vzhyyk00h0j6y";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Plot functions in text";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126644,7 +129824,7 @@ self: {
        sha256 = "1q47s8z6igi21m4gqbyizlgiq1z7frk9pi4jppckxmpcjs5xd0gk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 process ];
+       executableHaskellDepends = [ base haskell98 process ];
        homepage = "https://github.com/spockz/Haskell-Code-Completion-for-TextMate";
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
        license = stdenv.lib.licenses.mit;
@@ -126659,11 +129839,11 @@ self: {
        pname = "textocat-api";
        version = "0.1.0.0";
        sha256 = "0cljy3s13xqdvxffpp74iwamfvkmq7s49vpc8vpxnq2fvh6bmkx9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit http-conduit http-types resourcet
          text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring conduit http-conduit http-types resourcet
          tasty tasty-hunit text transformers
        ];
@@ -126690,7 +129870,7 @@ self: {
        pname = "tf-random";
        version = "0.5";
        sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
-       buildDepends = [ base primitive random time ];
+       libraryHaskellDepends = [ base primitive random time ];
        description = "High-quality splittable pseudorandom number generator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126701,8 +129881,8 @@ self: {
        pname = "tfp";
        version = "1.0";
        sha256 = "03jf2dk7sgggnr72wk6chxs3l4aycpmnapdjfm5f9i8wr0spga4l";
-       buildDepends = [ base utility-ht ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base utility-ht ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
        description = "Type-level integers, booleans, lists using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -126714,7 +129894,7 @@ self: {
        pname = "tfp-th";
        version = "0.8";
        sha256 = "139dcwvik8yfpl3i71ddjml1xn126qrx1mbxa4mcwfm6q81fvkzm";
-       buildDepends = [ base template-haskell tfp ];
+       libraryHaskellDepends = [ base template-haskell tfp ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
        description = "Template-Haskell code for tfp";
@@ -126732,11 +129912,14 @@ self: {
        sha256 = "0d95nhz5z0zi665h3npcags71zgprgrh7rq86yzn3wamnavlvswn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory hslogger mtl network
          transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary bytestring directory hslogger mtl network transformers
+       ];
+       testHaskellDepends = [
          base hslogger mtl network QuickCheck transformers
        ];
        jailbreak = true;
@@ -126751,7 +129934,7 @@ self: {
        pname = "tga";
        version = "0.2";
        sha256 = "0lpc5z575y7cq03ww2knr5qdkfb36qnim5y1gkh552r9k3pfdjhf";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        description = "Reading and writing of tga image files";
        license = stdenv.lib.licenses.bsd3;
@@ -126766,10 +129949,10 @@ self: {
        pname = "th-alpha";
        version = "0.2.0.2";
        sha256 = "1syp28514wwj2c66jcx89zl5ax311jhywqgpcpqlfapfwqphysgk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mmorph mtl template-haskell th-desugar transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base derive tasty tasty-hunit tasty-quickcheck template-haskell
        ];
        homepage = "https://github.com/jkarni/th-alpha";
@@ -126783,7 +129966,7 @@ self: {
        pname = "th-build";
        version = "0.4.0.0";
        sha256 = "0f16cgwkmqhkm5nxyic0f56swzm96yqmagmbh7vjd203mn9zv9z6";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/DanielSchuessler/th-build";
        description = "More convenient construction of TH ASTs";
@@ -126800,12 +129983,12 @@ self: {
        pname = "th-context";
        version = "0.22";
        sha256 = "0zzrb5dzxcn2dxhqniv3nx4kasgpx7mck730y9hgjink58wqsdx4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default haskell-src-exts lens mtl
          mtl-unleashed syb template-haskell th-desugar th-orphans
          th-typegraph
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers deepseq ghc-prim hspec hspec-core
          lens mtl mtl-unleashed syb template-haskell text th-desugar
          th-orphans th-reify-many th-typegraph
@@ -126813,7 +129996,6 @@ self: {
        homepage = "https://github.com/seereason/th-context";
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-desugar" = callPackage
@@ -126824,10 +130006,10 @@ self: {
        pname = "th-desugar";
        version = "1.5.4";
        sha256 = "1dwp77gys84bb0v2af33knhwnj37rg5r662d9kcvhvqk5z4i6c68";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl syb template-haskell th-lift th-orphans
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec HUnit mtl syb template-haskell th-lift
          th-orphans
        ];
@@ -126842,8 +130024,8 @@ self: {
        pname = "th-expand-syns";
        version = "0.3.0.6";
        sha256 = "03qv93pyqk8all39knsf0mzmbfdck5x61kqnyn8rbisw5c1ymx6j";
-       buildDepends = [ base containers syb template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base containers syb template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126854,7 +130036,7 @@ self: {
        pname = "th-extras";
        version = "0.0.0.2";
        sha256 = "15sqf2jjnqcssq8hp80fk0ysgwqykjjc31gvvmzg4sypskpjs8cl";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/mokus0/th-extras";
        description = "A grab bag of functions for use with Template Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -126866,7 +130048,7 @@ self: {
        pname = "th-fold";
        version = "0.0.0.1";
        sha256 = "10n1aw74xi5gzs1847dhiv6yjxcz99idw91hvf34zhhs8hp8zf2z";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://code.haskell.org/~mokus/th-fold";
        description = "TH fold generator";
        license = stdenv.lib.licenses.publicDomain;
@@ -126878,7 +130060,7 @@ self: {
        pname = "th-inline-io-action";
        version = "0.1.0.0";
        sha256 = "1yvxi3n1nafr37zmj0dd83sf2jq4c0sss34k4q5f64vrai8a6zwg";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/tolysz/inline-io-action";
        description = "Simple inline IO action into compiled code using TH";
        license = stdenv.lib.licenses.bsd3;
@@ -126892,11 +130074,11 @@ self: {
        pname = "th-instance-reification";
        version = "0.1.4";
        sha256 = "0cnq7qxqpc58a59iv8sfqrkhx9wkzpgn9l7r84kh0xa21w16inki";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers list-extras loch-th placeholders template-haskell
          th-expand-syns
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HTF list-extras loch-th placeholders
          template-haskell th-expand-syns
        ];
@@ -126916,11 +130098,11 @@ self: {
        pname = "th-instances";
        version = "0.1.0.14";
        sha256 = "1izamc2j1zjyrvzns7kj1mcma4bbmyd3sagbzxsyi4ja8kszcy0v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base checkers derive mtl QuickCheck template-haskell th-kinds
          th-lift
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers DebugTraceHelpers derive HUnit mtl QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-kinds th-lift
@@ -126936,7 +130118,7 @@ self: {
        pname = "th-kinds";
        version = "0.1.1";
        sha256 = "0d8n0wnygdyi9qhkr7418f0227r3dcjwvmfhpw0kslryz0vqyf5b";
-       buildDepends = [ base containers mtl template-haskell ];
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
        jailbreak = true;
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -126949,8 +130131,8 @@ self: {
        pname = "th-lift";
        version = "0.7.2";
        sha256 = "0jl2x09mh9frsx5bccw8m4m3h72bncjaix9ylyfpvizisivj8p3m";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/mboes/th-lift";
        description = "Derive Template Haskell's Lift class for datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -126964,10 +130146,10 @@ self: {
        pname = "th-lift-instances";
        version = "0.1.5";
        sha256 = "1j9j70344mi77923v78v3hfhwn72cpq92i87rqd7alvbhkhcny8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers template-haskell text th-lift vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory doctest filepath QuickCheck
          template-haskell text vector
        ];
@@ -126985,10 +130167,10 @@ self: {
        pname = "th-orphans";
        version = "0.12.2";
        sha256 = "0435l20vzsr6p4app6riyf242hcqizbypf4f5v17wjy3ihw0jddb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl nats template-haskell th-lift th-reify-many
        ];
-       testDepends = [ base hspec template-haskell ];
+       testHaskellDepends = [ base hspec template-haskell ];
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127001,16 +130183,15 @@ self: {
        pname = "th-printf";
        version = "0.3.1";
        sha256 = "089grlpavvqv90graa9rdwg9x1ph484g5bj7sfjklqy8mgwwqg7a";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring template-haskell text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec HUnit QuickCheck template-haskell text
        ];
        homepage = "https://github.com/joelteon/th-printf";
        description = "Compile-time printf";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-reify-many" = callPackage
@@ -127021,10 +130202,10 @@ self: {
        pname = "th-reify-many";
        version = "0.1.3";
        sha256 = "00hryljcs434wcv1vaamfdbjk857f46djxv7mlwplkl3zsmfhlfx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl safe template-haskell th-expand-syns
        ];
-       testDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/mgsloan/th-reify-many";
        description = "Recurseively reify template haskell datatype info";
        license = stdenv.lib.licenses.bsd3;
@@ -127036,7 +130217,7 @@ self: {
        pname = "th-sccs";
        version = "0.0.0.20110723";
        sha256 = "0vrjqwdjv2922kqmh57ypbslbv1m829wag78addqsr4vjd9b3zl6";
-       buildDepends = [ base containers template-haskell ];
+       libraryHaskellDepends = [ base containers template-haskell ];
        description = "Binding group analysis in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127051,11 +130232,11 @@ self: {
        pname = "th-typegraph";
        version = "0.27";
        sha256 = "1v7vic9kfig9flcnqcpzazd1s4wgqiz3mj9gcyc1ijkrd4y83cdr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
          mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers data-default deepseq ghc-prim
          hspec hspec-core lens mtl mtl-unleashed syb template-haskell text
          th-desugar th-orphans th-reify-many
@@ -127076,16 +130257,20 @@ self: {
        sha256 = "1859hbhznmp7x8kbqzrpyhndfy69jg01qrp1vh67557mznari6d8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bytestring either http-client http-client-tls
          http-types mtl text text-binary time time-locale-compat
          transformers
        ];
-       testDepends = [ base bytestring tasty tasty-hunit text time ];
+       executableHaskellDepends = [
+         base text time time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit text time
+       ];
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "themplate" = callPackage
@@ -127096,12 +130281,12 @@ self: {
      mkDerivation {
        pname = "themplate";
        version = "1.2";
-       revision = "1";
        sha256 = "0ingf6f4d2a93jdcw0lij7l02gr7mfk97svhda94wx0k1lmj2li3";
+       revision = "1";
        editedCabalFile = "9562873914a204ed7daf91844f70592385a93b6c348798dc8772b439436ca109";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base configurator directory either errors filepath
          optparse-applicative text transformers transformers-compat
        ];
@@ -127118,7 +130303,7 @@ self: {
        pname = "theoremquest";
        version = "0.0.0";
        sha256 = "05z0jppjbw70rlyh2qis27xp8vdx9fgn7i22ckxb0m2y75gffq61";
-       buildDepends = [ base HTTP json utf8-string ];
+       libraryHaskellDepends = [ base HTTP json utf8-string ];
        jailbreak = true;
        description = "A common library for TheoremQuest, a theorem proving game";
        license = stdenv.lib.licenses.bsd3;
@@ -127132,7 +130317,7 @@ self: {
        sha256 = "0kdfbz5sa2gcy9znz4c2hnyni01vpabixrclg2gs7awysw8hiy3a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HTTP network theoremquest ];
+       executableHaskellDepends = [ base HTTP network theoremquest ];
        jailbreak = true;
        description = "A simple client for the TheoremQuest theorem proving game";
        license = stdenv.lib.licenses.bsd3;
@@ -127146,10 +130331,10 @@ self: {
      mkDerivation {
        pname = "these";
        version = "0.4.2";
-       revision = "1";
        sha256 = "0hs59i07k1lkynvdpymjvl1va2frc3aq6wyrmbi7mz3vmz0bjcp7";
+       revision = "1";
        editedCabalFile = "02eb71fed8c848cc4f94f1181f09a6f9667caac38746f757bd57ca881aa47629";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers mtl profunctors semigroupoids semigroups
          transformers vector
        ];
@@ -127165,7 +130350,7 @@ self: {
        pname = "thespian";
        version = "0.999";
        sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://bitbucket.org/alinabi/thespian";
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -127177,7 +130362,7 @@ self: {
        pname = "theta-functions";
        version = "1.0.1";
        sha256 = "0m9k1b75ja5a6vq7jdqzsbqjc4fh1kzy29rzss08ph6700bm6z8f";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/hijarian/theta-functions";
        description = "Theta-functions implemented as trigonometric series";
        license = stdenv.lib.licenses.publicDomain;
@@ -127191,7 +130376,7 @@ self: {
        sha256 = "0ir8z7al3fxjwq5nb05l136k7vp82ag6khcyf9bvjcymlra4cs0m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        homepage = "http://web.cecs.pdx.edu/~mpj/thih/";
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -127208,7 +130393,7 @@ self: {
        sha256 = "1pjz6rnbm1llxgp47fasv40w2vg197z582vf9mm7rhm5qjp25zi0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base edit-distance parseargs phonetic-code sqlite
        ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/thimk";
@@ -127224,10 +130409,10 @@ self: {
      mkDerivation {
        pname = "thorn";
        version = "0.2";
-       revision = "1";
        sha256 = "1krxfsgj4ciifg76khsl4lw1nb40xx4gs07nwd84ail85s394h1h";
+       revision = "1";
        editedCabalFile = "d19e959e95f55075f6f4f0013cbc980e2c351c871e3d9d5bbe2febafb7711b9a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers contravariant mtl profunctors random
          template-haskell
        ];
@@ -127243,8 +130428,8 @@ self: {
        pname = "thread-local-storage";
        version = "0.1.0.3";
        sha256 = "0ka6xrxzsw2z95qcc4v2hh4ldb22zkd5s62lns3v1853g4dw7k3l";
-       buildDepends = [ base containers ];
-       testDepends = [ atomic-primops base containers ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ atomic-primops base containers ];
        description = "Several options for thread-local-storage (TLS) in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127257,7 +130442,7 @@ self: {
        sha256 = "18zr8k9sldbkvs5yw0ann92amri6dv2n8wws87lcqxgs52sw6pwi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        homepage = "http://bjaress.blogspot.com/";
        description = "Runs other programs in the manner of a thread pool";
        license = "GPL";
@@ -127269,7 +130454,7 @@ self: {
        pname = "threadmanager";
        version = "0.1.7";
        sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127282,8 +130467,8 @@ self: {
        pname = "threads";
        version = "0.5.1.3";
        sha256 = "04b4hjwv38iv48hdaxrw8ngrid6pgia32h6vci80szgpjxslrg82";
-       buildDepends = [ base stm ];
-       testDepends = [
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
          base concurrent-extra HUnit stm test-framework test-framework-hunit
        ];
        homepage = "https://github.com/basvandijk/threads";
@@ -127297,7 +130482,7 @@ self: {
        pname = "threads-pool";
        version = "0.1";
        sha256 = "1x1yafxaaf8r02cqipqnm9shj74kja1bqdp0d1cq5kdhcnh22xkz";
-       buildDepends = [ base containers mtl stm ];
+       libraryHaskellDepends = [ base containers mtl stm ];
        description = "A library to operate with pool of haskell's IO threads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127313,8 +130498,11 @@ self: {
        sha256 = "1iipljryqj1g06bqmlyvkxagq7l3rfx7w5d1ci5dw22qsrijnkmn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base retry stm time unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base retry stm time unordered-containers
+       ];
+       executableHaskellDepends = [ base stm time unordered-containers ];
+       testHaskellDepends = [
          base bytestring QuickCheck retry stm tasty tasty-hunit
          tasty-quickcheck time transformers
        ];
@@ -127332,11 +130520,10 @@ self: {
        sha256 = "1dpxgzm29p07iy17hkfzki4c9ckhwx4acvjhlwxmpmaj2a1m6mnc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary cairo containers deepseq filepath ghc-events glib
          gtk mtl pango text time unix
        ];
-       configureFlags = [ "--ghc-options=-rtsopts" ];
        homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -127350,7 +130537,7 @@ self: {
        pname = "threefish";
        version = "0.2.6";
        sha256 = "1v4vxm2yb7wmzkh9rsf5b6m04wjmy7yr7jq49b5msddjdzhfmf91";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal crypto-api data-default entropy random
          tagged
        ];
@@ -127371,7 +130558,7 @@ self: {
        sha256 = "04qrwvzz705s8aqb8f5vgakh78rv1w64ldv2mvm6fg3llfl5nlfd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          filepath hashable network-uri safe snap-core snap-server stm
          template-haskell text transformers unordered-containers vault
@@ -127392,7 +130579,7 @@ self: {
        pname = "thrift";
        version = "0.9.2";
        sha256 = "1c8x66agbbrcsk08i9ha3h9kdq97lnz8sby7xsjx84v5f6kmd7a4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring containers ghc-prim hashable HTTP
          network network-uri QuickCheck split text unordered-containers
          vector
@@ -127409,7 +130596,7 @@ self: {
        pname = "thrist";
        version = "0.3.0.2";
        sha256 = "01y4s5mpk7d0y878fr40j9k19dryj37am9g86v2s9lr5d0q2nnqp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://heisenbug.blogspot.com/search/label/thrist";
        description = "Type-threaded list";
        license = stdenv.lib.licenses.bsd3;
@@ -127432,7 +130619,7 @@ self: {
        pname = "through-text";
        version = "0.1.0.0";
        sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk";
-       buildDepends = [ base bytestring case-insensitive text ];
+       libraryHaskellDepends = [ base bytestring case-insensitive text ];
        homepage = "https://www.github.com/bergmark/through-text";
        description = "Convert textual types through Text without needing O(n^2) instances";
        license = stdenv.lib.licenses.bsd3;
@@ -127444,7 +130631,7 @@ self: {
        pname = "thumbnail";
        version = "0.8.0";
        sha256 = "1ms7pzw4lrpkpv6sb0l7jvw5a0n5j7fc9wyi28bq7ik22d4sc8kd";
-       buildDepends = [ base bytestring gd ];
+       libraryHaskellDepends = [ base bytestring gd ];
        homepage = "https://github.com/cutsea110/thumbnail";
        description = "generate thumbnail image";
        license = stdenv.lib.licenses.bsd3;
@@ -127459,11 +130646,11 @@ self: {
        pname = "thumbnail-plus";
        version = "1.0.5";
        sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra data-default directory either
          gd imagesize-conduit resourcet temporary transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-extra data-default directory hspec resourcet
          transformers
        ];
@@ -127474,7 +130661,7 @@ self: {
 
   "thyme" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , containers, cpphs, deepseq, directory, filepath, mtl, old-locale
+     , containers, deepseq, directory, filepath, mtl, old-locale
      , profunctors, QuickCheck, random, system-posix-redirect, text
      , time, vector, vector-space, vector-th-unbox
      }:
@@ -127482,17 +130669,16 @@ self: {
        pname = "thyme";
        version = "0.3.5.5";
        sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers deepseq mtl old-locale
          profunctors QuickCheck random text time vector vector-space
          vector-th-unbox
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring Cabal containers directory filepath mtl
          old-locale profunctors QuickCheck random system-posix-redirect text
          time vector-space
        ];
-       buildTools = [ cpphs ];
        homepage = "https://github.com/liyang/thyme";
        description = "A faster time library";
        license = stdenv.lib.licenses.bsd3;
@@ -127511,11 +130697,13 @@ self: {
        sha256 = "1ns1gsjqq1xcdxqw7xplcax88ydfx8pn6id42n5idmcbgxkjzm9p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base blaze-html blaze-markup containers dbus directory gtk
-         gtk-traymanager happstack-server network network-uri process random
-         split text transformers utf8-string webkit xdg-basedir xmonad
-         xmonad-contrib
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup dbus utf8-string xmonad xmonad-contrib
+       ];
+       executableHaskellDepends = [
+         aeson base containers dbus directory gtk gtk-traymanager
+         happstack-server network network-uri process random split text
+         transformers webkit xdg-basedir
        ];
        homepage = "https://github.com/koterpillar/tianbar";
        description = "A desktop bar based on WebKit";
@@ -127531,7 +130719,7 @@ self: {
        sha256 = "0bdls2xz281zdxq5z6vbkahmf6bpiqr0ra823j21783jwiyh8j01";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base glade gtk haskell98 ];
+       executableHaskellDepends = [ base glade gtk haskell98 ];
        homepage = "http://ecks.homeunix.net";
        description = "Useful if reading \"Why FP matters\" by John Hughes";
        license = stdenv.lib.licenses.bsd3;
@@ -127547,11 +130735,11 @@ self: {
        pname = "tickle";
        version = "0.0.4";
        sha256 = "11zm6fwnykp6hlfp9d4xcvcvmczj5x77sfkkx6v1gwz3qfkf2qcj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring lens mtl semigroupoids semigroups
          transformers validation
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/nicta/tickle";
@@ -127568,7 +130756,7 @@ self: {
        pname = "tidal";
        version = "0.5.3";
        sha256 = "09bq5ng0wvl1rcaaaw0p2b84f9sddpmabaf9c72ifw3z9k35cfyw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
          websockets
@@ -127586,7 +130774,7 @@ self: {
        pname = "tidal-midi";
        version = "0.0.2";
        sha256 = "0q3g4qgzpd8p4z3l1npcs0gy14967l3yn4xqingdbcq22xasim6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers hashable hosc PortMidi process tidal
          time
        ];
@@ -127601,7 +130789,7 @@ self: {
        pname = "tidal-vis";
        version = "0.1.8";
        sha256 = "1j9a4sgvji2wc9kq9xf0ja45b9md4v1xlanh6cfqk8p0b2qgmcrw";
-       buildDepends = [ base cairo colour tidal ];
+       libraryHaskellDepends = [ base cairo colour tidal ];
        homepage = "http://yaxu.org/tidal/";
        description = "Visual rendering for Tidal patterns";
        license = stdenv.lib.licenses.gpl3;
@@ -127613,12 +130801,11 @@ self: {
        pname = "tie-knot";
        version = "0.2";
        sha256 = "1iksr5h6cyyl88z35fbaskriv4vhc1696d3i1i3c171c0vq0hwg4";
-       buildDepends = [ base containers mtl recursion-schemes ];
+       libraryHaskellDepends = [ base containers mtl recursion-schemes ];
        jailbreak = true;
        homepage = "https://github.com/ppetr/tie-knot";
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tiempo" = callPackage
@@ -127627,7 +130814,7 @@ self: {
        pname = "tiempo";
        version = "0.0.1.0";
        sha256 = "1gmaiiwcbn3z3zmhgii7q3922c2rwdgkjsc4104gyzjm2m08998r";
-       buildDepends = [ base deepseq time ];
+       libraryHaskellDepends = [ base deepseq time ];
        jailbreak = true;
        homepage = "http://github.com/HaskVan/tiempo";
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
@@ -127643,7 +130830,9 @@ self: {
        sha256 = "1llmizacz4sg77l5yi3f9m9xkckl1mpjh0ly20cbqf5747q354q1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers uuagc uuagc-cabal uulib ];
+       executableHaskellDepends = [
+         array base containers uuagc uuagc-cabal uulib
+       ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Tiger Compiler of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
@@ -127658,7 +130847,7 @@ self: {
        pname = "tightrope";
        version = "0.2.0.0";
        sha256 = "1vvzfsl166qhg0ykq71rzavllid216f6fg5xrk2454z9zskc9n60";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-types lens mtl text wai
          wai-extra wreq
        ];
@@ -127675,7 +130864,7 @@ self: {
        pname = "tighttp";
        version = "0.0.0.8";
        sha256 = "0xbipgy79pivy69a84lrriw7ams60r1a2rrkqy6llhsw4v2qk497";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring handle-like monads-tf old-locale papillon
          simple-pipe time
        ];
@@ -127692,7 +130881,7 @@ self: {
        pname = "tilings";
        version = "0.1";
        sha256 = "03a9bc4zbfb3c0dd75rxj7h9pj3sc23l9a9gmabcww5nsx8kpjys";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://gitorious.org/tilings";
        description = "substitution tilings";
        license = stdenv.lib.licenses.bsd3;
@@ -127708,10 +130897,10 @@ self: {
        sha256 = "0x2yc57g9g5ii14l65xkly55rhx44nfjqnbl4bqf286mqsgz191j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring bzlib filepath haskell98 mtl pretty
        ];
-       buildTools = [ happy ];
+       executableToolDepends = [ happy ];
        homepage = "http://www.timber-lang.org";
        description = "The Timber Compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -127726,8 +130915,8 @@ self: {
        pname = "time";
        version = "1.5.0.1";
        sha256 = "0knixcmdsl2jhjw0x6is02yrw6dhjn4gr3fh06adc003gc3wr894";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base deepseq QuickCheck test-framework test-framework-quickcheck2
          unix
        ];
@@ -127742,7 +130931,7 @@ self: {
        pname = "time-compat";
        version = "0.1.0.3";
        sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr";
-       buildDepends = [ base old-time time ];
+       libraryHaskellDepends = [ base old-time time ];
        homepage = "http://hub.darcs.net/dag/time-compat";
        description = "Compatibility with old-time for the time package";
        license = stdenv.lib.licenses.bsd3;
@@ -127754,7 +130943,7 @@ self: {
        pname = "time-extras";
        version = "1.1.4";
        sha256 = "1k9adm922l431gyk8figx5df1n2xk5awir2fpijnvvyphrwk5p3l";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        homepage = "http://semantic.org/TimeLib/";
        description = "Data instances for the time package";
@@ -127773,7 +130962,12 @@ self: {
        sha256 = "0y73axrlm6lh8150i4av0jza18zpd5fiiqv9y5m8a7xx11a386bm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bindings-DSL containers convertible
+         data-default deepseq fclabels mtl old-locale QuickCheck random text
+         time timezone-olson
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bindings-DSL containers convertible
          data-default deepseq fclabels mtl old-locale QuickCheck random text
          time timezone-olson
@@ -127792,12 +130986,12 @@ self: {
        pname = "time-http";
        version = "0.5";
        sha256 = "0jbiawi14p8cgcxvr5b38kyjdmhq1lagr1dqnlpymlv7d7pcxljd";
-       buildDepends = [
+       libraryHaskellDepends = [
          ascii attempt attoparsec base base-unicode-symbols blaze-builder
          blaze-textual bytestring convertible-text data-default failure
          tagged time
        ];
-       testDepends = [
+       testHaskellDepends = [
          ascii attempt attoparsec base base-unicode-symbols blaze-builder
          blaze-textual bytestring convertible-text data-default failure
          QuickCheck tagged time
@@ -127815,7 +131009,7 @@ self: {
        pname = "time-io-access";
        version = "0.1.0.0";
        sha256 = "0n05lw6zpcfr3lwy2qn7v0j3ym1la9x0mak8szaxc2nbkyc8drrb";
-       buildDepends = [ base base-io-access time ];
+       libraryHaskellDepends = [ base base-io-access time ];
        jailbreak = true;
        description = "IO Access for time";
        license = stdenv.lib.licenses.gpl2;
@@ -127827,7 +131021,7 @@ self: {
        pname = "time-lens";
        version = "0.4.0.1";
        sha256 = "0916qfan93aq91icf87ifvskrq6s6s75rhkajvl8pxp74j28hlwz";
-       buildDepends = [ base data-lens-light time ];
+       libraryHaskellDepends = [ base data-lens-light time ];
        description = "Lens-based interface to Data.Time data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127838,7 +131032,7 @@ self: {
        pname = "time-locale-compat";
        version = "0.1.1.0";
        sha256 = "0mdl1i17hcbka8miq1n6mscrr84vnmx5a3mqgwv2yb28k404v815";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
        license = stdenv.lib.licenses.bsd3;
@@ -127850,7 +131044,7 @@ self: {
        pname = "time-patterns";
        version = "0.1.3.1";
        sha256 = "17gfin2bd6zsk3ij4hdh5xddlki0kb05mq9xkmvly9ka39gsr82n";
-       buildDepends = [ base intervals lens thyme vector-space ];
+       libraryHaskellDepends = [ base intervals lens thyme vector-space ];
        jailbreak = true;
        homepage = "https://bitbucket.org/jfmueller/time-patterns";
        description = "Patterns for recurring events";
@@ -127866,8 +131060,10 @@ self: {
        pname = "time-qq";
        version = "0.0.0.2";
        sha256 = "0zpgs5xmjq4fk5djg438fpyh3582v22rjrpqhdr3qy81gcqbgaz7";
-       buildDepends = [ base template-haskell time time-locale-compat ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [
+         base template-haskell time time-locale-compat
+       ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/christian-marie/time-qq";
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
@@ -127880,11 +131076,11 @@ self: {
      mkDerivation {
        pname = "time-recurrence";
        version = "0.9.2";
-       revision = "1";
        sha256 = "1arqmkagmswimbh78qfz5bcilk9i14w29j4vf4i89d00vac3vrzm";
+       revision = "1";
        editedCabalFile = "7f1fe44ec61160e3fba86a04942d056ac91faa0002817e107e3d8399b71fe427";
-       buildDepends = [ base data-ordlist mtl time ];
-       testDepends = [
+       libraryHaskellDepends = [ base data-ordlist mtl time ];
+       testHaskellDepends = [
          base data-ordlist HUnit mtl old-locale test-framework
          test-framework-hunit time
        ];
@@ -127902,7 +131098,8 @@ self: {
        sha256 = "1j6xrf45i4japgr35kzqcawlhdn13k3fbsjfmm2j3j92skwra095";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
+       executableHaskellDepends = [ base ];
        description = "Time series analysis";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127914,7 +131111,7 @@ self: {
        pname = "time-units";
        version = "1.0.0";
        sha256 = "16g0i6r6vj9w4lbn12jqrhgbbjjca8wbzq6546dz08aks1yrk0g1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/acw/time-units";
        description = "A basic library for defining units of time as types";
        license = stdenv.lib.licenses.bsd3;
@@ -127928,7 +131125,7 @@ self: {
        sha256 = "12hnvhcv18kv1djqn5dqv8i1rrzsxlvnsjyjsy9m1ngmr9nvvfbg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base convertible parsec time ];
+       libraryHaskellDepends = [ base convertible parsec time ];
        jailbreak = true;
        homepage = "http://cielonegro.org/W3CDateTime.html";
        description = "Parse, format and convert W3C Date and Time";
@@ -127944,7 +131141,7 @@ self: {
        sha256 = "05nzfydzn9nmjfmdnpf5jl238kdixbwwqkyrax89i4anmpxv1v9s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskeline uu-parsinglib ];
+       executableHaskellDepends = [ base haskeline uu-parsinglib ];
        homepage = "https://github.com/chriseidhof/TimeCalc";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127958,7 +131155,7 @@ self: {
        sha256 = "0zmrysri8hxxvr4dffmawv5cb8lyz92w8ixfj5kah8ya2p422yc0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process time ];
+       executableHaskellDepends = [ base process time ];
        jailbreak = true;
        description = "Time commands by lines of STDOUT";
        license = stdenv.lib.licenses.gpl2;
@@ -127970,7 +131167,7 @@ self: {
        pname = "timeit";
        version = "1.0.0.0";
        sha256 = "0dkjbp636dp882zlbwvvz76k4g7ga28wksd41w6mh0k8z45xjj5x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Time a computation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127983,8 +131180,8 @@ self: {
        pname = "timeout";
        version = "0.1.1";
        sha256 = "1jddkkmc3d8ysh8rnlpkzvlg67if8c71wqmjdsysddpwwm3wbgjn";
-       buildDepends = [ base exceptions mtl time ];
-       testDepends = [
+       libraryHaskellDepends = [ base exceptions mtl time ];
+       testHaskellDepends = [
          base exceptions mtl QuickCheck tasty tasty-quickcheck time
        ];
        homepage = "https://github.com/lambda-llama/timeout";
@@ -128001,7 +131198,7 @@ self: {
        pname = "timeout-control";
        version = "0.1";
        sha256 = "1w2y39699zsxv43w53q8qbi1wfvg14kqvxqfp92pisvxnrwpcisp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim lifted-base monad-control mtl transformers-base
        ];
        jailbreak = true;
@@ -128017,7 +131214,7 @@ self: {
        pname = "timeout-with-results";
        version = "0.2";
        sha256 = "1y5mc1awahcp9xpmmwqc74cfn7g0zm1cyxi396xirll8nk335nd0";
-       buildDepends = [ base deepseq mtl parallel ];
+       libraryHaskellDepends = [ base deepseq mtl parallel ];
        homepage = "https://github.com/ppetr/timeout-with-results";
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
@@ -128031,7 +131228,7 @@ self: {
        pname = "timeparsers";
        version = "0.3.2";
        sha256 = "1dicp58f2amn5rgmnlfjpv4aj7ak6jrdlba2marglddvj4ycq1h7";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers convertible mtl time
        ];
        jailbreak = true;
@@ -128051,7 +131248,7 @@ self: {
        sha256 = "01px3hyl5hb114jibjr3p6pda6ppvxv2alk31wwc82dywnjp1srx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bytestring-lexing cairo Chart Chart-cairo colour
          containers data-default lens regex-tdfa strptime template-haskell
          time transformers vcs-revision
@@ -128071,14 +131268,15 @@ self: {
        pname = "timerep";
        version = "2.0.0.1";
        sha256 = "0rk3svwx7axp77v92j1gpmnni0jlniw3sz55q5hpa6k43d2jr4b8";
-       buildDepends = [ attoparsec base monoid-subclasses text time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         attoparsec base monoid-subclasses text time
+       ];
+       testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck text time
        ];
        homepage = "https://github.com/HugoDaniel/timerep";
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -128089,7 +131287,7 @@ self: {
        pname = "timers";
        version = "0.2.0.3";
        sha256 = "0q4w41jdhf5ildcdl94lgfn06fg275hf04dpah3l6vva24d8alj5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control suspend transformers-base
        ];
        description = "Simple package that implements timers";
@@ -128102,7 +131300,7 @@ self: {
        pname = "timers-updatable";
        version = "0.2.0.2";
        sha256 = "1naw59xvbfhgz49qhvgzng4xjf4fzi59gl996pcp5l6s2sbpx4mw";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://github.com/paolino/timers-updatable";
        description = "timers which are updatable in the remaining time";
        license = stdenv.lib.licenses.bsd3;
@@ -128118,7 +131316,7 @@ self: {
        sha256 = "1vn947bbfh7awmz2rxzn2rya439ljjm83rggp6g9v178hxff5aim";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring old-locale process split time transformers
        ];
        homepage = "https://github.com/Peaker/timestamp-subprocess-lines";
@@ -128135,11 +131333,10 @@ self: {
        sha256 = "1qpzk3047ky0lx5riivv9fa418qhwsa5iyy1fb9l7az6ri094qys";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base old-locale time ];
+       executableHaskellDepends = [ base old-locale time ];
        homepage = "https://github.com/kisom/timestamper";
        description = "Read standard input and prepend each line with a timestamp";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timezone-olson" = callPackage
@@ -128149,10 +131346,10 @@ self: {
      mkDerivation {
        pname = "timezone-olson";
        version = "0.1.7";
-       revision = "1";
        sha256 = "1am6vqq3zxrnb444waqfajk3s1wpynw9fszqnk9ww7akf2v5abr3";
+       revision = "1";
        editedCabalFile = "cdd67661d2460ceb1720bcbb194726a57c21b113b9383cd1f1dca91e8e71d652";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring extensible-exceptions time timezone-series
        ];
        homepage = "http://projects.haskell.org/time-ng/";
@@ -128168,7 +131365,7 @@ self: {
        pname = "timezone-olson-th";
        version = "0.1.0.1";
        sha256 = "1xqy4bbkwn03ynvk8dhcmrp37rj1swaskh2si9adb9d5prcibsv1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base template-haskell time timezone-olson timezone-series
        ];
        homepage = "http://github.com/jonpetterbergman/timezone-olson-th";
@@ -128182,7 +131379,7 @@ self: {
        pname = "timezone-series";
        version = "0.1.5.1";
        sha256 = "0mks5s5wdw8fi5hjhf6zbs3pfgy4gsysd1369s41kw4h7aidsi6j";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "http://projects.haskell.org/time-ng/";
        description = "Enhanced timezone handling for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -128194,7 +131391,7 @@ self: {
        pname = "timing-convenience";
        version = "0.1";
        sha256 = "078p6gzzb7f9g68lm3q5806azhrs6li35ras9jnb9gs2r6i0w83j";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        description = "Convenient functions for getting times";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128207,7 +131404,9 @@ self: {
        pname = "tinyMesh";
        version = "0.1.0.0";
        sha256 = "19jpwnk7hmi0mg46nqhyiipz085dkakqwgh17lv9ccvvcirpclm3";
-       buildDepends = [ attoparsec base bytestring hex serialport unix ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring hex serialport unix
+       ];
        jailbreak = true;
        homepage = "http://github.com/mgajda/tinyMesh";
        description = "TinyMesh - communicating with auto-meshing sensor network";
@@ -128221,10 +131420,10 @@ self: {
      mkDerivation {
        pname = "tinylog";
        version = "0.12.1";
-       revision = "1";
        sha256 = "1hh70788d0rd35raybix383s6bb3mnibmmpdxwbqybv2dgmm4jq9";
+       revision = "1";
        editedCabalFile = "b0e1cd3e83f3745355d1183935660d4b02ed152083da7af0ea4f386e155db04d";
-       buildDepends = [
+       libraryHaskellDepends = [
          auto-update base bytestring containers double-conversion
          fast-logger text transformers unix-time
        ];
@@ -128239,8 +131438,8 @@ self: {
        pname = "tinytemplate";
        version = "0.1.1.0";
        sha256 = "19i5vs2kb24hahwahfvn6bldzpcw68lpjlw37yvf2n8s5sq1fibc";
-       buildDepends = [ base text ];
-       testDepends = [ base mtl QuickCheck text ];
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base mtl QuickCheck text ];
        jailbreak = true;
        homepage = "http://github.com/dicomgrid/tinytemplate";
        description = "A tiny text templating library";
@@ -128258,10 +131457,11 @@ self: {
        sha256 = "0za8ls980f98qj3k6pgmzaidmnrlk0nzg1r7skif6jmhh1snqc5h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath geniplate-mirror ghc
-         ghc-paths mtl pretty pretty-show QuickCheck split tip-lib
+         ghc-paths mtl pretty QuickCheck split tip-lib
        ];
+       executableHaskellDepends = [ base pretty pretty-show tip-lib ];
        homepage = "http://tip-org.github.io";
        description = "Convert from Haskell to Tip";
        license = stdenv.lib.licenses.bsd3;
@@ -128277,11 +131477,14 @@ self: {
        sha256 = "01x8hpijgx3fd0svp0di02470xnhq1gaa6k2fxjph9g5rzmx076b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers geniplate-mirror mtl optparse-applicative
-         pretty pretty-show split
+         pretty split
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         base optparse-applicative pretty pretty-show
        ];
-       buildTools = [ alex happy ];
        homepage = "http://tip-org.github.io";
        description = "tons of inductive problems - support library and tools";
        license = stdenv.lib.licenses.bsd3;
@@ -128295,8 +131498,8 @@ self: {
        pname = "titlecase";
        version = "0.1.0.1";
        sha256 = "0qwlcfr7fb5nr9vmfjfdlm3bz65jil8xnxmd54zksp1z3sxz5fhf";
-       buildDepends = [ base blaze-markup semigroups text ];
-       testDepends = [
+       libraryHaskellDepends = [ base blaze-markup semigroups text ];
+       testHaskellDepends = [
          base semigroups tasty tasty-hunit tasty-quickcheck text
        ];
        homepage = "https://github.com/nkaretnikov/titlecase";
@@ -128314,8 +131517,10 @@ self: {
        sha256 = "1svsdjb1ac5mb9zcx3wqmxdjfmf99ph94v616scya5f7lqkjcfgp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty utf8-string vty ];
-       testDepends = [ HUnit test-framework test-framework-hunit ];
+       executableHaskellDepends = [
+         base mtl parsec pretty utf8-string vty
+       ];
+       testHaskellDepends = [ HUnit test-framework test-framework-hunit ];
        homepage = "http://patch-tag.com/r/nonowarn/tkhs/snapshot/current/content/pretty/README";
        description = "Simple Presentation Utility";
        license = stdenv.lib.licenses.bsd3;
@@ -128336,7 +131541,7 @@ self: {
        sha256 = "1xyy1aagbjyjs9d52jmf7xch0831v7hvsb0mfrxpahvqsdac6h7a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring cmdargs conduit
          conduit-extra containers data-default directory exceptions filepath
          http-types mtl resourcet rosezipper shakespeare stm
@@ -128359,7 +131564,7 @@ self: {
        pname = "tld";
        version = "0.1.0.1";
        sha256 = "1lda1h8ibkmnhxhnkfd1kj6aybk5w4s3hzhh379zrqbckdl0vfxb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers network-uri template-haskell text
        ];
        jailbreak = true;
@@ -128377,12 +131582,12 @@ self: {
        pname = "tls";
        version = "1.3.1";
        sha256 = "1l6maasf4pr70cxasn6bwcy2aydlmiadmd28ymz0fp8ifw388zvl";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types async base byteable bytestring cereal
          cryptonite data-default-class memory mtl network transformers x509
          x509-store x509-validation
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal cryptonite data-default-class hourglass mtl
          QuickCheck tasty tasty-quickcheck x509 x509-validation
        ];
@@ -128401,7 +131606,7 @@ self: {
        sha256 = "06hvnyg89n4zplw2p4rnqwyyqc5r204pfdmpvim8y119pllg3mij";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cryptonite data-default-class network pem time tls
          x509 x509-system x509-validation
        ];
@@ -128421,7 +131626,7 @@ self: {
        sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring certificate cipher-aes cipher-rc4 crypto-pubkey
          crypto-random cryptohash mtl network pem time tls vector
        ];
@@ -128440,7 +131645,9 @@ self: {
        sha256 = "101q4f51am8722b0b2d9hk84iqfg1z1shzrbikya63jpf3s6jrvg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory template text ];
+       executableHaskellDepends = [
+         base bytestring directory template text
+       ];
        homepage = "https://www.github.com/michelk/tmpl";
        description = "simple executable for templating";
        license = stdenv.lib.licenses.gpl3;
@@ -128456,7 +131663,7 @@ self: {
        sha256 = "07jhbg8b33h9b0x94di5x8dskm4mq6r7mkjcx6zzcvr26ymmyrmy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory process safe text time yaml
        ];
        jailbreak = true;
@@ -128470,7 +131677,7 @@ self: {
        pname = "tnet";
        version = "0.0.1";
        sha256 = "1hxka8jfybq72isicvav81f4l9hjxhmzx4i4znkqbwzkarg2gsw9";
-       buildDepends = [ attoparsec base bytestring utf8-string ];
+       libraryHaskellDepends = [ attoparsec base bytestring utf8-string ];
        description = "Library for encoding/decoding TNET strings for PGI";
        license = "unknown";
      }) {};
@@ -128482,7 +131689,9 @@ self: {
        pname = "to-haskell";
        version = "0.3.0";
        sha256 = "0glf7m0r9gpab2pg1bq9qa37mrzpjwvqr3xsws6w53qqlcaw54qk";
-       buildDepends = [ base containers haskell-src-exts transformers ];
+       libraryHaskellDepends = [
+         base containers haskell-src-exts transformers
+       ];
        homepage = "https://github.com/conal/to-haskell";
        description = "A type class and some utilities for generating Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -128495,7 +131704,7 @@ self: {
        pname = "to-string-class";
        version = "0.1.2";
        sha256 = "0l2hj0cbc0dhd7m5bn6xqgzkdf2z4knirmv8c65hsjig9mpsvsxf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128507,7 +131716,7 @@ self: {
        pname = "to-string-instances";
        version = "0.2";
        sha256 = "1h5aq3shagzgh1j8sbslvi2rrkqv1djm595d522ci8hpj6h8vxl9";
-       buildDepends = [ to-string-class ];
+       libraryHaskellDepends = [ to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128524,7 +131733,12 @@ self: {
        sha256 = "1wgnxg9kndijm8faxsy48qznjzfcwqgjxgyff6x9c9h2fayvl719";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ansi-terminal base base-unicode-symbols containers data-hash dates
+         directory dyre filepath Glob mtl parsec process regex-pcre syb time
+         utf8-string
+       ];
+       executableHaskellDepends = [
          ansi-terminal base base-unicode-symbols containers data-hash dates
          directory dyre filepath Glob mtl parsec process regex-pcre syb time
          utf8-string
@@ -128543,10 +131757,10 @@ self: {
        pname = "tofromxml";
        version = "0.1.0.2";
        sha256 = "0wqdxr6fijbdzq0767cvi7yf07q6dcv1anzmsv7ms2apcyag63qh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers hexpat hexpat-pickle
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers filepath hexpat hexpat-pickle
        ];
        description = "Reading and writing Haskell data from and to XML";
@@ -128563,7 +131777,7 @@ self: {
        sha256 = "09j6h4rwb6i87223zhbzclns12iyrbdmv0kawd27any5r2hkz63x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers old-locale strict time transformers utility-ht
        ];
        jailbreak = true;
@@ -128579,8 +131793,8 @@ self: {
        pname = "token-bucket";
        version = "0.1.0.1";
        sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii";
-       buildDepends = [ base ];
-       testDepends = [ base time ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base time ];
        homepage = "https://github.com/hvr/token-bucket";
        description = "Rate limiter using lazy bucket algorithm";
        license = stdenv.lib.licenses.gpl3;
@@ -128592,7 +131806,7 @@ self: {
        pname = "tokenify";
        version = "0.1.2.0";
        sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch";
-       buildDepends = [ base containers text ];
+       libraryHaskellDepends = [ base containers text ];
        homepage = "https://github.com/AKST/tokenify";
        description = "A regex lexer";
        license = stdenv.lib.licenses.mit;
@@ -128604,7 +131818,7 @@ self: {
        pname = "tokenize";
        version = "0.3.0";
        sha256 = "1dcimgwy6ik5l6f98b0w6sc7pf06qazckfwf2cbmrd7g0q7lk20f";
-       buildDepends = [ base split text ];
+       libraryHaskellDepends = [ base split text ];
        homepage = "https://bitbucket.org/gchrupala/lingo/overview";
        description = "Simple tokenizer for English text";
        license = stdenv.lib.licenses.bsd3;
@@ -128620,9 +131834,10 @@ self: {
        sha256 = "0y4s68gnp4xw0x22w3kdcr5wnkqygv6ajwkhb8apphja268np98v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers criterion filepath gf haskell98 HUnit
-         iconv progression QuickCheck
+       libraryHaskellDepends = [ base containers haskell98 ];
+       executableHaskellDepends = [
+         base bytestring criterion filepath gf HUnit iconv progression
+         QuickCheck
        ];
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128634,8 +131849,8 @@ self: {
        pname = "tokyocabinet-haskell";
        version = "0.0.5";
        sha256 = "1v6s39q8a6cnc0ggpspz9i0xw6aih4ixn9bhn4hwf9kwgcspardg";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ tokyocabinet ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ tokyocabinet ];
        homepage = "http://tom-lpsd.github.com/tokyocabinet-haskell/";
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
@@ -128649,8 +131864,8 @@ self: {
        pname = "tokyotyrant-haskell";
        version = "1.0.1";
        sha256 = "1xz8n3hgkhrdabwc8hsqj3yf5x112palzz192f6pkl07vi8yz1ph";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ tokyocabinet tokyotyrant ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ tokyocabinet tokyotyrant ];
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
@@ -128662,7 +131877,7 @@ self: {
        pname = "tomato-rubato-openal";
        version = "0.1.0.3";
        sha256 = "0dk7s5fng3vybdqgqn9vqg7k6sjw4zgqld51i926lgqnixgpmw8z";
-       buildDepends = [ base OpenAL stm vector ];
+       libraryHaskellDepends = [ base OpenAL stm vector ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/tomato-rubato";
        description = "Easy to use library for audio programming";
@@ -128677,7 +131892,7 @@ self: {
        pname = "toml";
        version = "0.1.3";
        sha256 = "0wby1jas854niwyac95n39liqc874xcd1ahqpw6ksi2nhv2ld6f2";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers old-locale time
        ];
        jailbreak = true;
@@ -128695,10 +131910,10 @@ self: {
        sha256 = "034npn24nk07hkc6wnfqsxn8msqkgfi8zwvj0yb4rmpgmxq73v60";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal containers deepseq directory filepath QuickCheck
-         random
+       libraryHaskellDepends = [
+         array base containers deepseq directory filepath QuickCheck random
        ];
+       executableHaskellDepends = [ Cabal ];
        homepage = "http://functionalley.eu";
        description = "Utilities used by other packages";
        license = "GPL";
@@ -128714,7 +131929,7 @@ self: {
        sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ALUT array base filepath GLFW-b OpenAL OpenGL parseargs random
        ];
        homepage = "http://home.arcor.de/chr_bauer/topkata.html";
@@ -128729,7 +131944,7 @@ self: {
        pname = "torch";
        version = "0.1";
        sha256 = "1bai1vxd2vfxl9zn37dvrb05yh4knr5gw5syqpi6lxxd3lf0ngzc";
-       buildDepends = [ base mtl parallel QuickCheck ];
+       libraryHaskellDepends = [ base mtl parallel QuickCheck ];
        homepage = "http://patch-tag.com/repo/torch/home";
        description = "Simple unit test library (or framework)";
        license = stdenv.lib.licenses.bsd3;
@@ -128744,7 +131959,7 @@ self: {
        pname = "torrent";
        version = "10000.0.0";
        sha256 = "030ll4m80ljkvq72n1aa8a2ygqa56ykkndzy5g40vh9j9j5vq52r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bencode binary bytestring containers filepath syb
        ];
        description = "BitTorrent file parser and generater";
@@ -128757,7 +131972,7 @@ self: {
        pname = "tostring";
        version = "0.2.1.1";
        sha256 = "0c95a1vjnnn3bwdz8v5hv7q2sbzn23ban3hcwqmwhmzc9ba019zg";
-       buildDepends = [ base case-insensitive text utf8-string ];
+       libraryHaskellDepends = [ base case-insensitive text utf8-string ];
        description = "The ToString class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128768,7 +131983,7 @@ self: {
        pname = "total";
        version = "1.0.4";
        sha256 = "0zl02pznpgg719d2639491cy4df2amj7rmwfdy9dz9cksm029pga";
-       buildDepends = [ base void ];
+       libraryHaskellDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128779,7 +131994,7 @@ self: {
        pname = "total-map";
        version = "0.0.4";
        sha256 = "1gjwviqhxm3zavmb9yd14rv66qhw9cf0r6n8mdg1lkmkqi1ycb98";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/conal/total-map/";
        description = "Finitely represented /total/ maps";
        license = stdenv.lib.licenses.bsd3;
@@ -128793,7 +132008,7 @@ self: {
        pname = "total-maps";
        version = "1.0.0.2";
        sha256 = "0i5xr0xnqazjk5j9lzhdcxlaarij1jwbfih4plfa3kpqygz5s6ps";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base base-compat bytes containers distributive keys
          linear reflection semigroups vector
        ];
@@ -128810,7 +132025,8 @@ self: {
        sha256 = "0lik2glqynjwcd64bdla2jsfy4yqqk4aap5f0c9zkqv9g916bxgi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs directory process time ];
+       libraryHaskellDepends = [ base directory process time ];
+       executableHaskellDepends = [ base cmdargs ];
        description = "Library (and cli) to execute a procedure on file change";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -128832,7 +132048,7 @@ self: {
        sha256 = "01rhq7mz20bjzqpvwwf7z4v77p9kvwgk4pv7gr6264ha30sygbr8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-builder containers
          data-default-class data-interval deepseq exceptions extended-reals
          filepath finite-field ghc-prim hashable heaps intern loop mtl
@@ -128841,7 +132057,12 @@ self: {
          type-level-numbers unbounded-delays unordered-containers
          vector-space
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base bytestring containers data-default-class filepath OptDir
+         parse-dimacs parsec process pseudo-boolean random time
+         unbounded-delays vector-space
+       ];
+       testHaskellDepends = [
          array base containers data-interval finite-field HUnit mtl OptDir
          prettyclass QuickCheck random stm tasty tasty-hunit
          tasty-quickcheck tasty-th vector-space
@@ -128849,7 +132070,6 @@ self: {
        jailbreak = true;
        description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tpdb" = callPackage
@@ -128860,15 +132080,14 @@ self: {
        pname = "tpdb";
        version = "1.2.0";
        sha256 = "12l4a6p8jn03q71d3qi2zkv63k53brmha5hm6dwrp0sb8bv3qmb0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath hashable HaXml hxt mtl parsec text time
          wl-pprint-text
        ];
-       testDepends = [ base bytestring HaXml pretty ];
+       testHaskellDepends = [ base bytestring HaXml pretty ];
        homepage = "https://github.com/jwaldmann/haskell-tpdb";
        description = "Data Type for Rewriting Systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trace" = callPackage
@@ -128879,7 +132098,7 @@ self: {
        pname = "trace";
        version = "0.2.0.0";
        sha256 = "14kzdd62gci1f1wskvvwai9wprkn8mq5wsdz4d5mw6kf7dcxbz41";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq monad-control mtl transformers
          transformers-base
        ];
@@ -128893,7 +132112,7 @@ self: {
        pname = "trace-call";
        version = "0.1";
        sha256 = "1fiz1v9d4ck8na68cywha53vgbgdk6iqad1zv6pj3lq0pwvkx6aw";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        jailbreak = true;
        description = "functions for logging the arguments and results of function calls";
        license = stdenv.lib.licenses.bsd3;
@@ -128905,7 +132124,7 @@ self: {
        pname = "trace-function-call";
        version = "0.1";
        sha256 = "0c5nsq9x59rmdkyvcrr1v94kjya48nhl9pnsad6xdmh77msf33xy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Easy lightweight tracing of function arguments and results for ad hoc debugging";
        license = stdenv.lib.licenses.bsd3;
@@ -128917,7 +132136,7 @@ self: {
        pname = "traced";
        version = "3000";
        sha256 = "1pniabsbybhjvlq4dmys8sxc1r8rhalsahdr3hbvif287h610hi9";
-       buildDepends = [ base containers mtl pretty ];
+       libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Simple evaluation trace";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128928,8 +132147,8 @@ self: {
        pname = "tracer";
        version = "0.1";
        sha256 = "1rgnls2zry29zrnvxv700bljdf7iqkkyzayr4lan0qvhv1bcs5jm";
-       buildDepends = [ base mtl transformers ];
-       testDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
+       testHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/knz/hs-tracer";
        description = "Tracing utilities for Functor/Applicative/Monad types";
        license = stdenv.lib.licenses.bsd3;
@@ -128941,7 +132160,7 @@ self: {
        pname = "tracker";
        version = "0.1";
        sha256 = "1jkcwkkzg3hkvffg6y2vz2c8y0iypij4ngryc4bca9q3g4zvxzs2";
-       buildDepends = [ base containers glib ];
+       libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128958,7 +132177,10 @@ self: {
        sha256 = "1n7vl903p5yg2xcyfxbxj45yd7ayd7p63fr9qfahlb0pgfl32s7h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring http-enumerator http-types uri
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bytestring cmdargs containers http-enumerator
          http-types regexpr text unordered-containers uri
        ];
@@ -128975,7 +132197,7 @@ self: {
        pname = "transactional-events";
        version = "0.1.0.0";
        sha256 = "0jb3cf4bn007x3by70piwcvcb216kvav4xzrqr1k5v483jaj2zml";
-       buildDepends = [ base ListZipper MonadPrompt stm ];
+       libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128991,7 +132213,7 @@ self: {
        sha256 = "1p9nrs7a96n53cmmrv107kvwjm27gj45m9b4vj23dsvk5lsx7wil";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers data-default filepath hashable hint monadplus
          mtl process semigroups
        ];
@@ -129009,9 +132231,11 @@ self: {
        sha256 = "0nmzsd8q01ixfgqfgymbjwa5c8msq7chi16n4dwdf8x68mah7lam";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers criterion mtl multirec parsec QuickCheck regular
-         template-haskell
+       libraryHaskellDepends = [
+         base containers mtl multirec regular template-haskell
+       ];
+       executableHaskellDepends = [
+         base containers criterion mtl multirec parsec QuickCheck
        ];
        description = "Generic representation of tree transformations";
        license = stdenv.lib.licenses.gpl3;
@@ -129023,7 +132247,7 @@ self: {
        pname = "transformers";
        version = "0.4.3.0";
        sha256 = "179sbhvc9dghyw58hz80109pbrzgh7vh437227a51jhmx2bsgl5k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129036,7 +132260,7 @@ self: {
        pname = "transformers-abort";
        version = "0.5.0.1";
        sha256 = "0s0vvjii3h7vw8kg3xf1ig6fkxdw7z69czwdyg6nvsrcc9kbs9gm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class monad-control pointed semigroupoids
          transformers transformers-base
        ];
@@ -129050,10 +132274,12 @@ self: {
      mkDerivation {
        pname = "transformers-base";
        version = "0.4.4";
-       revision = "1";
        sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va";
+       revision = "1";
        editedCabalFile = "fb1a305f29cbf6ac182af7e67efaae9fcb9664d8d9606bb8a7f3414ad4c8d7a4";
-       buildDepends = [ base stm transformers transformers-compat ];
+       libraryHaskellDepends = [
+         base stm transformers transformers-compat
+       ];
        homepage = "https://github.com/mvv/transformers-base";
        description = "Lift computations from the bottom of a transformer stack";
        license = stdenv.lib.licenses.bsd3;
@@ -129065,7 +132291,7 @@ self: {
        pname = "transformers-compat";
        version = "0.4.0.4";
        sha256 = "0lmg8ry6bgigb0v2lg0n74lxi8z5m85qq0qi4h1k9llyjb4in8ym";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
@@ -129077,7 +132303,7 @@ self: {
        pname = "transformers-compose";
        version = "0.1";
        sha256 = "0kvhl5s1js6i639hc6c4ib9jmgy4l1503ifs30a9ajrk97nagp6d";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/aristidb/transformers-compose";
        description = "Arrow-like / category-like composition for transformers";
@@ -129093,8 +132319,8 @@ self: {
        pname = "transformers-convert";
        version = "0.2.0.0";
        sha256 = "0nx99jygbg5jlvb1sbgb9kz84af9861nkjdcshvfhlq8w069z737";
-       buildDepends = [ base data-easy either transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base data-easy either transformers ];
+       testHaskellDepends = [
          base data-easy directory either errors haskell-src-exts hlint hspec
          HUnit QuickCheck text transformers unix
        ];
@@ -129111,7 +132337,7 @@ self: {
        pname = "transformers-free";
        version = "1.0.1";
        sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Free monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129122,7 +132348,7 @@ self: {
        pname = "transformers-lift";
        version = "0.1.0.0";
        sha256 = "0fmd6v8a5r1x66v4cyb0adbajddm3mn1k43ryks01x1c3yw0p0sj";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129133,7 +132359,7 @@ self: {
        pname = "transformers-runnable";
        version = "0.1.0.0";
        sha256 = "0m1vvdfi661mmxm5rghsfnwcjd2r0r7ryc3jk0nwlzs0kaw5xi1s";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/JanBessai/transformers-runnable";
        description = "A unified interface for the run operation of monad transformers";
@@ -129147,7 +132373,7 @@ self: {
        pname = "transformers-supply";
        version = "0.1.0";
        sha256 = "09f9n3cxi3sjmd8yscvcyahvdsqa5db5bckj9ryaflswsdm0ximq";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        description = "Supply applicative, monad, applicative transformer and monad transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129160,7 +132386,7 @@ self: {
        sha256 = "0pv81l5q46a4f2dxps7fdzvmnphydgw7xz3xsi5cjad2kw0dsmkm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base fingertree ];
+       libraryHaskellDepends = [ base fingertree ];
        jailbreak = true;
        description = "Integer sets with a constant time translate operation";
        license = stdenv.lib.licenses.mit;
@@ -129172,7 +132398,7 @@ self: {
        pname = "translate";
        version = "2010.1.24";
        sha256 = "0vcqw0x7c9nb8yigvk35x72rds50kvma02rwkb757y1sk80q0mzf";
-       buildDepends = [ base curl json network utf8-string ];
+       libraryHaskellDepends = [ base curl json network utf8-string ];
        homepage = "http://github.com/nfjinjing/translate";
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
        license = stdenv.lib.licenses.bsd3;
@@ -129185,7 +132411,7 @@ self: {
        pname = "traverse-with-class";
        version = "0.2.0.3";
        sha256 = "0snms19w3n9ni1wmf4ikwpp298nc6qk6phrjxi5g023ihqqdvr6g";
-       buildDepends = [ base template-haskell transformers ];
+       libraryHaskellDepends = [ base template-haskell transformers ];
        description = "Generic applicative traversals";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -129198,7 +132424,7 @@ self: {
        sha256 = "0g7x1jj3x58jgbg6zcakyakc5jskcas03jakj7v5pfwdmk8kbc4m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk process ];
+       executableHaskellDepends = [ base gtk process ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/traypoweroff";
        description = "Tray Icon application to PowerOff / Reboot computer";
@@ -129212,7 +132438,7 @@ self: {
        pname = "tree-monad";
        version = "0.3";
        sha256 = "1zs1qgp908d0y7dm9mhzwl529z2aw24zr8balsvn1lzl1aynzslm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://sebfisch.github.com/tree-monad";
        description = "Non-Determinism Monad for Tree Search";
        license = stdenv.lib.licenses.bsd3;
@@ -129224,7 +132450,7 @@ self: {
        pname = "tree-view";
        version = "0.4";
        sha256 = "0mzywp6nipc6zs98dy4ny2s3r9d745lqpjazfnj5y4hx8swyckgn";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Render trees as foldable HTML and Unicode art";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129237,7 +132463,7 @@ self: {
        pname = "treemap-html";
        version = "0.1";
        sha256 = "0jqjwg3z528z4wchpmi208lazd1nazqdai327lwxvznzjcq1m385";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers filepath ghc html parsec regex-posix
        ];
        jailbreak = true;
@@ -129256,7 +132482,7 @@ self: {
        sha256 = "0a7im8v118plxpi9dcgr1jhdlgj4f2a015dngyzfxqi7ij3cy6bf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers directory filepath ghc parsec regex-posix
          split treemap-html xml
        ];
@@ -129275,8 +132501,11 @@ self: {
        sha256 = "0nz93fn5k5fc9748h60a12j9gsl4ldm11a8y431mrm45jf8hnzq2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl QuickCheck random ];
-       testDepends = [ base containers mtl QuickCheck random ];
+       libraryHaskellDepends = [ base containers mtl QuickCheck random ];
+       executableHaskellDepends = [
+         base containers mtl QuickCheck random
+       ];
+       testHaskellDepends = [ base containers mtl QuickCheck random ];
        homepage = "http://www.haskell.org/haskellwiki/Treeviz";
        description = "Visualization of computation decomposition trees";
        license = stdenv.lib.licenses.bsd3;
@@ -129291,7 +132520,7 @@ self: {
        pname = "tremulous-query";
        version = "1.0.7";
        sha256 = "0vf6fh0p9ng2f0qqac8bqp259hfmv0bg146idm2pv668l1pkr7bx";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq mtl network
        ];
        description = "Library for polling Tremulous servers";
@@ -129318,7 +132547,7 @@ self: {
        pname = "triangulation";
        version = "0.3";
        sha256 = "0lx9y54n6p3xf3z6dzw0b2p87hwb1rrcgzilnl51fwvcs1m0fgdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base collada-types haskell98 tuple vector vector-algorithms
        ];
        homepage = "http://www.dinkla.net/";
@@ -129338,16 +132567,16 @@ self: {
      mkDerivation {
        pname = "trifecta";
        version = "1.5.1.3";
-       revision = "1";
        sha256 = "1yd55bfhdn8ckkf2c5084fsnfwhib229xw9bn2a4lwpkzbbpflxw";
+       revision = "1";
        editedCabalFile = "4aef1e889929b131bcfbc3b111cc865b1c31f86be983aee768adbfeadee03f2a";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
          blaze-markup bytestring charset comonad containers deepseq
          fingertree ghc-prim hashable lens mtl parsers reducers semigroups
          transformers unordered-containers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath parsers QuickCheck
        ];
        homepage = "http://github.com/ekmett/trifecta/";
@@ -129363,7 +132592,7 @@ self: {
        sha256 = "1y559q5p0pzlr468224c6m5859z72gg0sk2vrgl82ilwkjn08i9i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring simpleargs ];
+       executableHaskellDepends = [ base bio bytestring simpleargs ];
        jailbreak = true;
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
@@ -129376,7 +132605,7 @@ self: {
        pname = "trivia";
        version = "0.0";
        sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78";
-       buildDepends = [ base comonad distributive ];
+       libraryHaskellDepends = [ base comonad distributive ];
        homepage = "https://github.com/fumieval/trivia";
        description = "The trivial monad and comonad";
        license = stdenv.lib.licenses.bsd3;
@@ -129387,10 +132616,10 @@ self: {
      mkDerivation {
        pname = "trivial-constraint";
        version = "0.3.0.0";
-       revision = "1";
        sha256 = "0fl72wai6yj5wflhx3cbvi3ixcfrc73217skncyb9b1ai7vg3x3y";
+       revision = "1";
        editedCabalFile = "c2fb0af78c16b340f5dfeb5bf5935250a7f70b72b9b5c07416aee2c8b9138b4b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/leftaroundabout/trivial-constraint";
        description = "Constraints that any type, resp. no type fulfills";
        license = stdenv.lib.licenses.gpl3;
@@ -129402,7 +132631,7 @@ self: {
        pname = "tropical";
        version = "0.0.0.2";
        sha256 = "1in9jjfzbqws4bk83082yra2gcb5b095948qyji63ckbz3igp0k2";
-       buildDepends = [ base semiring-simple ];
+       libraryHaskellDepends = [ base semiring-simple ];
        jailbreak = true;
        description = "A library for tropical mathematics";
        license = stdenv.lib.licenses.bsd3;
@@ -129414,8 +132643,8 @@ self: {
        pname = "true-name";
        version = "0.0.0.1";
        sha256 = "1qp70i08hf7w90zyc4kz9hnyx8qaf925sy8x01r1z3dbxd473dgm";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base containers template-haskell time ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base containers template-haskell time ];
        homepage = "https://github.com/liyang/true-name";
        description = "Template Haskell hack to violate another module's abstractions";
        license = stdenv.lib.licenses.bsd3;
@@ -129430,7 +132659,7 @@ self: {
        sha256 = "0q5civsnjwwhdkb16h8jak7prkfwvhds1p3xzzhwqk2p8dxf6jij";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parseargs WAVE ];
+       executableHaskellDepends = [ base containers parseargs WAVE ];
        homepage = "http://github.com/BartMassey/truelevel";
        description = "Audio file compressor-limiter";
        license = stdenv.lib.licenses.bsd3;
@@ -129447,11 +132676,12 @@ self: {
        sha256 = "0byg9gp6xgdy30mrjdlsijr87d6ivhj35baz5zpjxi6vgn8pa87v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory filemanip hastache http-conduit
          MissingH safe scientific tar text unordered-containers
        ];
-       testDepends = [ base hastache tasty tasty-hunit ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hastache tasty tasty-hunit ];
        homepage = "http://github.com/dbushenko/trurl";
        description = "Haskell template code generator";
        license = stdenv.lib.licenses.bsd3;
@@ -129462,10 +132692,10 @@ self: {
      mkDerivation {
        pname = "tsession";
        version = "0.1";
-       revision = "2";
        sha256 = "1rj11vyd272h66cjx8pq6smcpi65n3vlfv4g7indcnpcz4w5l6rk";
+       revision = "2";
        editedCabalFile = "afd89984a633388a2db5ad107968c92693527eb6f746318c4752993633705e57";
-       buildDepends = [ base containers mtl time transformers ];
+       libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129477,7 +132707,9 @@ self: {
        pname = "tsession-happstack";
        version = "0.1";
        sha256 = "1sv62iqrlvzx95g6nd307y8zknp2h3ir06zc6qw4y221wz21rfyz";
-       buildDepends = [ base happstack-server transformers tsession ];
+       libraryHaskellDepends = [
+         base happstack-server transformers tsession
+       ];
        description = "A Transaction Framework for Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129489,7 +132721,7 @@ self: {
        pname = "tskiplist";
        version = "1.0.0";
        sha256 = "0bayh8fl3wb98mifdiss8crb17jfqxxj0f1va5c2h4l7qwizh85a";
-       buildDepends = [ array base containers random stm ];
+       libraryHaskellDepends = [ array base containers random stm ];
        homepage = "https://github.com/thaldyron/tskiplist";
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
        license = "LGPL";
@@ -129502,7 +132734,7 @@ self: {
        pname = "tslogger";
        version = "0.1.0.0";
        sha256 = "1xybllaxakzlai0ja93fyw8yr0p56g58f5akc5z9pi4w4493c7dl";
-       buildDepends = [ async base containers random ];
+       libraryHaskellDepends = [ async base containers random ];
        jailbreak = true;
        description = "Thread-safe logging";
        license = stdenv.lib.licenses.bsd3;
@@ -129516,7 +132748,7 @@ self: {
        sha256 = "0wrnpmvds2amm85a5j1c1nqffy6vj4y6xq21w5ia1051wrxzrbjk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gloss stm vector ];
+       executableHaskellDepends = [ base gloss stm vector ];
        jailbreak = true;
        homepage = "https://github.com/davnils/tsp-viz";
        description = "Real time TSP tour visualization";
@@ -129534,7 +132766,10 @@ self: {
        sha256 = "0s5vlpvi1w6q2zxv586plvhs9p6rlc7653x7jzygfir70754n6si";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Decimal parsec pretty process split time
+       ];
+       executableHaskellDepends = [
          base Decimal parsec pretty process random split time
        ];
        jailbreak = true;
@@ -129549,7 +132784,7 @@ self: {
        pname = "tst";
        version = "0.1.1";
        sha256 = "1vr1l4pm02pwr8238qd9j0drkildns8m79qyq0lbzll30gc12vhx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/bitonic/language-spelling";
        description = "BK-tree implementation";
        license = stdenv.lib.licenses.publicDomain;
@@ -129563,11 +132798,13 @@ self: {
      mkDerivation {
        pname = "ttrie";
        version = "0.1.2";
-       revision = "2";
        sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0";
+       revision = "2";
        editedCabalFile = "f517a1ee4ab2eeefe39ec336a793845f84333835c59c3e90f885dd0711f8fbc0";
-       buildDepends = [ atomic-primops base hashable primitive stm ];
-       testDepends = [
+       libraryHaskellDepends = [
+         atomic-primops base hashable primitive stm
+       ];
+       testHaskellDepends = [
          base containers hashable QuickCheck stm test-framework
          test-framework-quickcheck2
        ];
@@ -129589,7 +132826,7 @@ self: {
        sha256 = "0mypgqgqaf2c74vka1pmqzrvz1kwl8pjm1llh4bflizfzrxq3s9d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary bytestring containers directory executable-path
          filepath hashable haskeline JuicyPixels mtl parsec process random
          template-haskell time vector yaml
@@ -129605,7 +132842,7 @@ self: {
        pname = "tubes";
        version = "0.2.2.3";
        sha256 = "0qmg2w4sjm0q1h6ajkv3i576zsi2ndbacjsn5sibcwjbdpkpwmdr";
-       buildDepends = [ base comonad free mtl transformers ];
+       libraryHaskellDepends = [ base comonad free mtl transformers ];
        homepage = "https://github.com/gatlin/tubes";
        description = "Effectful, iteratee-inspired stream processing based on a free monad";
        license = stdenv.lib.licenses.gpl3;
@@ -129617,7 +132854,7 @@ self: {
        pname = "tuntap";
        version = "0.0.2";
        sha256 = "0q6g2wcjddb9r1l9fxpn2qcssw5gyfwsam15rc3q6xjqbwz7fm41";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        jailbreak = true;
        description = "Interface to TUN/TAP drivers";
        license = stdenv.lib.licenses.bsd3;
@@ -129632,7 +132869,8 @@ self: {
        sha256 = "1kj68g5g9m46dpncbrisl19gah8pzac33iyr09ym1pqk3x6jh9ix";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cpphs haskell-src-exts parsec2 ];
+       libraryHaskellDepends = [ base cpphs ];
+       executableHaskellDepends = [ base haskell-src-exts parsec2 ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Homogeneous tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -129645,7 +132883,7 @@ self: {
        pname = "tuple";
        version = "0.3.0.2";
        sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg";
-       buildDepends = [ base OneTuple ];
+       libraryHaskellDepends = [ base OneTuple ];
        description = "Various functions on tuples";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129656,7 +132894,7 @@ self: {
        pname = "tuple-gen";
        version = "2.0";
        sha256 = "0bgwsxq8wrh76hhbwadv0rag4c7dx3644zrh2aflnsych0rncvd7";
-       buildDepends = [ base combinat ];
+       libraryHaskellDepends = [ base combinat ];
        jailbreak = true;
        description = "Enum instances for tuples where the digits increase with the same speed";
        license = stdenv.lib.licenses.bsd3;
@@ -129669,7 +132907,7 @@ self: {
        pname = "tuple-generic";
        version = "0.5.0.0";
        sha256 = "0cbmiwmwav0g9di1s0sdry9shijqzpb9zaag9dz95w65wgqkfzbw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/tuple-generic";
        description = "Generic operations on tuples";
        license = stdenv.lib.licenses.publicDomain;
@@ -129681,7 +132919,7 @@ self: {
        pname = "tuple-hlist";
        version = "0.2.0.0";
        sha256 = "0z1mmm6gnhv3c4hn60v1yasvr9j5rakvyma4c535s51hk5s7g7bl";
-       buildDepends = [ base HList OneTuple ];
+       libraryHaskellDepends = [ base HList OneTuple ];
        jailbreak = true;
        homepage = "http://github.com/dudebout/tuple-hlist";
        description = "Functions to convert between tuples and HLists";
@@ -129694,12 +132932,11 @@ self: {
        pname = "tuple-lenses";
        version = "0.1.0.2";
        sha256 = "1qq1sla89410wr9pnkmj100izkraad1gr163815p3dvh7qi04c7w";
-       buildDepends = [ base lens template-haskell ];
+       libraryHaskellDepends = [ base lens template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/tuple-lenses";
        description = "Stock FieldN combos and generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple-morph" = callPackage
@@ -129707,10 +132944,10 @@ self: {
      mkDerivation {
        pname = "tuple-morph";
        version = "0.1.0.0";
-       revision = "4";
        sha256 = "1zi6nh1z7z2jz5h0pvdm2czfy1rx7ixnnvp9akcpas19npgyfk94";
+       revision = "4";
        editedCabalFile = "835c4661ff3b962ec5fa6f1899c6cb0d241362f06636478935fd5475c684eada";
-       buildDepends = [ base HList template-haskell ];
+       libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129722,7 +132959,7 @@ self: {
        pname = "tuple-th";
        version = "0.2.5";
        sha256 = "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn";
-       buildDepends = [ base containers template-haskell ];
+       libraryHaskellDepends = [ base containers template-haskell ];
        description = "Generate (non-recursive) utility functions for tuples of statically known size";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129733,7 +132970,7 @@ self: {
        pname = "tupleinstances";
        version = "0.0.1";
        sha256 = "0kcmcg1fxsslpzpg766r9hr8aysg0s5fyang2xc0aa77zi71qyi3";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/diegoeche/tupleinstances";
        description = "Functor, Applicative and Monad for n-ary tuples";
@@ -129747,7 +132984,7 @@ self: {
        pname = "tuples-homogenous-h98";
        version = "0.1.1.0";
        sha256 = "0fhz246wh6x0s0sjkmd3qcylsx2gfrmgmvgb7js2zjg91y7zqnh2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ppetr/tuples-homogenous-h98";
        description = "Wrappers for n-ary tuples with Traversable and Applicative/Monad instances";
        license = stdenv.lib.licenses.bsd3;
@@ -129761,7 +132998,7 @@ self: {
        sha256 = "163fggvjixs6m2rwc3gd3s9703r2mnz3bknii1aagwzvw5kczky3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ ALUT base ];
+       executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129774,8 +133011,9 @@ self: {
        sha256 = "0dk63dknwxi7v67jn9b747mkyiz2af4b76a9q1ynn16xva2qsh93";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers vector ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base containers vector ];
+       executableHaskellDepends = [ base containers vector ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "http://github.com/joom/turkish-deasciifier.hs";
        description = "Haskell port of Deniz Yuret's Turkish deasciifier";
        license = stdenv.lib.licenses.mit;
@@ -129789,7 +133027,7 @@ self: {
        sha256 = "0152xhvm0x1ncjdib0bckhywgpzm4f1qj1ghs0jn84cz562ddwnl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers MonadRandom random ];
+       executableHaskellDepends = [ base containers MonadRandom random ];
        homepage = "http://wiki.github.com/paolino/turni";
        description = "shifts scheduling tool";
        license = stdenv.lib.licenses.bsd3;
@@ -129803,14 +133041,14 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.2.0";
-       sha256 = "0324bh4kb7xqdzvgqr6hbm7cna4a4d6x907l73sx63j87hqiwah4";
-       buildDepends = [
+       version = "1.2.1";
+       sha256 = "01l4gnl5qyvi7kwn0yzhkrs0yawm5ncqbbb150nxm5r3zky8cn4w";
+       libraryHaskellDepends = [
          async base clock directory foldl hostname managed optional-args
          optparse-applicative process system-fileio system-filepath
          temporary text time transformers unix
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129821,7 +133059,7 @@ self: {
        pname = "tweak";
        version = "0.1.0.1";
        sha256 = "1l5y94gac9s55wgn6w610pqb63c8l20vmlpsnmgbzw1f9vbnzgiw";
-       buildDepends = [ base containers lens stm transformers ];
+       libraryHaskellDepends = [ base containers lens stm transformers ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/tweak";
        description = "A library for incremental computing";
@@ -129834,7 +133072,7 @@ self: {
        pname = "twentefp";
        version = "0.4.2";
        sha256 = "1kmf907i6g6lfhw8g403b6701srrd298n4r53dvcqzy72c5qaixl";
-       buildDepends = [ base gloss parsec time ];
+       libraryHaskellDepends = [ base gloss parsec time ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129846,10 +133084,10 @@ self: {
      mkDerivation {
        pname = "twentefp-eventloop-graphics";
        version = "0.1.0.4";
-       revision = "1";
        sha256 = "086vx0849c7kmsz5pa4jwzp24cwaf4482bq37dr7jrqx22hvk4lm";
+       revision = "1";
        editedCabalFile = "2a887ef5e938d11f5944ea59ced4cf4bd22930b452f6e6b884f58031761cf817";
-       buildDepends = [
+       libraryHaskellDepends = [
          base network text twentefp-number twentefp-websockets
        ];
        jailbreak = true;
@@ -129863,7 +133101,7 @@ self: {
        pname = "twentefp-eventloop-trees";
        version = "0.1.1.0";
        sha256 = "1zn3bz2119jcyangs7mi2s9wcjkqgk54vwg6rfcbfg37m1v1ixy4";
-       buildDepends = [ base eventloop ];
+       libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129874,7 +133112,7 @@ self: {
        pname = "twentefp-graphs";
        version = "0.1.0.4";
        sha256 = "0g0py8cb4z9i9pjhka2pyjm8vfai9x3k0vmlb06g157ish97qvir";
-       buildDepends = [ base twentefp-eventloop-graphics ];
+       libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129885,7 +133123,7 @@ self: {
        pname = "twentefp-number";
        version = "0.1.0.2";
        sha256 = "1kh0a6h4syx98ygwidw6cc24ci91v1blshpfcczx96z850x1h6xf";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129897,7 +133135,7 @@ self: {
        pname = "twentefp-rosetree";
        version = "0.1.0.1";
        sha256 = "1dy4hmwciaglz2kfdk9fxf6hik7pgr4a4xj9y9l7s7p4k35r5bd7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base twentefp-eventloop-graphics twentefp-number
        ];
        jailbreak = true;
@@ -129912,7 +133150,7 @@ self: {
        pname = "twentefp-trees";
        version = "0.1.0.2";
        sha256 = "0mmj96xbqjzm4cylk39pib9jfwh6m350q1cwf6ij8pl0swab3b0g";
-       buildDepends = [ base twentefp-eventloop-graphics ];
+       libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129926,7 +133164,7 @@ self: {
        pname = "twentefp-websockets";
        version = "0.1.0.1";
        sha256 = "08227phlyvvg01n7zqyivx2f3dpfbipxaajqz4fc07zhkpmxy8h4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive concurrent-extra containers entropy io-streams mtl
          network random SHA text
@@ -129949,13 +133187,19 @@ self: {
        sha256 = "0d06bv26lvr4va431h2146v88bqcxvfr0wp36f7l4a6xqgghf2l1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal authenticate-oauth base bytestring case-insensitive
          conduit containers data-default http-conduit lens monad-control
          monad-logger network resourcet text transformers transformers-base
          twitter-conduit
        ];
-       testDepends = [ base hspec QuickCheck ];
+       executableHaskellDepends = [
+         ansi-terminal authenticate-oauth base bytestring case-insensitive
+         conduit containers data-default http-conduit lens monad-control
+         monad-logger network resourcet text transformers transformers-base
+         twitter-conduit
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/suzuki-shin/twhs";
        description = "CLI twitter client";
@@ -129974,7 +133218,7 @@ self: {
        sha256 = "162n5w4z3a1qyasd39q7751z872v31njzyhrnjfjxhsni3kif8b1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary bytestring ConfigFile curl directory hoauth HSH
          hslogger MissingH mtl network old-locale parsec regex-posix text
          time unix utf8-string
@@ -129992,7 +133236,7 @@ self: {
        pname = "twilight-stm";
        version = "1.2";
        sha256 = "1hp9mkfasjyh1ji6gfmdpmx3nm9g22ag3y47nva7i30bjrs65cdr";
-       buildDepends = [ base containers haskell98 mtl ];
+       libraryHaskellDepends = [ base containers haskell98 mtl ];
        homepage = "http://proglang.informatik.uni-freiburg.de/projects/twilight/";
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
@@ -130009,12 +133253,12 @@ self: {
        pname = "twilio";
        version = "0.1.2.0";
        sha256 = "05qhg9djp71xdwzb88xdnrg3zjbd6p8xb4gwzp0l6m3gc9wi7nvp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring containers errors exceptions free
          http-client http-client-tls http-types mtl network-uri old-locale
          text time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal http-client http-client-tls network-uri
          text transformers
        ];
@@ -130034,7 +133278,7 @@ self: {
        pname = "twill";
        version = "0.1.0.3";
        sha256 = "0wkcxjfpd5fz72hwg8spxjqk8b6axm51zppld00q9f3dzagsbwx6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cryptohash data-default datetime errors old-locale
          QuickCheck text time
@@ -130051,8 +133295,8 @@ self: {
        pname = "twiml";
        version = "0.1.0.0";
        sha256 = "0ipc8i1hbsjdz6rp7ks25w0zbrcv4byp0791aw9rrdpyqzdir0zx";
-       buildDepends = [ base network xml ];
-       testDepends = [ base Cabal lens ];
+       libraryHaskellDepends = [ base network xml ];
+       testHaskellDepends = [ base Cabal lens ];
        jailbreak = true;
        homepage = "https://github.com/markandrus/twiml-haskell";
        description = "TwiML library for Haskell";
@@ -130068,7 +133312,7 @@ self: {
        pname = "twine";
        version = "0.1.2";
        sha256 = "0q4dsh6x1w1indsx070rqayvjlzdk2nznvh0cjxd5f3jn5ggwwb1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers convertible filepath mtl parsec
        ];
        homepage = "http://twine.james-sanders.com";
@@ -130085,7 +133329,7 @@ self: {
        pname = "twisty";
        version = "0.1.0";
        sha256 = "02w8763m6gm9wj035s62ydg63iv7wa2cbjq2g1jd283vf2djsjyj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-memocombinators MonadRandom parallel
        ];
        jailbreak = true;
@@ -130103,11 +133347,11 @@ self: {
        pname = "twitch";
        version = "0.1.6.1";
        sha256 = "0hvwcnkjma3ib00qa7ymiyrvspa7ixxp0w3wgs9zjrs49j36dmak";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default directory fsnotify Glob optparse-applicative
          system-fileio system-filepath time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-default directory fsnotify Glob hspec
          optparse-applicative QuickCheck system-fileio system-filepath time
          transformers
@@ -130128,7 +133372,7 @@ self: {
        sha256 = "12q5w9wfnrzh2gjmq66qhwy6i6wixfb805jg2cbphxrjjnc2v9gx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base curl directory filepath json mtl old-locale readline time xml
        ];
        description = "A Haskell-based CLI Twitter client";
@@ -130151,13 +133395,14 @@ self: {
        sha256 = "0rair336wjgg5pd0vh3g3nlc64f5sw2sg60jj2sjaxv296jvr3xx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
          conduit-extra containers data-default http-client http-conduit
-         http-types lens lens-aeson network-uri resourcet template-haskell
-         text time transformers twitter-types twitter-types-lens
+         http-types lens lens-aeson resourcet template-haskell text time
+         transformers twitter-types twitter-types-lens
        ];
-       testDepends = [
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring
          case-insensitive conduit conduit-extra containers data-default
          directory doctest filepath hlint hspec http-client http-conduit
@@ -130180,7 +133425,7 @@ self: {
        pname = "twitter-enumerator";
        version = "0.0.3";
        sha256 = "1c8y7kq0x7lnq7x7ah8c78q6cy2963nz6y83klzh2jgmr8rma6q4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-enumerator authenticate base bytestring
          containers enumerator http-enumerator http-types text tls-extra
          transformers
@@ -130201,16 +133446,15 @@ self: {
        pname = "twitter-feed";
        version = "0.2.0.2";
        sha256 = "19kwhk0bvwnyhychvfzc09w00ix7z9fmvrb4vv56vxdg20rni3fk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types" = callPackage
@@ -130224,8 +133468,10 @@ self: {
        pname = "twitter-types";
        version = "0.7.0";
        sha256 = "0smzz3y6xgb0yddp62bvw4j278fw5dnjffrjfxz3dc6hd602cvlh";
-       buildDepends = [ aeson base text time unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         aeson base text time unordered-containers
+       ];
+       testHaskellDepends = [
          aeson attoparsec base bytestring derive directory filepath HUnit
          old-locale QuickCheck template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -130245,7 +133491,7 @@ self: {
        pname = "twitter-types-lens";
        version = "0.7.0";
        sha256 = "1775ydjpv0rii3zbz60xl8dz3537fcid3j4867ynw0zvk1sl01wc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens template-haskell text time twitter-types
        ];
        homepage = "https://github.com/himura/twitter-types-lens";
@@ -130262,7 +133508,7 @@ self: {
        pname = "tx";
        version = "0.1.0.0";
        sha256 = "18fpkpri2g93vxw3qdk94nc4zlh5kqgfbvdmzkwqjadkck39alsy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal safecopy stm transformers
        ];
        jailbreak = true;
@@ -130282,7 +133528,7 @@ self: {
        sha256 = "0375q8qcirkalz6n48rkylkx1j8z5gvjhh8n2fdvvjqvn064q1s6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory parsec regex-posix
        ];
        homepage = "http://keithsheppard.name/txt-sushi";
@@ -130298,7 +133544,7 @@ self: {
        sha256 = "0vn01ppcmdfi9n9f8h62ll9f08nda2pcrxvck0lgkwzky54v19s4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/jgoerzen/txt2rtf";
        description = "Filter to convert plain text files to RTF";
        license = "GPL";
@@ -130310,7 +133556,7 @@ self: {
        pname = "txtblk";
        version = "0.2.0.1";
        sha256 = "08qpdyb1dbkif4zwrap6478fsf7lha6hk18wm0r4803avrr5w2bb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Deprecated in favor of eros";
        license = stdenv.lib.licenses.bsd3;
@@ -130322,7 +133568,7 @@ self: {
        pname = "ty";
        version = "0.1.6";
        sha256 = "0i18c293f6dz7qgr5z4x6rzndhqv5q7myw1wvs8i9ld23d87fjhy";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/conal/ty";
        description = "Typed type representations and equality proofs";
        license = stdenv.lib.licenses.bsd3;
@@ -130338,7 +133584,9 @@ self: {
        sha256 = "1wc1z7ps1rcbws2snci64hxddjd3bi3kbi4iwvbfaac0dz52085m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory filepath ghc process ];
+       executableHaskellDepends = [
+         base bytestring directory filepath ghc process
+       ];
        homepage = "http://www.decidable.org/haskell/typalyze";
        description = "Analyzes Haskell source files for easy reference";
        license = stdenv.lib.licenses.bsd3;
@@ -130351,7 +133599,7 @@ self: {
        pname = "type-aligned";
        version = "0.9.6";
        sha256 = "0mfyd9w13kd3ha43220p9qabw828xv19sxywy9imadpwrdqp51qv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/type-aligned";
        description = "Various type-aligned sequence data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -130363,7 +133611,7 @@ self: {
        pname = "type-booleans";
        version = "0.1";
        sha256 = "11kbnfbvclkdwirnnpdi4f20pibdar4l47anvnkaxxl330zi7yfh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Type-level booleans via type-families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130376,7 +133624,7 @@ self: {
        pname = "type-cereal";
        version = "0.3";
        sha256 = "1w1s1c7f2q5zwc9fghbbd1nhavh0mzzndh0mdxr7sy88a523svcv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal data-hash template-haskell type-digits
          type-spine
        ];
@@ -130391,7 +133639,7 @@ self: {
        pname = "type-digits";
        version = "0.3";
        sha256 = "0rmqy3wcypyq09gnfz0xvkr2ly9gnpsjnil2n981ajfxsk2shi58";
-       buildDepends = [ base template-haskell type-spine ];
+       libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130403,8 +133651,8 @@ self: {
        pname = "type-eq";
        version = "0.5";
        sha256 = "007srln0xxi27wca8dk72xp3cdwnk8iqmlqgbxi17c9l2x7lrkwz";
-       buildDepends = [ base ];
-       buildTools = [ cpphs ];
+       libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ cpphs ];
        homepage = "http://github.com/glaebhoerl/type-eq";
        description = "Type equality evidence you can carry around";
        license = stdenv.lib.licenses.bsd3;
@@ -130416,7 +133664,7 @@ self: {
        pname = "type-equality";
        version = "0.1.2";
        sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/hesselink/type-equality/";
        description = "Type equality, coercion/cast and other operations";
        license = stdenv.lib.licenses.bsd3;
@@ -130428,7 +133676,7 @@ self: {
        pname = "type-equality-check";
        version = "0.0.0.3";
        sha256 = "0fsj2mbsbhiqlv6dlkkwh3af5kx8qcif9374wiy7zf62pz4bry67";
-       buildDepends = [ base type-level ];
+       libraryHaskellDepends = [ base type-level ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-equality-check";
        description = "Type equality check";
        license = stdenv.lib.licenses.bsd3;
@@ -130441,7 +133689,7 @@ self: {
        pname = "type-functions";
        version = "0.2.0.3";
        sha256 = "1vs6wk1z3zp3s1fxbz6bnfjlkdrcs6v4ihdnr504z9qklwb91vam";
-       buildDepends = [ base kinds ];
+       libraryHaskellDepends = [ base kinds ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-functions";
        description = "Emulation of type-level functions";
        license = stdenv.lib.licenses.bsd3;
@@ -130453,7 +133701,7 @@ self: {
        pname = "type-hint";
        version = "0.1";
        sha256 = "1fcrma7m6y7i1y42rzhv7qch8xkk93lkh1767saw4hsb9fzwsq8i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mvv/type-hint";
        description = "Guide type inference with proxy values";
        license = stdenv.lib.licenses.bsd3;
@@ -130465,7 +133713,7 @@ self: {
        pname = "type-int";
        version = "0.5.0.2";
        sha256 = "1lakw4mvkii32a570zain510n9x7b2ka2r3qj5rpil1j4bpc662w";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/type-int";
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
@@ -130478,7 +133726,9 @@ self: {
        pname = "type-iso";
        version = "0.1.0.0";
        sha256 = "03qs8frsj0a2jxpk1rrmhaivf68hg8dhjn4s3q85h4zrsxwfskjx";
-       buildDepends = [ base data-default nats numericpeano text ];
+       libraryHaskellDepends = [
+         base data-default nats numericpeano text
+       ];
        homepage = "https://github.com/ombocomp/type-iso";
        description = "Typeclasses for injective relations and isomorphisms between types";
        license = stdenv.lib.licenses.asl20;
@@ -130490,7 +133740,7 @@ self: {
        pname = "type-level";
        version = "0.2.4";
        sha256 = "1cgph4y6j7wnzglzz89zd60f1mv8v82vp0n1bmkp4yqq0w2wmg9v";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "http://code.haskell.org/type-level";
        description = "Type-level programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -130503,7 +133753,7 @@ self: {
        pname = "type-level-bst";
        version = "0.1";
        sha256 = "0c51p6dy84ddikj6jch5hljn1i37q38wbak3chbc3ds5r674y5hk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Kinokkory/type-level-bst";
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -130516,7 +133766,7 @@ self: {
        pname = "type-level-natural-number";
        version = "2.0";
        sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Simple type level natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130527,7 +133777,9 @@ self: {
        pname = "type-level-natural-number-induction";
        version = "1.0.0.1";
        sha256 = "1mwnsz5rbqnwskzf4cyv05zxha86afqh68b5ppwvizrvwf4jav2r";
-       buildDepends = [ base transformers type-level-natural-number ];
+       libraryHaskellDepends = [
+         base transformers type-level-natural-number
+       ];
        jailbreak = true;
        description = "High-level combinators for performing inductive operations";
        license = stdenv.lib.licenses.bsd3;
@@ -130539,7 +133791,7 @@ self: {
        pname = "type-level-natural-number-operations";
        version = "1.0";
        sha256 = "0vql5q5zhbhmwv0wqqb0xi4ayqdsz149rymhs730c583pq0h9r3w";
-       buildDepends = [ base type-level-natural-number ];
+       libraryHaskellDepends = [ base type-level-natural-number ];
        jailbreak = true;
        description = "Basic operations on type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -130551,8 +133803,8 @@ self: {
        pname = "type-level-numbers";
        version = "0.1.1.1";
        sha256 = "12iiyaqi60fpds7fv1qvphy84rwyj71maq54mfwpcr0bdrgyymjv";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        description = "Type level numbers implemented using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130563,7 +133815,7 @@ self: {
        pname = "type-level-sets";
        version = "0.5";
        sha256 = "1mrrwyvpjywnv2vd1nzzk0vnzsnjvbxiyxp03n9djsgwnfslzxbj";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets (with value-level counterparts and various operations)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130575,7 +133827,7 @@ self: {
        pname = "type-level-tf";
        version = "0.2.1";
        sha256 = "07q69219yvf7rpfwilp70hvx2fzsxklvld7j3gayj17l9wp23g2m";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/coreyoconnor/type-level-tf";
        description = "Type-level programming library (type families)";
        license = stdenv.lib.licenses.bsd3;
@@ -130587,7 +133839,7 @@ self: {
        pname = "type-list";
        version = "0.1.0.0";
        sha256 = "0y5qa882rcrlq13mfsp8yzbn6fqsc2clii2qjhk1nmg8ivqf026v";
-       buildDepends = [ base singletons ];
+       libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130601,7 +133853,7 @@ self: {
        pname = "type-natural";
        version = "0.2.3.2";
        sha256 = "0qydsrksg9rasv90d4ivjgf1sdwfzjg0xf1wimfkhva545mray7h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints equational-reasoning monomorphic singletons
          template-haskell
        ];
@@ -130617,7 +133869,9 @@ self: {
        pname = "type-ord";
        version = "0.3";
        sha256 = "16nfnxh0klxx1f2mj1hc5blcm259b664w3l4frx4bksdavhnkmg5";
-       buildDepends = [ base template-haskell type-digits type-spine ];
+       libraryHaskellDepends = [
+         base template-haskell type-digits type-spine
+       ];
        description = "Type-level comparison operator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130631,7 +133885,7 @@ self: {
        pname = "type-ord-spine-cereal";
        version = "0.2";
        sha256 = "1gwchzi4l7a0jm11paxz959mv9a5pbga86fyyjyglypd1988rvrb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base template-haskell type-cereal type-ord type-spine
        ];
        description = "Generic type-level comparison of types";
@@ -130645,7 +133899,7 @@ self: {
        pname = "type-prelude";
        version = "0.1";
        sha256 = "1ygg511j0av1g94mclrsf3p0qb2kc89jcz9nfr5fm073a2jlzlih";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://code.atnnn.com/projects/type-prelude";
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
        license = stdenv.lib.licenses.bsd3;
@@ -130660,7 +133914,7 @@ self: {
        pname = "type-settheory";
        version = "0.1.3.1";
        sha256 = "1b4p9f03diq2mlp2mb39qrm095731i35q8k783bkq2knzlq01dsi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers syb template-haskell transformers type-equality
        ];
        description = "Sets and functions-as-relations in the type system";
@@ -130674,7 +133928,7 @@ self: {
        pname = "type-spine";
        version = "0.2.20120924";
        sha256 = "0vy9ixmz1xm3dd0376s0h66q7qi64jqc5kqsqjpcg7akxidl03hi";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130691,12 +133945,12 @@ self: {
        pname = "type-structure";
        version = "0.1.1";
        sha256 = "0y2360llc41772ybjj3dcsk1r81js3yqsxww1w0j62gsdp6g9wfv";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers hashable loch-th mtl placeholders
          template-haskell text th-instance-reification time transformers
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers hashable HTF HUnit loch-th mtl
          placeholders QuickCheck QuickCheck-GenT quickcheck-instances
          template-haskell text th-instance-reification time transformers
@@ -130719,12 +133973,12 @@ self: {
        pname = "type-sub-th";
        version = "0.1.0.6";
        sha256 = "11aycmbvqlrsd4kzm9m5smg7ghqz8kn3i62b19acnlpmrlr5v497";
-       buildDepends = [
+       libraryHaskellDepends = [
          base DebugTraceHelpers HUnit QuickCheck template-haskell
          test-framework test-framework-hunit test-framework-quickcheck2
          tuple uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers DebugTraceHelpers HUnit QuickCheck template-haskell
          test-framework test-framework-hunit test-framework-quickcheck2
          th-instances tuple uniplate
@@ -130743,7 +133997,7 @@ self: {
        pname = "type-unary";
        version = "0.2.16";
        sha256 = "1pn65smi07gwd4h46irjawh1dnjnizs9ag0cyv55i0mjg8plyzvj";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-numbers base newtype ty vector-space
        ];
        homepage = "https://github.com/conal/type-unary";
@@ -130757,8 +134011,8 @@ self: {
        pname = "typeable-th";
        version = "0.1.5";
        sha256 = "1ps9rkysx7zbcqkz51ahayg2jivlihiqdlb27iq7bf9aa7383k6v";
-       buildDepends = [ base template-haskell transformers ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/bennofs/typeable-th";
        description = "Automatic deriving of TypeableN instances with Template Haskell";
@@ -130774,7 +134028,7 @@ self: {
        pname = "typedquery";
        version = "0.1.0.2";
        sha256 = "0l0fxhh1mq0801gb73pv531943i0iy5lm58hwyf5g6x6l50lj660";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring haskell-src-meta parsec template-haskell text
          transformers
        ];
@@ -130790,7 +134044,7 @@ self: {
        pname = "typehash";
        version = "1.4.0.4";
        sha256 = "11s10arrbri1f71jfpynhmwh53cgkrfxsrqch1f02j0aii7n0lpv";
-       buildDepends = [ base binary bytestring mtl pureMD5 syb ];
+       libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ];
        jailbreak = true;
        description = "Create a unique hash value for a type";
        license = stdenv.lib.licenses.bsd3;
@@ -130805,8 +134059,8 @@ self: {
        pname = "typelevel-tensor";
        version = "0.2.1";
        sha256 = "174f6xh3znf45w94xkhqwnxnzw6crpb13zff57svnj2dqvpf00gd";
-       buildDepends = [ base numeric-prelude QuickCheck ];
-       testDepends = [
+       libraryHaskellDepends = [ base numeric-prelude QuickCheck ];
+       testHaskellDepends = [
          array base HUnit numeric-prelude QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -130824,7 +134078,7 @@ self: {
        sha256 = "1mnzkj5dp4rc4anaqxc6ia88wgrjhxwacxpqw8vp6pjqxbhhq92n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        description = "Small script for inferring types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130837,7 +134091,7 @@ self: {
        pname = "typeparams";
        version = "0.0.6";
        sha256 = "1blhqm8ba37mqp2ziipm0igyccyrqlwcink5xbz0m56ca7lid0vb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints deepseq ghc-prim primitive reflection tagged
          template-haskell vector
        ];
@@ -130852,10 +134106,10 @@ self: {
      mkDerivation {
        pname = "types-compat";
        version = "0.1.1";
-       revision = "2";
        sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby";
+       revision = "2";
        editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/philopon/types-compat";
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
@@ -130867,7 +134121,7 @@ self: {
        pname = "typesafe-endian";
        version = "0.1.0.1";
        sha256 = "1kg4pvrnf7vwvrcb998l9w08dpdy9hg7x2d9h5s3lqpnvvxfgcfj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Ericson2314/typesafe-endian";
        description = "Enforce endianness with types";
        license = stdenv.lib.licenses.bsd3;
@@ -130884,7 +134138,7 @@ self: {
        sha256 = "12axp6y652zlv9c9m0n5m4allpy23x0bk274gy78csrqp26akq3k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html cmdtheline containers filemanip filepath
          language-typescript parsec split syb utf8-string
        ];
@@ -130900,7 +134154,7 @@ self: {
        pname = "typical";
        version = "0.0.1";
        sha256 = "0dw6mwppbhcblnr03qgavhx27l9dl6gd981afgg4spi8avfzgh4q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Type level numbers, vectors, list. This lib needs to be extended.";
        license = "GPL";
      }) {};
@@ -130913,7 +134167,7 @@ self: {
        pname = "typography-geometry";
        version = "1.0.0";
        sha256 = "1vvqch3pdwymjbmir7b208qyzdzljsw1gf8icmzw5pi3vn6wkihf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers parallel polynomials-bernstein vector
        ];
        description = "Drawings for printed text documents";
@@ -130931,10 +134185,10 @@ self: {
        pname = "tz";
        version = "0.0.0.10";
        sha256 = "15j0ai0i4savvvhd8b7f9mrm1kwdmvjrphyjclmlj1k65c6ap5qm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq time tzdata vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bindings-posix HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          time tzdata unix vector
@@ -130953,8 +134207,8 @@ self: {
        pname = "tzdata";
        version = "0.1.20150129.1";
        sha256 = "167ik26nsq2v6xqfk0rljp4p4g3r35rkvsza7cvi8qdak96dc4ay";
-       buildDepends = [ base bytestring containers vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers vector ];
+       testHaskellDepends = [
          base bytestring directory filemanip filepath HUnit MissingH
          test-framework test-framework-hunit test-framework-th unix
        ];
@@ -130973,7 +134227,7 @@ self: {
        sha256 = "01a1h6pflvid5zcd8wy3px7cz4pxwy5pw354v9rp8k7sx4q82am8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base BNFC-meta cmdargs containers mtl parsec pretty split
          transformers
        ];
@@ -130993,11 +134247,11 @@ self: {
        pname = "ua-parser";
        version = "0.5";
        sha256 = "0fljfvs9gzqyn01sw57s738jazki839grff43n09bqf7nk1janbf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light syb text
          yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring criterion data-default deepseq derive
          file-embed filepath HUnit pcre-light syb test-framework
          test-framework-hunit test-framework-quickcheck2 text yaml
@@ -131018,14 +134272,13 @@ self: {
        sha256 = "1ml02xap95vxvzwqlqp68hfk7yjncf3xc1h13gga0nlhby9rjv14";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath hslogger mtl network process
          regex-compat time time-locale-compat unix
        ];
        homepage = "http://hub.darcs.net/dino/uacpid";
        description = "Userspace Advanced Configuration and Power Interface event daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uberlast" = callPackage
@@ -131034,7 +134287,7 @@ self: {
        pname = "uberlast";
        version = "0.0";
        sha256 = "12p948706scjiazlwv0x1afl3v8fhv4a3l8yqn1x4y9xnr4pfmc9";
-       buildDepends = [ base lens tagged template-haskell ];
+       libraryHaskellDepends = [ base lens tagged template-haskell ];
        homepage = "https:/github.com/fumieval/uberlast";
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
@@ -131047,8 +134300,8 @@ self: {
        pname = "uconv";
        version = "0.0.3";
        sha256 = "0v71qw494klyh3ar8qdp7wx7kn7629iy83xham9b7jpmvk2p76bv";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ icu ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131064,7 +134317,7 @@ self: {
        sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers ghc-prim mtl network unix
          utf8-string
        ];
@@ -131082,7 +134335,7 @@ self: {
        sha256 = "0xiz3z0x7p9agj14j9lm8njfqiqpyif0m2fn7lppi3w482ssfzji";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring udbus xml ];
+       libraryHaskellDepends = [ base bytestring udbus xml ];
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
        license = stdenv.lib.licenses.bsd3;
@@ -131095,7 +134348,7 @@ self: {
        pname = "udcode";
        version = "0.2.0.0";
        sha256 = "1namnm91divk1x8ki7wfbd79f4nrym58r4ki9yamj2giv4nxda36";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Does a set of code words form a uniquely decodable code?";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131110,8 +134363,9 @@ self: {
        sha256 = "1a5i57f50scxbv5snn4xd953bx98qq3cgzhxjnqvxyazqz3h1fx2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring posix-paths select unix ];
-       pkgconfigDepends = [ libudev ];
+       libraryHaskellDepends = [ base bytestring posix-paths unix ];
+       libraryPkgconfigDepends = [ libudev ];
+       executableHaskellDepends = [ base bytestring select ];
        homepage = "https://github.com/pxqr/udev";
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -131124,7 +134378,7 @@ self: {
        pname = "uglymemo";
        version = "0.1.0.1";
        sha256 = "0ixqg5d0ly1r18jbgaa89i6kjzgi6c5hanw1b1y8c5fbq14yz2gy";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "A simple (but internally ugly) memoization function";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -131137,12 +134391,17 @@ self: {
      mkDerivation {
        pname = "uhc-light";
        version = "1.1.9.0";
-       revision = "1";
        sha256 = "0dqb0054nbl5qfxrg7g4yvmiawp9ladlws26cdf32jxrm31wgmkj";
+       revision = "1";
        editedCabalFile = "8847b4a41a2f6c9be09cf7b4835f53219522da9ef0ca26b918159fec747bd938";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory fgl filepath
+         hashable mtl network old-locale primitive process syb transformers
+         uhc-util uulib vector
+       ];
+       executableHaskellDepends = [
          array base binary bytestring containers directory fgl filepath
          hashable mtl network old-locale primitive process syb transformers
          uhc-util uulib vector
@@ -131161,7 +134420,7 @@ self: {
        pname = "uhc-util";
        version = "0.1.5.6";
        sha256 = "1axg2apkvg3xk1cq78shbnc68i0h6fqcpjg8z3l4nc49kl5dywwz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable ListLike mtl process syb time time-compat uulib
        ];
@@ -131178,7 +134437,7 @@ self: {
        sha256 = "064cm531yci41jf14k177w7j4zy8dfjwrpjcrwf7kpz2rhx1djyi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring split ];
+       executableHaskellDepends = [ base bytestring split ];
        jailbreak = true;
        description = "hex dumper for UTF-8 text";
        license = stdenv.lib.licenses.bsd3;
@@ -131194,14 +134453,16 @@ self: {
        sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base bytestring bytestring-lexing deepseq network network-uri
+       libraryHaskellDepends = [
+         base bytestring bytestring-lexing deepseq network network-uri
+       ];
+       executableHaskellDepends = [
+         async base bytestring bytestring-lexing deepseq network
          optparse-applicative
        ];
        homepage = "https://github.com/hvr/uhttpc";
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ui-command" = callPackage
@@ -131212,7 +134473,7 @@ self: {
        sha256 = "1qq902p5q6z1m0556bdc6brads7m2qrhrwnzd8k8c4jynzc829w7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base data-default mtl old-locale time ];
+       libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131226,7 +134487,9 @@ self: {
        pname = "uid";
        version = "0.1.0.1";
        sha256 = "11v67dbanw9gmy9rbfln3ma87a9hkwvc5bwzdx840ngij5gh559b";
-       buildDepends = [ aeson base bytestring cereal dataenc text uuid ];
+       libraryHaskellDepends = [
+         aeson base bytestring cereal dataenc text uuid
+       ];
        homepage = "http://github.com/hargettp/uid.git";
        description = "Simple unique identifier datatype, serializable and encodable as base32";
        license = stdenv.lib.licenses.mit;
@@ -131242,7 +134505,7 @@ self: {
        sha256 = "0gpycwd0dgnw7cdicpn19wv1xb4jq3j9dfzry2ilv85h02zkwfvh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs directory filepath io-storage process
        ];
        homepage = "https://github.com/jwiegley/una";
@@ -131258,8 +134521,8 @@ self: {
        pname = "unagi-chan";
        version = "0.4.0.0";
        sha256 = "04m1ns6jc1yb1i9pmqmi8k21mwgkrq4q9fbcj4af1a9khxrjxcny";
-       buildDepends = [ atomic-primops base ghc-prim primitive ];
-       testDepends = [
+       libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
+       testHaskellDepends = [
          atomic-primops base containers ghc-prim primitive
        ];
        description = "Fast concurrent queues with a Chan-like API, and more";
@@ -131272,7 +134535,7 @@ self: {
        pname = "unagi-streams";
        version = "0.1.3";
        sha256 = "0m8x1sw925xwj2yd2ji0nk54gw1gqqz1zy0bk9z3c3sgbcy364m6";
-       buildDepends = [ base io-streams unagi-chan ];
+       libraryHaskellDepends = [ base io-streams unagi-chan ];
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131285,7 +134548,7 @@ self: {
        sha256 = "12cbqlc7qf2sf2m4zmisx06bcc104bwivnzq2df0jqdf09bg0n9k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/unamb";
        description = "Unambiguous choice";
        license = stdenv.lib.licenses.bsd3;
@@ -131297,7 +134560,7 @@ self: {
        pname = "unamb-custom";
        version = "0.13";
        sha256 = "0r694wi9xg8brgcwl2kyv5amp6v539l121s9bpmd5lhjdnrvqjwk";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/luqui/unamb-custom";
        description = "Functional concurrency with unamb using a custom scheduler";
        license = stdenv.lib.licenses.bsd3;
@@ -131312,7 +134575,9 @@ self: {
        pname = "unbound";
        version = "0.4.3.1";
        sha256 = "1xkp47y7yg8dl95gf4w3iwddc3yivrhcxj184cfhrx6a9rbsflpz";
-       buildDepends = [ base binary containers mtl RepLib transformers ];
+       libraryHaskellDepends = [
+         base binary containers mtl RepLib transformers
+       ];
        homepage = "http://code.google.com/p/replib/";
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
@@ -131328,11 +134593,11 @@ self: {
        pname = "unbound-generics";
        version = "0.2";
        sha256 = "0wmr7ylczkaqyf1yrcp9d9gmw8hv7v2yip9v96zlqx02m9j57s99";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers contravariant deepseq mtl profunctors
          template-haskell transformers transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "http://github.com/lambdageek/unbound-generics";
@@ -131346,7 +134611,7 @@ self: {
        pname = "unbounded-delays";
        version = "0.1.0.9";
        sha256 = "1f4h87503m3smhip432q027wj3zih18pmz2rnafh60589ifcl420";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/basvandijk/unbounded-delays";
        description = "Unbounded thread delays and timeouts";
        license = stdenv.lib.licenses.bsd3;
@@ -131358,7 +134623,7 @@ self: {
        pname = "unbounded-delays-units";
        version = "0.4";
        sha256 = "02j4i2dms15vb87ar3m99hvpxrjdakljyql708zs716k1jdm7614";
-       buildDepends = [ base unbounded-delays units units-defs ];
+       libraryHaskellDepends = [ base unbounded-delays units units-defs ];
        jailbreak = true;
        homepage = "https://github.com/jcristovao/unbouded-delays-units";
        description = "Thread delays and timeouts using proper time units";
@@ -131372,7 +134637,7 @@ self: {
        pname = "unboxed-containers";
        version = "0.0.2.4";
        sha256 = "0yahavqjjnlf4ps8kd41s9s64nbhx2hf7qzk2xxkmq0i3b91d123";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/ekmett/unboxed-containers";
        description = "Self-optimizing unboxed sets using view patterns and data families";
        license = stdenv.lib.licenses.bsd3;
@@ -131385,7 +134650,7 @@ self: {
        pname = "unexceptionalio";
        version = "0.2.0";
        sha256 = "1p1han6027n6d9cx0cqrfrpwqlhkainj7xi839swqj1k6d4n022n";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/singpolyma/unexceptionalio";
        description = "IO without any non-error, synchronous exceptions";
        license = "unknown";
@@ -131398,7 +134663,9 @@ self: {
        pname = "unfoldable";
        version = "0.8.2";
        sha256 = "0r6jffm2i2la70xzqsribfbsa84ha5g4zfqphp9gqkvr1x2jmr2i";
-       buildDepends = [ base ghc-prim QuickCheck random transformers ];
+       libraryHaskellDepends = [
+         base ghc-prim QuickCheck random transformers
+       ];
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
@@ -131410,7 +134677,7 @@ self: {
        pname = "ungadtagger";
        version = "1.0.0";
        sha256 = "1hn30p9vpsvkph54grzwdrca5vh9grpa7d0w1zlvim1mnvqxmn4b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/andriyp/ungadtagger";
        description = "Abstract GADTs from typelevel tags";
        license = stdenv.lib.licenses.bsd3;
@@ -131422,7 +134689,7 @@ self: {
        pname = "uni-events";
        version = "2.2.2.0";
        sha256 = "1damlhi56xfp4xvdk2ijxjx7vxywhhbi4hiprdx09b5ipblrfpqz";
-       buildDepends = [ base containers uni-util ];
+       libraryHaskellDepends = [ base containers uni-util ];
        homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Event handling for the uniform workbench";
        license = "LGPL";
@@ -131436,7 +134703,7 @@ self: {
        pname = "uni-graphs";
        version = "2.2.1.0";
        sha256 = "1vwm0gmgj8c7qdildplr3jng5gj9q6b669vgmnxw4v514y529bz5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl uni-events uni-htk uni-reactor uni-util
        ];
        homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
@@ -131452,7 +134719,7 @@ self: {
        pname = "uni-htk";
        version = "2.2.1.2";
        sha256 = "1zdbg2jz6dgw4jvicl2vgnnnz2mmq8r9cabfgzw7zyc6ycp5hmyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory uni-events uni-posixutil uni-reactor
          uni-util
        ];
@@ -131469,7 +134736,9 @@ self: {
        pname = "uni-posixutil";
        version = "2.2.1.1";
        sha256 = "0wh3ni6l1x7rxn5yppva1xs0yb6z5hxfmzxxrnh6hbcq1pa62m5d";
-       buildDepends = [ base directory process uni-events uni-util unix ];
+       libraryHaskellDepends = [
+         base directory process uni-events uni-util unix
+       ];
        homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Posix utilities for the uniform workbench";
        license = "LGPL";
@@ -131482,7 +134751,9 @@ self: {
        pname = "uni-reactor";
        version = "2.2.1.0";
        sha256 = "147nizw920xbbj5b8kqrgri1r9wpx3qddspnryxhdxq10q1xlyh2";
-       buildDepends = [ base containers directory uni-events uni-util ];
+       libraryHaskellDepends = [
+         base containers directory uni-events uni-util
+       ];
        homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Reactors for the uniform workbench";
        license = "LGPL";
@@ -131496,7 +134767,7 @@ self: {
        pname = "uni-uDrawGraph";
        version = "2.2.1.3";
        sha256 = "1gblb969s9al67srxf7rd9dajy6hji91aw5zaxxhaj0vgqsdb90j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers uni-events uni-graphs uni-posixutil uni-reactor
          uni-util
        ];
@@ -131513,7 +134784,7 @@ self: {
        pname = "uni-util";
        version = "2.3.0.1";
        sha256 = "0simxjsd0qi8yxnpiq88zy3bsrrw5rxfpfknr8yaf4xhc7vv39nh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory ghc-prim mtl network
          old-time parsec
        ];
@@ -131530,8 +134801,8 @@ self: {
        sha256 = "0fy89j864dy5dzfj15aavm8bqpv2f51zf42dyjvs50qah3shh5yl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
-       testDepends = [ base containers utility-ht ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/unicode/";
        description = "Construct and transform unicode characters";
        license = stdenv.lib.licenses.bsd3;
@@ -131543,10 +134814,11 @@ self: {
        pname = "unicode-names";
        version = "3.2.0.0";
        sha256 = "15088dbmhvw118p3w08wxpsx41gzi0wqinqyg143225pp07aa5gc";
-       buildDepends = [ array base containers unicode-properties ];
+       libraryHaskellDepends = [
+         array base containers unicode-properties
+       ];
        description = "Unicode 3.2.0 character names";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicode-normalization" = callPackage
@@ -131555,8 +134827,8 @@ self: {
        pname = "unicode-normalization";
        version = "0.1";
        sha256 = "1smfc7a62xi6y4sc0vai2l0nljxl9dr9l5zkqi17n14cq36ppfwb";
-       buildDepends = [ base bytestring compact-string ];
-       extraLibraries = [ icu ];
+       libraryHaskellDepends = [ base bytestring compact-string ];
+       librarySystemDepends = [ icu ];
        homepage = "http://sloompie.reinier.de/unicode-normalization/";
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
@@ -131569,7 +134841,7 @@ self: {
        pname = "unicode-prelude";
        version = "0.1.1";
        sha256 = "05zakihlk06wckzgm43f3g26fjdn4gb3d1ypw4vcwqmipq2dbfsw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Unicode notation for some definitions in Prelude";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131580,10 +134852,9 @@ self: {
        pname = "unicode-properties";
        version = "3.2.0.0";
        sha256 = "06zrr2z9irbsxwf7fbnhp2sg36ykb2amfys2y78nzn0mw63xb3q1";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "Unicode 3.2.0 character properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicode-symbols" = callPackage
@@ -131592,7 +134863,7 @@ self: {
        pname = "unicode-symbols";
        version = "0.1.1.2";
        sha256 = "0y1awqrf1x2in158linszma69zyz3zp14h3rmdx3vmbmif9fvbyv";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
@@ -131606,8 +134877,9 @@ self: {
        sha256 = "17a2rxq5b4a66ia4jm1g0lmkvsanfc477567wygq9kz4w9q4xwc3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base directory text ];
-       testDepends = [ attoparsec base text ];
+       libraryHaskellDepends = [ attoparsec base text ];
+       executableHaskellDepends = [ attoparsec base directory text ];
+       testHaskellDepends = [ attoparsec base text ];
        jailbreak = true;
        homepage = "https://github.com/Zankoku-Okuno/unicoder";
        description = "Make writing in unicode easy";
@@ -131621,7 +134893,7 @@ self: {
        pname = "unification-fd";
        version = "0.10.0.1";
        sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v";
-       buildDepends = [ base containers logict mtl ];
+       libraryHaskellDepends = [ base containers logict mtl ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Simple generic unification algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -131635,18 +134907,19 @@ self: {
      mkDerivation {
        pname = "uniform-io";
        version = "0.1.1.0";
-       revision = "1";
        sha256 = "0i9sdf2nnaf099r79mdrqa1hbbqyb874fk8dsqqzb1582m6czikk";
+       revision = "1";
        editedCabalFile = "4f0651eff7cbdde40b49b5fcf90e8adf5c403a7c150ac318f0f5280b454b19f9";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring data-default-class iproute network
          transformers word8
        ];
-       testDepends = [ base Cabal ];
-       extraLibraries = [ openssl ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base Cabal ];
        homepage = "https://sealgram.com/git/haskell/uniform-io";
        description = "Uniform IO over files, network, watever";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
@@ -131655,7 +134928,7 @@ self: {
        pname = "uniform-pair";
        version = "0.1.5";
        sha256 = "0zkkhxmhx7xpi0fjxks435z5p52f2jvw8fvp0z2qi81a18v8fh81";
-       buildDepends = [ base ShowF ];
+       libraryHaskellDepends = [ base ShowF ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
        license = stdenv.lib.licenses.bsd3;
@@ -131667,7 +134940,7 @@ self: {
        pname = "union-find";
        version = "0.2";
        sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        homepage = "http://github.com/nominolo/union-find";
        description = "Efficient union and equivalence testing of sets";
        license = stdenv.lib.licenses.bsd3;
@@ -131679,7 +134952,7 @@ self: {
        pname = "union-find-array";
        version = "0.1.0.2";
        sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk";
-       buildDepends = [ array base mtl ];
+       libraryHaskellDepends = [ array base mtl ];
        homepage = "https://github.com/haskell-rewriting/union-find-array";
        description = "union find data structure";
        license = stdenv.lib.licenses.mit;
@@ -131691,7 +134964,7 @@ self: {
        pname = "union-map";
        version = "0.1";
        sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l";
-       buildDepends = [ base containers extensible ];
+       libraryHaskellDepends = [ base containers extensible ];
        homepage = "http://github.com/minpou/union-map";
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
@@ -131706,7 +134979,7 @@ self: {
        pname = "uniplate";
        version = "1.6.12";
        sha256 = "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable syb unordered-containers
        ];
        homepage = "http://community.haskell.org/~ndm/uniplate/";
@@ -131722,8 +134995,8 @@ self: {
        pname = "unique-logic";
        version = "0.3";
        sha256 = "0pjkqvam73d6xy528r9zf75km2yr997in902174raj6kw3kgdl41";
-       buildDepends = [ base transformers utility-ht ];
-       testDepends = [
+       libraryHaskellDepends = [ base transformers utility-ht ];
+       testHaskellDepends = [
          base non-empty QuickCheck transformers utility-ht
        ];
        jailbreak = true;
@@ -131740,10 +135013,10 @@ self: {
        pname = "unique-logic-tf";
        version = "0.4.1.1";
        sha256 = "0gc41whidll04fgzjydcxgxvq270ncvqcamsd3b3qd4hfn3v9qv8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers explicit-exception transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          base non-empty QuickCheck transformers utility-ht
        ];
        jailbreak = true;
@@ -131759,7 +135032,7 @@ self: {
        pname = "uniqueid";
        version = "0.1.1";
        sha256 = "0s1jw29g5s9ll8hbfkyalhdjpsv54w1n63mz4jph36dbq68zb7g6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/sebfisch/uniqueid/wikis";
        description = "Splittable Unique Identifier Supply";
        license = stdenv.lib.licenses.bsd3;
@@ -131775,11 +135048,11 @@ self: {
        pname = "units";
        version = "2.3";
        sha256 = "14h5566b68wr5qln3x4a862j0zmfdlishipbj9mhd2wmpri6bmzj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl multimap singletons syb template-haskell
          th-desugar units-parser vector-space
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit-approx mtl multimap singletons syb tasty
          tasty-hunit template-haskell th-desugar units-parser vector-space
        ];
@@ -131797,7 +135070,7 @@ self: {
        pname = "units-attoparsec";
        version = "1.0";
        sha256 = "11saazsgx7gpbfhwwgvrp3zwirkvv8h8c61rrsczfq1qmsljxxiz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base template-haskell text units units-defs
        ];
        homepage = "https://github.com/jcristovao/units-attoparsec";
@@ -131811,7 +135084,7 @@ self: {
        pname = "units-defs";
        version = "2.0.0.1";
        sha256 = "04k9wjyq23ml89nnjx2lwxiik54wc4rcbmpvvr7fh9wgsl74k6pv";
-       buildDepends = [ base template-haskell units ];
+       libraryHaskellDepends = [ base template-haskell units ];
        homepage = "http://github.com/goldfirere/units-defs";
        description = "Definitions for use with the units package";
        license = stdenv.lib.licenses.bsd3;
@@ -131826,8 +135099,8 @@ self: {
        pname = "units-parser";
        version = "0.1.0.0";
        sha256 = "0ha1saapphk15xk10a36k5qmn01nqpz10f8gi35ra9zqlhv8amfq";
-       buildDepends = [ base containers mtl multimap parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl multimap parsec ];
+       testHaskellDepends = [
          base containers mtl multimap parsec syb tasty tasty-hunit
          template-haskell
        ];
@@ -131841,8 +135114,8 @@ self: {
        pname = "unittyped";
        version = "0.1";
        sha256 = "1ab27rwnp8ncfn5sm4llxjxx7fbp495sl1838g8z9hishr5dgddl";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://bitbucket.org/xnyhps/haskell-unittyped/";
        description = "An extendable library for type-safe computations including units";
@@ -131856,7 +135129,7 @@ self: {
        pname = "universal-binary";
        version = "0.11";
        sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131870,7 +135143,7 @@ self: {
        pname = "universe";
        version = "1.0";
        sha256 = "19zr9zcqc5sfp5qfn8slkk2732j1814m3j1jkbim739limwf900z";
-       buildDepends = [
+       libraryHaskellDepends = [
          universe-instances-base universe-instances-extended
          universe-instances-trans universe-reverse-instances
        ];
@@ -131885,7 +135158,7 @@ self: {
        pname = "universe-base";
        version = "1.0";
        sha256 = "1bhgmikh876bda37a79iapzp58ssgfx6n57gpblyd1fprxnwqxc4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmwit/universe";
        description = "A class for finite and recursively enumerable types and some helper functions for enumerating them";
        license = stdenv.lib.licenses.bsd3;
@@ -131897,7 +135170,7 @@ self: {
        pname = "universe-instances-base";
        version = "1.0";
        sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2";
-       buildDepends = [ base containers universe-base ];
+       libraryHaskellDepends = [ base containers universe-base ];
        homepage = "https://github.com/dmwit/universe";
        description = "Universe instances for types from the base package";
        license = stdenv.lib.licenses.bsd3;
@@ -131911,7 +135184,7 @@ self: {
        pname = "universe-instances-extended";
        version = "1.0";
        sha256 = "0cla7n6id0v2pphmzsc8cbghvhyjjx9720gmxdqch8ysrfknkbgi";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base comonad universe-instances-base void
        ];
        jailbreak = true;
@@ -131928,7 +135201,7 @@ self: {
        pname = "universe-instances-trans";
        version = "1.0.0.1";
        sha256 = "03iix0bdhfi4qlgwr8sl3gsqck6lsbkqgx245w2z5yaaxgqpq10d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl transformers universe-base universe-instances-base
        ];
        homepage = "https://github.com/dmwit/universe";
@@ -131942,7 +135215,9 @@ self: {
        pname = "universe-reverse-instances";
        version = "1.0";
        sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79";
-       buildDepends = [ base containers universe-instances-base ];
+       libraryHaskellDepends = [
+         base containers universe-instances-base
+       ];
        homepage = "https://github.com/dmwit/universe";
        description = "instances of standard classes that are made possible by enumerations";
        license = stdenv.lib.licenses.bsd3;
@@ -131958,10 +135233,10 @@ self: {
        pname = "universe-th";
        version = "0.0.0.6";
        sha256 = "143kcgv4lp9266d8za878l343j6g97mxc3z7gj348jjamvpyg9wx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base composition mtl template-haskell tuple uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers composition DebugTraceHelpers HUnit mtl QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-instances tuple uniplate
@@ -131978,7 +135253,7 @@ self: {
        pname = "unix";
        version = "2.7.1.0";
        sha256 = "0p74ljsl1zgwnyl69pg4l15z5rqidam9fw9il4siam2m700ydm3b";
-       buildDepends = [ base bytestring time ];
+       libraryHaskellDepends = [ base bytestring time ];
        homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -131990,7 +135265,7 @@ self: {
        pname = "unix-bytestring";
        version = "0.3.7.3";
        sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Unix/Posix-specific functions for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -132002,7 +135277,7 @@ self: {
        pname = "unix-compat";
        version = "0.4.1.4";
        sha256 = "0jxk7j5pz2kgfpqr4hznndjg31pqj5xg2qfc5308fcn9xyg1myps";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/jystic/unix-compat";
        description = "Portable POSIX-compatibility layer";
        license = stdenv.lib.licenses.bsd3;
@@ -132016,7 +135291,8 @@ self: {
        sha256 = "18rjz14x1mbwdppf18gv3x4jwvz68bb2n1b11ygck60yl4pqbhb9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base foreign-var unix ];
+       libraryHaskellDepends = [ base foreign-var ];
+       executableHaskellDepends = [ base foreign-var unix ];
        homepage = "https://github.com/maoe/unix-fcntl";
        description = "Comprehensive bindings to fcntl(2)";
        license = stdenv.lib.licenses.bsd3;
@@ -132028,7 +135304,7 @@ self: {
        pname = "unix-handle";
        version = "0.0.0";
        sha256 = "07ysmd9ks5lm2lg1dik75m509ryn5azw28j9hcisknf5bmrfy9li";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "POSIX operations on Handles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132039,7 +135315,7 @@ self: {
        pname = "unix-io-extra";
        version = "0.1";
        sha256 = "1qy28y1apm2dxp47v0ngxj4ww3iyq4lj0n0i4z9phyr1122fglig";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Support for writev, pwrite and pread";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132052,8 +135328,8 @@ self: {
        pname = "unix-memory";
        version = "0.1.2";
        sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix
        ];
        homepage = "http://github.com/vincenthz/hs-unix-memory";
@@ -132069,11 +135345,13 @@ self: {
        pname = "unix-process-conduit";
        version = "0.2.2.3";
        sha256 = "0ldgjwdvshggygxn9fpnxvb01dba0q0bn9f7iiw5xgqhli46nvcy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit directory filepath process stm time
          transformers unix
        ];
-       testDepends = [ base bytestring conduit hspec transformers unix ];
+       testHaskellDepends = [
+         base bytestring conduit hspec transformers unix
+       ];
        jailbreak = true;
        homepage = "https://github.com/snoyberg/conduit";
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
@@ -132087,7 +135365,7 @@ self: {
        pname = "unix-pty-light";
        version = "0.1";
        sha256 = "1n21cd6chih86g6kfl6b0x4k533ykzz93anhf6wga3033rvy09wj";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://code.haskell.org/~scook0/unix-pty-light";
        description = "POSIX pseudo-terminal support";
        license = stdenv.lib.licenses.bsd3;
@@ -132101,8 +135379,8 @@ self: {
        pname = "unix-time";
        version = "0.3.5";
        sha256 = "0pk7046lmvl7dw6g7508xsixwi3gpiq5dw0a0lfwpfr80g6mh73z";
-       buildDepends = [ base binary bytestring old-time ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring old-time ];
+       testHaskellDepends = [
          base bytestring doctest hspec old-locale old-time QuickCheck time
        ];
        description = "Unix time parser/formatter and utilities";
@@ -132117,7 +135395,8 @@ self: {
        sha256 = "01v0cl540gwc8j3x6q9gc7bvdcm9f843qbbk15llw9ik2dfm5987";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base mtl unix ];
+       libraryHaskellDepends = [ array base mtl ];
+       executableHaskellDepends = [ base unix ];
        description = "Unlambda interpreter";
        license = "GPL";
      }) {};
@@ -132130,7 +135409,8 @@ self: {
        sha256 = "0nwd4cm3licmdx06cmq42ig7r0iirw2s3ifnna4yzxpysj2aapnf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory text ];
+       libraryHaskellDepends = [ base directory text ];
+       executableHaskellDepends = [ base directory text ];
        description = "Tool to convert literate code between styles or to code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132144,7 +135424,9 @@ self: {
        pname = "unm-hip";
        version = "0.3.1.6";
        sha256 = "170ivv689jg2k9p8czp6miq3samjbdwanh3vh9csm8iq88yrzry5";
-       buildDepends = [ array base bytestring containers process vector ];
+       libraryHaskellDepends = [
+         array base bytestring containers process vector
+       ];
        description = "A Library for the manipulation of images";
        license = "GPL";
      }) {};
@@ -132158,8 +135440,8 @@ self: {
        pname = "unordered-containers";
        version = "0.2.5.1";
        sha256 = "06l1xv7vhpxly75saxdrbc6p2zlgz1az278arfkz4rgawfnphn3f";
-       buildDepends = [ base deepseq hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq hashable ];
+       testHaskellDepends = [
          base ChasingBottoms containers hashable HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -132176,8 +135458,10 @@ self: {
        pname = "unordered-containers-rematch";
        version = "0.1.0.0";
        sha256 = "13ld8whx1m5xglaj2adsn0qb1x00p6ir8l9kz7fv815n6ahgcii8";
-       buildDepends = [ base hashable rematch unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base hashable rematch unordered-containers
+       ];
+       testHaskellDepends = [
          base hashable hspec HUnit rematch unordered-containers
        ];
        jailbreak = true;
@@ -132195,7 +135479,7 @@ self: {
        pname = "unpack-funcs";
        version = "0.3.1";
        sha256 = "0ha8xbg1a560rd5grg6i2acg3nzq6f4d6qa7i6vrbnz7bqbg77q3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring primitive template-haskell transformers vector
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
@@ -132209,7 +135493,7 @@ self: {
        pname = "unroll-ghc-plugin";
        version = "0.1.1";
        sha256 = "0n05777fqqpbgnh9jab04ayw1j1as4wkkbrjixi1288fhi44m87p";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        homepage = "http://thoughtpolice.github.com/unroll-ghc-plugin";
        description = "Compiler plugin for loop unrolling";
        license = stdenv.lib.licenses.bsd3;
@@ -132221,7 +135505,7 @@ self: {
        pname = "unsafe";
        version = "0.0";
        sha256 = "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~thielema/unsafe/";
        description = "Unified interface to unsafe functions";
        license = stdenv.lib.licenses.bsd3;
@@ -132233,7 +135517,7 @@ self: {
        pname = "unsafe-promises";
        version = "0.0.1.3";
        sha256 = "1018c3q0aq6l0011az661dvlibiv6jvwdv4c40bi8pwapri66k70";
-       buildDepends = [ base threads ];
+       libraryHaskellDepends = [ base threads ];
        homepage = "https://github.com/kallisti-dev/unsafe-promises";
        description = "Create pure futures using lazy IO";
        license = stdenv.lib.licenses.bsd3;
@@ -132247,12 +135531,12 @@ self: {
        sha256 = "10v50bzd7ccjs0d1spvyl6awhwdhxmkcacm2lkillk9f7myild0r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/konn/unsafely";
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unsafeperformst" = callPackage
@@ -132261,7 +135545,7 @@ self: {
        pname = "unsafeperformst";
        version = "0.9.2";
        sha256 = "0l268mzlmswm0p9cybjvi6krsgic706av9kf90fx3ylyvhgzygvc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/unsafeperformst";
        description = "Like unsafeperformIO, but for the ST monad";
        license = stdenv.lib.licenses.bsd3;
@@ -132277,7 +135561,7 @@ self: {
        sha256 = "1zlf9dw3yid6s9p0q837h3qs2wnd9wr9kh282j4j4m0gpv9dcrrf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base optparse-applicative stream-fusion unordered-containers
        ];
        description = "Solve Boggle-like word games";
@@ -132293,7 +135577,7 @@ self: {
        sha256 = "102dzsa64vnbhx2pnnh6q0vn7wag9bd8pmmag3i2yl68iqaqlvpm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Utility construction of the graph depending unusable packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132308,7 +135592,7 @@ self: {
        sha256 = "1w37jmnmx2vrdwbdcnhb29bvy4857pzcx4gdavmcp598lsfj34vy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath lambda-options mtl split
        ];
        jailbreak = true;
@@ -132326,7 +135610,7 @@ self: {
        sha256 = "1njmx622ghpzgnwm4wykzjj1ixpalbj21hs7nkbwpmljniakp2fb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ports-tools process ];
+       executableHaskellDepends = [ base ports-tools process ];
        homepage = "http://github.com/ppenzin/up/";
        description = "Software management tool";
        license = "unknown";
@@ -132340,7 +135624,7 @@ self: {
        pname = "uploadcare";
        version = "0.1";
        sha256 = "1lm7mp8djhxylavihaljqjfsgzpn747plkq6f7yd2dk32xlsb5bz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring cryptohash hex http-conduit
          http-types old-locale time
        ];
@@ -132356,7 +135640,7 @@ self: {
        pname = "upskirt";
        version = "0.0.4";
        sha256 = "0528345xiq2xmi9fwzv0rvbjqfhcvyhkik8c453yr2nr03k0zs4c";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132375,7 +135659,7 @@ self: {
        sha256 = "11zgs8mmmkvddyq6s0x98gdqbdaj6n3rxf6ab3xf1ap2cd4siwb8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint async base bytestring containers curl data-default
          deepseq directory download-curl feed filepath implicit-params
          network old-locale opml optparse-applicative parallel-io split
@@ -132399,7 +135683,7 @@ self: {
        sha256 = "0fnr3xskzwxxxk7iv5bmqa18zbr612pn27jjiac0l4wzv33lisik";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cake3 directory filepath language-javascript
          mime-types mtl optparse-applicative process syb text
        ];
@@ -132416,7 +135700,7 @@ self: {
        pname = "uri";
        version = "0.1.6.3";
        sha256 = "1dhmrn4mq3ia0iv3y2k5pw71a6677q3vdqqf2w4b3aksi6wna49j";
-       buildDepends = [ base parsec safe utf8-string ];
+       libraryHaskellDepends = [ base parsec safe utf8-string ];
        homepage = "http://gitorious.org/uri";
        description = "Library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
@@ -132431,15 +135715,16 @@ self: {
        pname = "uri-bytestring";
        version = "0.1.6";
        sha256 = "0wz45jrxrj2mqx26nv39hy962acmzchp97lbf3d2mjna9zcd1ij6";
-       buildDepends = [ attoparsec base blaze-builder bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring
+       ];
+       testHaskellDepends = [
          attoparsec base blaze-builder bytestring derive HUnit lens
          QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-conduit" = callPackage
@@ -132451,7 +135736,7 @@ self: {
        pname = "uri-conduit";
        version = "1.1.1.2";
        sha256 = "0bmq241in1x0bjffp6nmbz8lf324q926mcddpvmzn2j1ipy7fvg6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers deepseq failure monad-control
          network system-fileio system-filepath text transformers
        ];
@@ -132471,7 +135756,9 @@ self: {
        sha256 = "10pmg48h1az474qsr951inyvkm5y9xqwrdzyvxf83k53i07kijpp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring network-uri text utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring network-uri text utf8-string
+       ];
        description = "Unicode aware uri-encoding";
        license = "unknown";
      }) {};
@@ -132484,7 +135771,7 @@ self: {
        pname = "uri-enumerator";
        version = "0.1.0.1";
        sha256 = "164yzmx18ykkf2vbl9zhqmbvb80dig8bx3pfadw23a6wyvigmhw5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers enumerator failure network text
          transformers
        ];
@@ -132504,7 +135791,7 @@ self: {
        pname = "uri-enumerator-file";
        version = "0.1.1.1";
        sha256 = "15ycv01kmwnwq3qkjjcl8ayal0p4klhflzkykm2rlq1d8mi2vmd6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers enumerator lifted-base monad-control
          network system-fileio system-filepath text transformers
          uri-enumerator
@@ -132524,7 +135811,8 @@ self: {
        sha256 = "1y1jqymjbawwdywk770j4rk8sy7p1plvfliwcmqr0h16y31kzlpl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers utf8-string ];
+       libraryHaskellDepends = [ base containers utf8-string ];
+       executableHaskellDepends = [ base ];
        description = "URI template library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132538,11 +135826,13 @@ self: {
        pname = "uri-templater";
        version = "0.2.0.0";
        sha256 = "0ypyi5vz7fjgvw1xicjksjfbpvm472dif2jw6pn09jfgqkal075s";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base charset containers dlist HTTP mtl parsers
          template-haskell text trifecta unordered-containers vector
        ];
-       testDepends = [ ansi-wl-pprint base HUnit mtl template-haskell ];
+       testHaskellDepends = [
+         ansi-wl-pprint base HUnit mtl template-haskell
+       ];
        homepage = "http://github.com/sanetracker/uri-templater";
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
        license = stdenv.lib.licenses.mit;
@@ -132554,7 +135844,7 @@ self: {
        pname = "url";
        version = "2.1.3";
        sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs";
-       buildDepends = [ base utf8-string ];
+       libraryHaskellDepends = [ base utf8-string ];
        homepage = "http://www.haskell.org/haskellwiki/Url";
        description = "A library for working with URLs";
        license = stdenv.lib.licenses.bsd3;
@@ -132565,10 +135855,10 @@ self: {
      mkDerivation {
        pname = "url-generic";
        version = "0.1";
-       revision = "1";
        sha256 = "0yfcy2nhc67kxb7n9mjxi4z5jcq4iz4kq80fb9lbi461vijhmw5m";
+       revision = "1";
        editedCabalFile = "d9926e2ce6433a73b2ba940d476f7046890752c8a1145b42a78561e8d3ff6fb9";
-       buildDepends = [ base mtl syb ];
+       libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132584,7 +135874,9 @@ self: {
        sha256 = "1mddlppdb0c9pxvjfm40i0bcrg7wbc61hzlrlv6kir0n1j9yb8ri";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring containers mtl network old-time ];
+       executableHaskellDepends = [
+         base bytestring containers mtl network old-time
+       ];
        homepage = "http://code.haskell.org/~dons/code/urlcheck";
        description = "Parallel link checker";
        license = stdenv.lib.licenses.bsd3;
@@ -132599,7 +135891,7 @@ self: {
        sha256 = "13fip41s78qcnrg4zccd5lk3qbsaax7h5sspc0xjzlaca664hq3y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base network ];
+       executableHaskellDepends = [ base network ];
        homepage = "https://github.com/beastaugh/urldecode";
        description = "Decode percent-encoded strings";
        license = stdenv.lib.licenses.bsd3;
@@ -132612,7 +135904,7 @@ self: {
        pname = "urldisp-happstack";
        version = "0.1";
        sha256 = "1kg25w5pnmsnjwycnf0q6d65cqfw5d0xn9rwyn4ybhh3a8q2yaa8";
-       buildDepends = [ base bytestring happstack-server mtl ];
+       libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132626,11 +135918,10 @@ self: {
        sha256 = "16b7jxkfva8dyvl4fdg337jmv08aicycj041s79ak9r6zh41hhwi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl network network-uri split ];
+       libraryHaskellDepends = [ base mtl network network-uri split ];
        homepage = "https://github.com/pheaver/urlencoded";
        description = "Generate or process x-www-urlencoded data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlpath" = callPackage
@@ -132640,11 +135931,13 @@ self: {
      mkDerivation {
        pname = "urlpath";
        version = "2.1.0";
-       revision = "1";
        sha256 = "1q8zj228ln9xmr3r0ggv6pi074l8ixchn81mw8664jikf2pjcqq9";
+       revision = "1";
        editedCabalFile = "a342b25d9ea3984cf20025d421f59629d7abdf4bd2b42a4e9ef53ba5729f13e1";
-       buildDepends = [ base monoid-subclasses mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base monoid-subclasses mtl transformers
+       ];
+       testHaskellDepends = [
          base hspec monoid-subclasses mtl QuickCheck quickcheck-instances
          text transformers
        ];
@@ -132658,8 +135951,8 @@ self: {
        pname = "urn";
        version = "0.1.0.0";
        sha256 = "1wxgq445nzfly9773bjx3mr15l8ga4840d2q1zw50kk07fwxx6h7";
-       buildDepends = [ base parsec ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base hspec ];
        jailbreak = true;
        homepage = "https://github.com/pxqr/urn";
        description = "Universal Resource Names";
@@ -132676,7 +135969,7 @@ self: {
        sha256 = "141b2dhqpbirqlv53rm3xsl14mq0vxw96r3qhygraw5gp5vlvgl9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base filepath mtl optparse-applicative parsec process syb
        ];
        jailbreak = true;
@@ -132694,7 +135987,7 @@ self: {
        pname = "usb";
        version = "1.3.0.3";
        sha256 = "0wn17x61pnckrxn4gba7fdk1phjm82dc2wiblm2wc36xf6mw16yf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
        homepage = "http://basvandijk.github.com/usb";
@@ -132710,7 +136003,7 @@ self: {
        pname = "usb-enumerator";
        version = "0.3";
        sha256 = "1gd132pshcqa8539g1dmx1hpzfdd33x7vpi9d3hrc6q6l6312nfs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bindings-libusb iteratee monad-control
          transformers usb
        ];
@@ -132725,10 +136018,10 @@ self: {
      mkDerivation {
        pname = "usb-hid";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0mx4f1zrk098c9isczni66i8qisx54r85kwyk2s238dznlys39gh";
+       revision = "1";
        editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc";
-       buildDepends = [ attoparsec base bytestring usb ];
+       libraryHaskellDepends = [ attoparsec base bytestring usb ];
        jailbreak = true;
        homepage = "https://github.com/mapinguari/usb-hid";
        description = "Parser and request Library for USB HIDs";
@@ -132745,7 +136038,7 @@ self: {
        sha256 = "1ji6zrglmlkhv743w4d4lrqvhva4yl5kqxb420z44l1wymvgg1s1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bytestring containers
          containers-unicode-symbols parsimony
        ];
@@ -132762,7 +136055,7 @@ self: {
        pname = "usb-iteratee";
        version = "0.5";
        sha256 = "04kv2pfw24d46b135p6mwgf40wb9q43lcy66cbczh4lz0630j771";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bindings-libusb iteratee monad-control
          usb vector
        ];
@@ -132781,7 +136074,7 @@ self: {
        pname = "usb-safe";
        version = "0.14";
        sha256 = "1dhx7y74f2c04dmlsx0i80ar31d6k2qsgh7432c8k0y29iwhdzfm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bindings-libusb bytestring iteratee
          regions text transformers usb
        ];
@@ -132798,7 +136091,9 @@ self: {
        pname = "users";
        version = "0.3.0.0";
        sha256 = "1f63223fxrcyp3gz63viqncqs7yln0mifcnh123172rnfhn61zka";
-       buildDepends = [ aeson base bcrypt path-pieces text time ];
+       libraryHaskellDepends = [
+         aeson base bcrypt path-pieces text time
+       ];
        homepage = "https://github.com/agrafix/users";
        description = "A library simplifying user management for web applications";
        license = stdenv.lib.licenses.mit;
@@ -132813,11 +136108,11 @@ self: {
        pname = "users-persistent";
        version = "0.3.0.0";
        sha256 = "0hdvsnjciw3a6gsz5lv5q6m5fs3hd60gmgfbzgx5n7md2ya5jimr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring mtl persistent persistent-template text time
          users uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec monad-logger persistent-sqlite temporary text users-test
        ];
        homepage = "https://github.com/agrafix/users";
@@ -132833,10 +136128,10 @@ self: {
        pname = "users-postgresql-simple";
        version = "0.3.0.0";
        sha256 = "039da6rvjcdjg5lpd5hqkxcb9vgdcd7ppjiqk3gn6jl5q1gn1yzr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring mtl postgresql-simple text time users uuid
        ];
-       testDepends = [ base hspec postgresql-simple users-test ];
+       testHaskellDepends = [ base hspec postgresql-simple users-test ];
        homepage = "https://github.com/agrafix/users";
        description = "A PostgreSQL backend for the users package";
        license = stdenv.lib.licenses.mit;
@@ -132848,7 +136143,7 @@ self: {
        pname = "users-test";
        version = "0.3.0.0";
        sha256 = "1cmrd0igkidmv8jfb3dv3g49i1k71rh3i4v3dksql18g7472cnxh";
-       buildDepends = [ aeson base hspec text users ];
+       libraryHaskellDepends = [ aeson base hspec text users ];
        homepage = "https://github.com/agrafix/users";
        description = "Library to test backends for the users library";
        license = stdenv.lib.licenses.mit;
@@ -132863,10 +136158,10 @@ self: {
        pname = "utc";
        version = "0.2.0.1";
        sha256 = "0vnydjjvv0kh1mww9vb9l90crl9ddd5n63dwpjjs8ln56b5yvv5h";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring clock exceptions text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring Cabal clock exceptions QuickCheck
          test-framework test-framework-quickcheck2 text
        ];
@@ -132882,7 +136177,7 @@ self: {
        pname = "utf8-env";
        version = "0.1";
        sha256 = "0ls2ls2n12igm1day730sp1gfcwxvkkqd2xdp2lmyp2ldp0d72zp";
-       buildDepends = [ base mtl utf8-string ];
+       libraryHaskellDepends = [ base mtl utf8-string ];
        description = "UTF-8 aware substitutes for functions in System.Environment";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132893,7 +136188,7 @@ self: {
        pname = "utf8-light";
        version = "0.4.2";
        sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q";
-       buildDepends = [ base bytestring ghc-prim ];
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "Unicode";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132906,7 +136201,7 @@ self: {
        sha256 = "156kjn3da02z060srlsm8kqwbxzcscjzxdkp4lmv8zq5zscha5v6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base utf8-string ];
+       libraryHaskellDepends = [ base utf8-string ];
        jailbreak = true;
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
@@ -132918,7 +136213,7 @@ self: {
        pname = "utf8-string";
        version = "1";
        sha256 = "025snarzyk4kkw1dk3i8dsxilvxh4kazl6nwq61w9q49y39qiwvr";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
        license = stdenv.lib.licenses.bsd3;
@@ -132930,8 +136225,8 @@ self: {
        pname = "utility-ht";
        version = "0.0.10";
        sha256 = "17ydzb0p8xhddvfvm4wjv5yjmy0v7nj6fsj11srnnpj91wc9k0xd";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132942,7 +136237,7 @@ self: {
        pname = "uu-cco";
        version = "0.1.0.3";
        sha256 = "0na2gd82z7llrppaskfkrqj3lbl0k6kvb62n4qhpqgsyz001fi8j";
-       buildDepends = [ ansi-terminal base ];
+       libraryHaskellDepends = [ ansi-terminal base ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: core functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -132956,7 +136251,7 @@ self: {
        sha256 = "1i8idcbq602hl1il326lq9b5gcjm9qn00wpragr1kj676g615024";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base uu-cco uuagc uuagc-cabal ];
+       executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: example programs";
        license = stdenv.lib.licenses.bsd3;
@@ -132968,7 +136263,7 @@ self: {
        pname = "uu-cco-hut-parsing";
        version = "0.1.0.1";
        sha256 = "06ddh2fcvy0zbzzdgpcx8kvlssrcmxx4swgkl8iy7223llanx0px";
-       buildDepends = [ base uu-cco uulib ];
+       libraryHaskellDepends = [ base uu-cco uulib ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
        license = stdenv.lib.licenses.bsd3;
@@ -132980,7 +136275,7 @@ self: {
        pname = "uu-cco-uu-parsinglib";
        version = "0.1.0.1";
        sha256 = "1sshnlqb0ydxgrhm0i1c3mpnixfsqwrf3gl59yz4rhiw5hy33z71";
-       buildDepends = [ base ListLike uu-cco uu-parsinglib ];
+       libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
        license = stdenv.lib.licenses.bsd3;
@@ -132992,7 +136287,7 @@ self: {
        pname = "uu-interleaved";
        version = "0.2.0.0";
        sha256 = "1rysap86jrq43b99ay52nrmbdpcba7cl0ac85nsb7gll1rbyr59i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Providing an interleaving combinator for use with applicative/alternative style implementations";
        license = stdenv.lib.licenses.mit;
@@ -133006,7 +136301,7 @@ self: {
        pname = "uu-options";
        version = "0.2.0.0";
        sha256 = "11gixk6lxsakcdxir9jla5nk71phmlzd9hxp8wq23n550xw91ij6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lenses mtl template-haskell transformers uu-interleaved
          uu-parsinglib
        ];
@@ -133021,7 +136316,7 @@ self: {
        pname = "uu-parsinglib";
        version = "2.9.1";
        sha256 = "0cic0f689a6n2si43ijyvkp174y1yfppqv64dicwxz6rm2jhz70d";
-       buildDepends = [ base ListLike time uu-interleaved ];
+       libraryHaskellDepends = [ base ListLike time uu-interleaved ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators";
        license = stdenv.lib.licenses.mit;
@@ -133033,7 +136328,7 @@ self: {
        pname = "uu-tc";
        version = "2009.2.2";
        sha256 = "0s7b23r7gnavwnvzpi25mc0hyg605ms249k5i4661nqpfiwn7zry";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133049,10 +136344,11 @@ self: {
        sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath ghc-prim haskell-src-exts
          mtl uuagc-cabal uulib
        ];
+       executableHaskellDepends = [ base uuagc-cabal ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
@@ -133068,7 +136364,11 @@ self: {
        sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base containers directory filepath ghc-prim haskell-src-exts
+         mtl uulib
+       ];
+       executableHaskellDepends = [
          array base containers directory filepath ghc-prim haskell-src-exts
          mtl uulib
        ];
@@ -133085,7 +136385,7 @@ self: {
        pname = "uuagc-cabal";
        version = "1.0.6.0";
        sha256 = "02xqj4vz7hir0llxl8n517qv22jlmilknhqzx4l55gccffg7zj6w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers directory filepath mtl process uulib
        ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
@@ -133099,7 +136399,7 @@ self: {
        pname = "uuagc-diagrams";
        version = "0.1.1.0";
        sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz";
-       buildDepends = [ base diagrams-lib SVGFonts ];
+       libraryHaskellDepends = [ base diagrams-lib SVGFonts ];
        jailbreak = true;
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
        license = stdenv.lib.licenses.bsd3;
@@ -133114,7 +136414,8 @@ self: {
        sha256 = "1gcznzb8hr2x5mr5pgfqhnvjjrll96g855g4niacw5bd52wdvsla";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base blaze-html process ];
+       libraryHaskellDepends = [ base blaze-html ];
+       executableHaskellDepends = [ base process ];
        homepage = "https://github.com/matthijssteen/uuagd";
        description = "A debugger for the UUAG system";
        license = "unknown";
@@ -133129,11 +136430,11 @@ self: {
        pname = "uuid";
        version = "1.3.11";
        sha256 = "1m8lk12ls4c5xx1y3wm2n2spm2c5slwb27k6zrdibja8z397c637";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cryptohash network-info random text time
          uuid-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck random tasty tasty-hunit
          tasty-quickcheck
        ];
@@ -133148,7 +136449,7 @@ self: {
        pname = "uuid-aeson";
        version = "0.1.0.0";
        sha256 = "0nd2xm908zycrbmrayi6d4c9p9rfplsjkwnz43nrq94xjn1dp2yg";
-       buildDepends = [ aeson base text uuid ];
+       libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133159,7 +136460,7 @@ self: {
        pname = "uuid-le";
        version = "0.2014.1";
        sha256 = "1gfm7bxmr2b5hn4x3dr231ra0b1nwp36x2808w3l43yglz8zwp74";
-       buildDepends = [ base bytestring uuid ];
+       libraryHaskellDepends = [ base bytestring uuid ];
        description = "Universally Unique Identifiers with little-endian-ish encoding tools";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -133170,7 +136471,7 @@ self: {
        pname = "uuid-quasi";
        version = "0.1.0.1";
        sha256 = "09ijnbj2znaqanaxghql3yy1fqb0nsjhrwi6kfzg4h8nrw1ir2pj";
-       buildDepends = [ base template-haskell uuid ];
+       libraryHaskellDepends = [ base template-haskell uuid ];
        homepage = "http://github.com/lpeterse/uuid-quasi";
        description = "Supplemental package for 'uuid' allowing quasiquotation";
        license = stdenv.lib.licenses.bsd3;
@@ -133184,10 +136485,10 @@ self: {
        pname = "uuid-types";
        version = "1.0.2";
        sha256 = "019f9w1jvqacbxmq828wsn6zpwp5yw7bkhyj34a4cc2zq3bfkijn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq hashable random text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/aslatter/uuid";
@@ -133201,7 +136502,7 @@ self: {
        pname = "uulib";
        version = "0.9.20";
        sha256 = "1qz73rjxywc9mf54d2j4xv9m7d15gnfmi1c1fj3yklx059xlvfz2";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
        license = stdenv.lib.licenses.bsd3;
@@ -133212,10 +136513,10 @@ self: {
      mkDerivation {
        pname = "uvector";
        version = "0.1.1.1";
-       revision = "1";
        sha256 = "1psbdsq20nr28cr9ni2mwzwkpz3p20n1xqp0m0m9qafz66d2vi08";
+       revision = "1";
        editedCabalFile = "e289ff93c365248deb93e6268b57be8a47d724a39702887979fd842c80577508";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/uvector";
        description = "Fast unboxed arrays with a flexible interface";
@@ -133229,7 +136530,7 @@ self: {
        pname = "uvector-algorithms";
        version = "0.2";
        sha256 = "0jzlirrar7grq3h02k22zxyvy1wmfrjw9lscnhpjqmsxjli1jh81";
-       buildDepends = [ base uvector ];
+       libraryHaskellDepends = [ base uvector ];
        homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient algorithms for uvector unboxed arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -133242,7 +136543,7 @@ self: {
        pname = "uxadt";
        version = "0.0.16.0";
        sha256 = "0qmp5k4wg5ja2382cwarf8fwjval2a5wdwvz32f965hvwgc9cd43";
-       buildDepends = [ base json MissingH mtl ];
+       libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -133253,7 +136554,7 @@ self: {
        pname = "uzbl-with-source";
        version = "0.1.0.0";
        sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        homepage = "http://github.com/Fuuzetsu/uzbl-with-source";
        description = "Utility function for reading a source of loaded uzbl pages";
        license = stdenv.lib.licenses.gpl3;
@@ -133267,7 +136568,7 @@ self: {
        pname = "v4l2";
        version = "0.1.0.3";
        sha256 = "1hhdpljlic1kyz0pgnv9a04z6prv7rl3x5bam5j0yhm5vijrisgp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL bindings-libv4l2 bindings-linux-videodev2
          bindings-posix containers ioctl
        ];
@@ -133285,7 +136586,7 @@ self: {
        sha256 = "1knn4cbvvk1vsn9if87hqfg761n4410p08g7vlav900svfm8i1l5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT v4l2 ];
+       executableHaskellDepends = [ base GLUT v4l2 ];
        jailbreak = true;
        homepage = "https://gitorious.org/hsv4l2";
        description = "video for linux two examples";
@@ -133294,18 +136595,17 @@ self: {
      }) {};
 
   "vacuum" = callPackage
-    ({ mkDerivation, array, base, containers, ghc-paths, ghc-prim }:
+    ({ mkDerivation, array, base, containers, ghc-prim }:
      mkDerivation {
        pname = "vacuum";
        version = "2.2.0.0";
        sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
-       buildDepends = [ array base containers ghc-prim ];
-       extraLibraries = [ ghc-paths ];
+       libraryHaskellDepends = [ array base containers ghc-prim ];
        homepage = "http://thoughtpolice.github.com/vacuum";
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ghc-paths = null;};
+     }) {};
 
   "vacuum-cairo" = callPackage
     ({ mkDerivation, base, cairo, deepseq, directory, gtk, pretty
@@ -133315,7 +136615,7 @@ self: {
        pname = "vacuum-cairo";
        version = "0.5";
        sha256 = "0jp3xn1h28igcg3xb97ifawx11i7adnyi0ff264w0fril9b8ylwc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo deepseq directory gtk pretty process strict-concurrency
          svgcairo vacuum
        ];
@@ -133331,7 +136631,7 @@ self: {
        pname = "vacuum-graphviz";
        version = "2.1.0.1";
        sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
-       buildDepends = [ base filepath graphviz vacuum ];
+       libraryHaskellDepends = [ base filepath graphviz vacuum ];
        jailbreak = true;
        description = "A library for transforming vacuum graphs into GraphViz output";
        license = stdenv.lib.licenses.gpl3;
@@ -133348,9 +136648,10 @@ self: {
        sha256 = "1dxw3apbf59b7vi4a1gnp29ia1s2q9vx79ns7257cg9cazb01z7j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base network pretty vacuum ];
+       executableHaskellDepends = [
          base bitmap bitmap-opengl directory filepath GLUT network OpenGL
-         pretty process stb-image vacuum
+         process stb-image
        ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
@@ -133364,7 +136665,7 @@ self: {
        pname = "vacuum-ubigraph";
        version = "0.2.0.2";
        sha256 = "0zpag42dr2763ddrwdy7744lqkd6207ljfw3bqm6db3a1128861z";
-       buildDepends = [ base containers hubigraph vacuum ];
+       libraryHaskellDepends = [ base containers hubigraph vacuum ];
        jailbreak = true;
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
        license = stdenv.lib.licenses.bsd3;
@@ -133381,8 +136682,13 @@ self: {
        sha256 = "07bqcp58hqyh5zvi6zpwwpppfzj30j60ryf6k0wqzckklibffqkj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base directory filepath process text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         attoparsec base directory filepath process text
+       ];
+       executableHaskellDepends = [
+         attoparsec base directory filepath process text
+       ];
+       testHaskellDepends = [
          attoparsec base directory filepath process QuickCheck text
        ];
        homepage = "https://github.com/hamishmack/vado";
@@ -133396,7 +136702,7 @@ self: {
        pname = "valid-names";
        version = "0.1.0.1";
        sha256 = "14gpkb6pbkvmny17g2gpq6i6kq7ahmcnkgrcrwm72vda12wxsl78";
-       buildDepends = [ base containers MonadRandom ];
+       libraryHaskellDepends = [ base containers MonadRandom ];
        jailbreak = true;
        homepage = "https://i.joelt.io/symbols.html";
        description = "Valid operator/module characters";
@@ -133422,10 +136728,10 @@ self: {
        pname = "validate-input";
        version = "0.2.0.0";
        sha256 = "0ijlkfizxpjy7r0bh59zfj1jyn77gqd0ryz8k19v7znckq7bxgls";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring either mtl pcre-heavy stringable text
        ];
-       testDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/agrafix/validate-input";
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
@@ -133440,10 +136746,10 @@ self: {
        pname = "validation";
        version = "0.5.1";
        sha256 = "09fx4aa9jlyd59qyx0p6wpvzf9kr29j7xb10nsq61pxjbs1hn5qb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/validation";
@@ -133460,10 +136766,10 @@ self: {
        pname = "validations";
        version = "0.1.0.2";
        sha256 = "0nviyyp0nlpilp2byckrcmbd2n6wp40pq7m10da9b24hmwajkdwk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers digestive-functors mtl text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers digestive-functors HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
          transformers
@@ -133480,7 +136786,7 @@ self: {
        pname = "value-supply";
        version = "0.6";
        sha256 = "0fd6rk46sgdbdmfdr9wy0f3qzwaymgd9hl9v735g2a4bqiqanmb5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for generating values without having to thread state";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133495,7 +136801,10 @@ self: {
        sha256 = "16f1mdsyyfdgjcp3rzf3p1qj3d6la01i9y1yyp97m5nmd2jxsn1q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base deepseq dlist fgl graphviz haskell-src-exts mtl uniplate
+       ];
+       executableHaskellDepends = [
          base deepseq directory dlist fgl graphviz haskell-src-exts mtl
          optparse-applicative process uniplate
        ];
@@ -133514,8 +136823,8 @@ self: {
        pname = "var";
        version = "0.2.0.0";
        sha256 = "1vc36yy8mvzy14jj8ly8ldc4d9vrcgyjfq3dpnzp6fhycg5kkv2i";
-       buildDepends = [ base transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://github.com/sonyandy/var";
@@ -133534,7 +136843,7 @@ self: {
        sha256 = "1hvpx4jw0lwcnc4x8vwdqp7rv8779p7xaw57cphkax13f3rwm372";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cmdargs mtl parallel random
          statistics
        ];
@@ -133550,7 +136859,7 @@ self: {
        pname = "variable-precision";
        version = "0.4";
        sha256 = "1qd6mnbg06fn31vp9d4yan8rqxyymjljrlr7m4yvn2ppw560p564";
-       buildDepends = [
+       libraryHaskellDepends = [
          base complex-generic floatshow integer-gmp
          type-level-natural-number
        ];
@@ -133566,8 +136875,8 @@ self: {
        pname = "variables";
        version = "0.1.1";
        sha256 = "0garxmxm11qhp2wm7xib4nrlkfiqbyzf3glkdbqb582nip0sb1rp";
-       buildDepends = [ base mtl stm ];
-       testDepends = [ base hspec mtl QuickCheck stm ];
+       libraryHaskellDepends = [ base mtl stm ];
+       testHaskellDepends = [ base hspec mtl QuickCheck stm ];
        jailbreak = true;
        homepage = "https://github.com/prophile/variables";
        description = "Monads with variables, without deep magic";
@@ -133582,7 +136891,8 @@ self: {
        sha256 = "1y7mf2q1lawx3f8hdd9b70fa3hrmabm9lmi2rhxvr1dq5r5yh5q7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
+       executableHaskellDepends = [ base time ];
        homepage = "https://github.com/schell/varying";
        description = "Automaton based varying values, event streams and tweening";
        license = stdenv.lib.licenses.mit;
@@ -133595,7 +136905,9 @@ self: {
        pname = "vault";
        version = "0.3.0.4";
        sha256 = "0ah6qrg71krc87f4vjy4b4shdd0mgyil8fikb3j6fl4kfwlg67jn";
-       buildDepends = [ base containers hashable unordered-containers ];
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
        homepage = "https://github.com/HeinrichApfelmus/vault";
        description = "a persistent store for values of arbitrary types";
        license = stdenv.lib.licenses.bsd3;
@@ -133611,12 +136923,12 @@ self: {
        pname = "vaultaire-common";
        version = "2.9.1";
        sha256 = "178lh1cxk6ayb4918xas0g7zlan8282vjflm220pzymnxz07chsr";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base blaze-builder bytestring cereal containers
          hashable hslogger locators old-locale packer QuickCheck siphash
          text time transformers unix unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec locators mtl QuickCheck text
          unordered-containers
        ];
@@ -133633,7 +136945,7 @@ self: {
        pname = "vcache";
        version = "0.2.6";
        sha256 = "08vg106dhzam5h0a6pzz4cbyzfg6pfgcgvn6xm1266kj1ipla18d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers direct-murmur-hash easy-file filelock
          lmdb random stm transformers
        ];
@@ -133650,7 +136962,9 @@ self: {
        pname = "vcache-trie";
        version = "0.2.0";
        sha256 = "0d56l8339ak9my6c37j3mykmfzz67405xyb90pl0i5lf35mbff32";
-       buildDepends = [ array base bytestring bytestring-builder vcache ];
+       libraryHaskellDepends = [
+         array base bytestring bytestring-builder vcache
+       ];
        homepage = "http://github.com/dmbarbour/haskell-vcache-trie";
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
@@ -133662,7 +136976,9 @@ self: {
        pname = "vcard";
        version = "0.1.4";
        sha256 = "1wa1pdfw7ykmq72af63fh999il5nighf7689265hn3i5awm1m16p";
-       buildDepends = [ base bytestring containers mime-directory ];
+       libraryHaskellDepends = [
+         base bytestring containers mime-directory
+       ];
        homepage = "http://github.com/mboes/vCard";
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
@@ -133675,7 +136991,7 @@ self: {
        pname = "vcd";
        version = "0.2.2";
        sha256 = "0x0smhllghzn0xjfk5cwxaf1vnd2yp3saxw92ylyws8a546mzhzm";
-       buildDepends = [ base polyparse ];
+       libraryHaskellDepends = [ base polyparse ];
        homepage = "http://tomahawkins.org";
        description = "Reading and writing VCD files";
        license = stdenv.lib.licenses.bsd3;
@@ -133687,7 +137003,7 @@ self: {
        pname = "vcs-revision";
        version = "0.0.2";
        sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        description = "Facilities for accessing the version control revision of the current directory";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133702,7 +137018,10 @@ self: {
        sha256 = "0wqvd57n74fps2cybn970fgag2bxz8y8wwx4hb3dz7znpqzlp7y8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath gtk mtl process text vcswrapper
+       ];
+       executableHaskellDepends = [
          base directory filepath gtk mtl process text vcswrapper
        ];
        homepage = "https://github.com/forste/haskellVCSGUI";
@@ -133720,7 +137039,11 @@ self: {
        sha256 = "1rbmlfg6kf7b1njfwnd85shlhw8b65j53zsrcn250baj8z0x0p9s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory filepath hxt mtl parsec process split
+         text
+       ];
+       executableHaskellDepends = [
          base containers directory filepath hxt mtl parsec process split
          text
        ];
@@ -133735,7 +137058,7 @@ self: {
        pname = "vect";
        version = "0.4.7";
        sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A low-dimensional linear algebra library, tailored to computer graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -133747,7 +137070,7 @@ self: {
        pname = "vect-floating";
        version = "0.1.0.4";
        sha256 = "1kxsjsiqqpi7k0xz597z7r2fd45s38plgk6jplzxagg0i3bm0q4g";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        jailbreak = true;
        homepage = "http://github.com/cpdurham/vect-floating";
        description = "A low-dimensional linear algebra library, operating on the Floating typeclass";
@@ -133759,10 +137082,10 @@ self: {
      mkDerivation {
        pname = "vect-floating-accelerate";
        version = "0.1.0.4";
-       revision = "1";
        sha256 = "10mn2gvpkp14j7rc7cc66x30k7xh56xpp04ak1aj8p46rsy75s4x";
+       revision = "1";
        editedCabalFile = "af7a5778a0ab8e79fdd4d535aeda7dba18ead15ea3f0b5ae87c3b17c5a076216";
-       buildDepends = [ accelerate base vect-floating ];
+       libraryHaskellDepends = [ accelerate base vect-floating ];
        jailbreak = true;
        homepage = "http://github.com/cpdurham/vect-floating-accelerate";
        description = "Accelerate instances for vect-floating types";
@@ -133775,7 +137098,7 @@ self: {
        pname = "vect-opengl";
        version = "0.4.6.1";
        sha256 = "1qp98j6bgldjcs71pd7iqc5sjf1ixb1jj0l267hw532j4yf81dig";
-       buildDepends = [ base OpenGL vect ];
+       libraryHaskellDepends = [ base OpenGL vect ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
@@ -133787,7 +137110,7 @@ self: {
        pname = "vector";
        version = "0.10.9.3";
        sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
-       buildDepends = [ base deepseq ghc-prim primitive ];
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        jailbreak = true;
        homepage = "https://github.com/haskell/vector";
        description = "Efficient Arrays";
@@ -133803,8 +137126,8 @@ self: {
        pname = "vector";
        version = "0.10.12.3";
        sha256 = "16p8i0gvc9d4n9mxlhlnvrl2s0gmgd7kcsk5czdzz2cd4gh5qxhg";
-       buildDepends = [ base deepseq ghc-prim primitive ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+       testHaskellDepends = [
          base QuickCheck random template-haskell test-framework
          test-framework-quickcheck2 transformers
        ];
@@ -133823,8 +137146,8 @@ self: {
        pname = "vector";
        version = "0.11.0.0";
        sha256 = "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa";
-       buildDepends = [ base deepseq ghc-prim primitive ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+       testHaskellDepends = [
          base QuickCheck random template-haskell test-framework
          test-framework-quickcheck2 transformers
        ];
@@ -133841,13 +137164,16 @@ self: {
      mkDerivation {
        pname = "vector-algorithms";
        version = "0.7";
-       revision = "1";
        sha256 = "1ijnmgvdhj2qi5rsq4b1ffci47inck9arrcan5jzfkvzr54fvzcx";
+       revision = "1";
        editedCabalFile = "ba3ba4dbfe97dc45be68d13c51ba4425900b186a46cdf3eceaafb746030c1b95";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl mwc-random primitive vector ];
-       testDepends = [ base bytestring containers QuickCheck vector ];
+       libraryHaskellDepends = [ base bytestring primitive vector ];
+       executableHaskellDepends = [ base mtl mwc-random vector ];
+       testHaskellDepends = [
+         base bytestring containers QuickCheck vector
+       ];
        homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient algorithms for vector arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -133859,7 +137185,7 @@ self: {
        pname = "vector-binary";
        version = "0.1.1";
        sha256 = "1qdjibh3ywfa0lvawdahnr9qhh2qy6899lm5inbzmksjpykgbazz";
-       buildDepends = [ base binary vector ];
+       libraryHaskellDepends = [ base binary vector ];
        homepage = "https://github.com/kawu/vector-binary";
        description = "Binary instances for vector types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -133871,7 +137197,7 @@ self: {
        pname = "vector-binary-instances";
        version = "0.2.1.0";
        sha256 = "028rsf2w193rhs1gic5yvvrwidw9sblczcn10aw64npfc6502l4l";
-       buildDepends = [ base binary cereal vector ];
+       libraryHaskellDepends = [ base binary cereal vector ];
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
@@ -133883,7 +137209,7 @@ self: {
        pname = "vector-buffer";
        version = "0.4.1";
        sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv";
-       buildDepends = [ base deepseq vector ];
+       libraryHaskellDepends = [ base deepseq vector ];
        description = "A buffer compatible with Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133898,10 +137224,11 @@ self: {
        sha256 = "0xiksm1136azrcidcsi9g59i1nb9r8lhzsn1fhnp830sr63fy7k4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring criterion deepseq ghc-prim primitive vector
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim primitive vector
        ];
-       testDepends = [ base directory QuickCheck random ];
+       executableHaskellDepends = [ base bytestring criterion deepseq ];
+       testHaskellDepends = [ base directory QuickCheck random ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/vector-bytestring";
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
@@ -133918,8 +137245,8 @@ self: {
        pname = "vector-clock";
        version = "0.2.2";
        sha256 = "0ndp25w61rcj4sadvhxlirrk1dhk7rmdzv9kha7kyqa41whr9629";
-       buildDepends = [ base binary ghc-prim hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary ghc-prim hashable ];
+       testHaskellDepends = [
          array base binary ghc-prim HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -133938,8 +137265,8 @@ self: {
        pname = "vector-conduit";
        version = "0.5.0.0";
        sha256 = "10mqmxfqzqcgxf0isv611ailq03smdfybviamxpskncbf15sc6g1";
-       buildDepends = [ base conduit primitive vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base conduit primitive vector ];
+       testHaskellDepends = [
          base conduit HUnit primitive QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -133955,8 +137282,8 @@ self: {
        pname = "vector-fftw";
        version = "0.1.3.2";
        sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0";
-       buildDepends = [ base primitive storable-complex vector ];
-       extraLibraries = [ fftw ];
+       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";
@@ -133971,7 +137298,9 @@ self: {
        pname = "vector-functorlazy";
        version = "0.0.1";
        sha256 = "0ysic3f5xw675bk095pby9ihbgcxpkj4pgp61dwr354w28l0yc03";
-       buildDepends = [ base ghc-prim primitive vector vector-th-unbox ];
+       libraryHaskellDepends = [
+         base ghc-prim primitive vector vector-th-unbox
+       ];
        homepage = "http://github.com/mikeizbicki/vector-functorlazy/";
        description = "vectors that perform the fmap operation in constant time";
        license = stdenv.lib.licenses.bsd3;
@@ -133984,7 +137313,7 @@ self: {
        pname = "vector-heterogenous";
        version = "0.2.0";
        sha256 = "14v0qj2r484pwbjhdymvdqjnsbqszl9wr71hv6wsvs2d8ja1bajl";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://github.com/mikeizbicki/vector-heterogenous/";
        description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints";
        license = stdenv.lib.licenses.bsd3;
@@ -133998,7 +137327,7 @@ self: {
        pname = "vector-instances";
        version = "3.3.0.1";
        sha256 = "1npgvnv8pw5xcax57cam9n5j9ra9phm4b5jj26hbpzwnlh0rkcc4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad keys pointed semigroupoids semigroups vector
        ];
        homepage = "http://github.com/ekmett/vector-instances";
@@ -134012,7 +137341,9 @@ self: {
        pname = "vector-instances-collections";
        version = "0.1.0.1";
        sha256 = "13xk2iwdwrnmdm33z0fmj4sg3irih4ayl3q5pgz31qs9kcsbhi0s";
-       buildDepends = [ base collections-api template-haskell vector ];
+       libraryHaskellDepends = [
+         base collections-api template-haskell vector
+       ];
        jailbreak = true;
        homepage = "http://github.com/kreuzschlitzschraubenzieher/vector-instances-collections";
        description = "Instances of the Data.Collections classes for Data.Vector.*";
@@ -134026,7 +137357,7 @@ self: {
        pname = "vector-mmap";
        version = "0.0.2";
        sha256 = "03hczjc7j1hxnny912cblxdwn908gwm012w03zgj2v9avldp0gmr";
-       buildDepends = [ base mmap primitive vector ];
+       libraryHaskellDepends = [ base mmap primitive vector ];
        homepage = "http://github.com/pumpkin/vector-mmap";
        description = "Memory map immutable and mutable vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -134038,7 +137369,7 @@ self: {
        pname = "vector-random";
        version = "0.2";
        sha256 = "1f74q4bs5mbcw8xg4sxb46ks5x121lbbr6cl09ssr09cpykkbdvb";
-       buildDepends = [ base mersenne-random-pure64 vector ];
+       libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
        homepage = "http://code.haskell.org/~dons/code/vector-random";
        description = "Generate vectors filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -134051,7 +137382,7 @@ self: {
        pname = "vector-read-instances";
        version = "0.0.2.0";
        sha256 = "1k30n5qh16sdfxy77vp10bx52lb1ffmjn70vg87hx12j8wg9vbv6";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "(deprecated) Read instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
@@ -134064,7 +137395,7 @@ self: {
        pname = "vector-space";
        version = "0.10.2";
        sha256 = "0n78g23jw6pcilkssnkqvnq1z8ram1al6cbas24ziacdwjbw6zah";
-       buildDepends = [ base Boolean MemoTrie NumInstances ];
+       libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134075,7 +137406,7 @@ self: {
        pname = "vector-space-map";
        version = "0.1.0.1";
        sha256 = "1s5hh7dlbw1ai3nqqcavrqgidddfj99mi0gmhf2x2zn6ag86xr8b";
-       buildDepends = [ base containers vector-space ];
+       libraryHaskellDepends = [ base containers vector-space ];
        jailbreak = true;
        homepage = "https://github.com/conklech/vector-space-map";
        description = "vector-space operations for finite maps using Data.Map";
@@ -134090,8 +137421,8 @@ self: {
        pname = "vector-space-opengl";
        version = "0.2";
        sha256 = "17rczadmjiblh96r7bfcxy53m7ig534qqcf35i7w6x90354dyiaw";
-       buildDepends = [ base OpenGL vector-space ];
-       testDepends = [
+       libraryHaskellDepends = [ base OpenGL vector-space ];
+       testHaskellDepends = [
          base ieee754 OpenGL QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th vector-space
        ];
@@ -134106,7 +137437,7 @@ self: {
        pname = "vector-space-points";
        version = "0.2.1.1";
        sha256 = "0d5k7wmwhm9y2jif4fy71bnp8nwbfnkh033nzhiw36wfl35aaznp";
-       buildDepends = [ base vector-space ];
+       libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134117,7 +137448,7 @@ self: {
        pname = "vector-static";
        version = "0.3.0.1";
        sha256 = "19spzrk64j2rgyi15dvs8gfbx3nc79ybssaxkv8dn9df4fwksv91";
-       buildDepends = [ base primitive vector ];
+       libraryHaskellDepends = [ base primitive vector ];
        jailbreak = true;
        homepage = "http://github.com/geezusfreeek/vector-static";
        description = "Statically checked sizes on Data.Vector";
@@ -134131,7 +137462,7 @@ self: {
        pname = "vector-strategies";
        version = "0.4";
        sha256 = "04vaizcc78q94vpaly28iwhlwk6nwrsa6jmcq2afdl6yqp63njc6";
-       buildDepends = [ base deepseq parallel vector ];
+       libraryHaskellDepends = [ base deepseq parallel vector ];
        description = "A parallel evaluation strategy for boxed vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134142,8 +137473,8 @@ self: {
        pname = "vector-th-unbox";
        version = "0.2.1.2";
        sha256 = "01admr0akldwwmzmc465f5dbqmq03ldvma67kibanjs25m39dxhd";
-       buildDepends = [ base template-haskell vector ];
-       testDepends = [ base data-default vector ];
+       libraryHaskellDepends = [ base template-haskell vector ];
+       testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134154,7 +137485,7 @@ self: {
        pname = "verbalexpressions";
        version = "1.0.0.0";
        sha256 = "0wai72bqb1vp4p7ml1yj2jdmkjglihai9vhmgj7ri6y2qgzkpwly";
-       buildDepends = [ base regex-pcre ];
+       libraryHaskellDepends = [ base regex-pcre ];
        jailbreak = true;
        homepage = "https://github.com/VerbalExpressions/HaskellVerbalExpressions";
        description = "Regular expressions made easy";
@@ -134167,7 +137498,7 @@ self: {
        pname = "verbosity";
        version = "0.2.0.0";
        sha256 = "0vwv4f5ni6dzvj3jbgxcy8b2hmal6c8xbdin16pifqrn55d52pa9";
-       buildDepends = [ base binary data-default-class deepseq ];
+       libraryHaskellDepends = [ base binary data-default-class deepseq ];
        homepage = "https://github.com/trskop/verbosity";
        description = "Simple enum that encodes application verbosity";
        license = stdenv.lib.licenses.bsd3;
@@ -134179,8 +137510,8 @@ self: {
        pname = "verilog";
        version = "0.0.11";
        sha256 = "0lhl6zcf8f8ndyqx7ksj1qy4a5wnhvphsawb944d5rynrnj8fd46";
-       buildDepends = [ array base ];
-       buildTools = [ alex happy ];
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ alex happy ];
        homepage = "http://github.com/tomahawkins/verilog";
        description = "Verilog preprocessor, parser, and AST";
        license = stdenv.lib.licenses.bsd3;
@@ -134199,11 +137530,11 @@ self: {
        sha256 = "0z7a17j0rd06kvn3v4qr0fhxg0xw6n3579477y2lvx4mcc3qyrvw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring cereal cipher-aes cryptohash directory
          filepath mmap random storable-endian text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring cereal cryptohash filepath mmap QuickCheck
          random test-framework test-framework-quickcheck2 text time
        ];
@@ -134218,7 +137549,7 @@ self: {
        pname = "vhdl";
        version = "0.1.2.1";
        sha256 = "1bi8n8m9an1hcj4c6i2ifqyadg32nq4viffi1kiihaw3j7dh552b";
-       buildDepends = [ base mtl pretty regex-posix ];
+       libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134229,7 +137560,7 @@ self: {
        pname = "views";
        version = "1.0";
        sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "Views allow you to run a State monad on part of a state";
        license = stdenv.lib.licenses.bsd3;
@@ -134253,7 +137584,7 @@ self: {
        sha256 = "1qmwqc2cgrmcjcdfwz0hmfn1irzrwbb7mybrl7myf711sri9ng45";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state aeson async attoparsec base blaze-builder bytestring
          classy-prelude configurator containers data-store directory either
          entropy errors fast-logger http-streams http-types
@@ -134262,7 +137593,7 @@ self: {
          text time transformers unix unordered-containers vector wai
          wai-extra warp yesod yesod-core yesod-platform
        ];
-       testDepends = [
+       testHaskellDepends = [
          acid-state aeson async attoparsec base blaze-builder bytestring
          classy-prelude configurator containers data-store derive directory
          entropy errors fast-logger hspec hspec-expectations http-streams
@@ -134291,12 +137622,13 @@ self: {
        sha256 = "0sc5mlv4d9srgv6rj43ddn27rindpyrz2mwz2i5rmm8y4ixn7jrq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base byline bytestring containers directory either filepath
          http-client http-client-tls http-types mtl old-locale
          optparse-applicative parsec process temporary text themoviedb time
          time-locale-compat transformers xdg-basedir yaml
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
@@ -134314,17 +137646,18 @@ self: {
        sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default deepseq directory filepath
          libmpd mtl old-locale process template-haskell time
          time-locale-compat utf8-string wcwidth
        ];
-       testDepends = [
+       librarySystemDepends = [ ncurses ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base data-default hspec hspec-expectations mtl QuickCheck
          transformers wcwidth
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ ncurses ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) ncurses;};
@@ -134339,7 +137672,7 @@ self: {
        sha256 = "0hmnkmg6sz702nplh7indlzmv7bb36fmaglf9lw0fziabaj9kk25";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base directory filepath HUnit mtl parsec process random
          regex-base regex-posix time
        ];
@@ -134355,8 +137688,8 @@ self: {
        pname = "vinyl";
        version = "0.5.1";
        sha256 = "026h8lgz487d9xhfjscnfpykgv1ppk944hl8mb6z7y3c1vh4g63b";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [ base doctest lens singletons ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base doctest lens singletons ];
        jailbreak = true;
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
@@ -134372,11 +137705,11 @@ self: {
        pname = "vinyl-gl";
        version = "0.3.0.1";
        sha256 = "182ipz8znzk5fi7mpy3m1nbsyqq54p8y0hqycnnbmaxqsmhy6z5a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers GLUtil linear OpenGL tagged transformers vector
          vinyl
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit linear OpenGL tagged test-framework test-framework-hunit
          vinyl
        ];
@@ -134393,10 +137726,10 @@ self: {
        pname = "vinyl-json";
        version = "0.1.0.0";
        sha256 = "07rjlwalpq67hc4pha6x02qbw5pxaz4yimx8sclps9dl7r76xi5c";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring template-haskell text vinyl
        ];
-       testDepends = [ base hlint ];
+       testHaskellDepends = [ base hlint ];
        jailbreak = true;
        description = "Provide json instances automagically to vinyl types";
        license = stdenv.lib.licenses.mit;
@@ -134409,7 +137742,7 @@ self: {
        pname = "vinyl-utils";
        version = "0.1.0.1";
        sha256 = "07clcs7rmzbwn4w9xzbiwc3flrcn2l5p0k5isapis803fpzdq2p0";
-       buildDepends = [ base contravariant transformers vinyl ];
+       libraryHaskellDepends = [ base contravariant transformers vinyl ];
        homepage = "http://hub.darcs.net/mjm/vinyl-utils";
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
@@ -134426,7 +137759,7 @@ self: {
        sha256 = "08z6dvhv4k6a71dvqhvcfl8s5aq7qcg8aj5xbym3931yykl0gxc2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal directory file-embed filepath mtl process
          safe split
        ];
@@ -134448,7 +137781,7 @@ self: {
        sha256 = "1235zclhg4nkd387df4gg3q88hvsqwsdj1j20lnfnclxfah0qxa2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath glib gtk json
          MonadCatchIO-transformers mtl parsec PSQueue stm url utf8-string
          xmms2-client xmms2-client-glib
@@ -134470,7 +137803,12 @@ self: {
        sha256 = "0myppx9bd8bfhii91lqdp00ckp20bq82754mr01s87l1d01gb4wp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base cairo containers directory fgl glade graphviz gtk haskell-src
+         ipprint isevaluated lazysmallcheck parallel pretty process
+         strict-concurrency svgcairo value-supply
+       ];
+       executableHaskellDepends = [
          base cairo containers directory fgl glade graphviz gtk haskell-src
          ipprint isevaluated lazysmallcheck parallel pretty process
          strict-concurrency svgcairo value-supply
@@ -134492,7 +137830,7 @@ self: {
        sha256 = "00wvxsq6yaidiv2izdxsvvfzj8ksrq8y3fky9y68k82ivh7r2y39";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath haskell-src-exts mtl pretty
          process regexpr split uniplate
        ];
@@ -134510,10 +137848,10 @@ self: {
      mkDerivation {
        pname = "vivid";
        version = "0.1.0.3";
-       revision = "1";
        sha256 = "034kjk2lxfbb4hd8z1axccz9alfkm76mpgw39nisvxngjs6si158";
+       revision = "1";
        editedCabalFile = "de2442ab5d53f8044c99cd0489281bf902ef6615028be780e0df937ae60266da";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq hashable mtl network
          split stm
        ];
@@ -134530,7 +137868,7 @@ self: {
        pname = "vk-aws-route53";
        version = "0.1.2";
        sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
        ];
@@ -134547,7 +137885,8 @@ self: {
        sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring process unix ];
+       libraryHaskellDepends = [ base bytestring process unix ];
+       executableHaskellDepends = [ base bytestring process unix ];
        homepage = "https://github.com/proger/posix-pty/tree/fork";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
@@ -134559,7 +137898,7 @@ self: {
        pname = "vocabulary-kadma";
        version = "0.1.0.0";
        sha256 = "1qzx1kl93ic68rvpwf1y9q3gn5c2zf5536ajp6l4xh75dykl8mpb";
-       buildDepends = [ base smaoin ];
+       libraryHaskellDepends = [ base smaoin ];
        homepage = "http://rel4tion.org/projects/vocabularies-hs/";
        description = "Smaoin vocabulary definitions of the base framework";
        license = stdenv.lib.licenses.publicDomain;
@@ -134571,7 +137910,7 @@ self: {
        pname = "void";
        version = "0.7";
        sha256 = "0ivgr4minxb5v56v4kbd045iwqk1c2w89c830731l75mkg8qa6wq";
-       buildDepends = [ base ghc-prim hashable semigroups ];
+       libraryHaskellDepends = [ base ghc-prim hashable semigroups ];
        homepage = "http://github.com/ekmett/void";
        description = "A Haskell 98 logically uninhabited data type";
        license = stdenv.lib.licenses.bsd3;
@@ -134584,7 +137923,9 @@ self: {
        pname = "vorbiscomment";
        version = "0.0.2";
        sha256 = "12kfih0marcrpw9y6wvxgqy6w73f62yhy02c05wcpwxww5cg9iwx";
-       buildDepends = [ base binary-strict bytestring mtl utf8-string ];
+       libraryHaskellDepends = [
+         base binary-strict bytestring mtl utf8-string
+       ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134596,7 +137937,7 @@ self: {
        pname = "vowpal-utils";
        version = "0.1.2";
        sha256 = "09z6nbsj4rqzhksk75glrsrmcs21p8x0jmcpqs6rc9iizz79db8g";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/cartazio/Vowpal-Utils";
        description = "Vowpal Wabbit utilities";
@@ -134610,7 +137951,7 @@ self: {
        pname = "voyeur";
        version = "0.1.0.1";
        sha256 = "117xvh6llh3aw8nxrvvqyjaflq35l69b7s4j1sc79p8r972mdwff";
-       buildDepends = [ base bytestring process utf8-string ];
+       libraryHaskellDepends = [ base bytestring process utf8-string ];
        jailbreak = true;
        homepage = "https://github.com/sethfowler/hslibvoyeur";
        description = "Haskell bindings for libvoyeur";
@@ -134624,9 +137965,9 @@ self: {
        pname = "vte";
        version = "0.13.0.2";
        sha256 = "1w3y88rqkxx3pmcx73kmihivk2k4ywm7jnb9lvmvkgj4bqggis3h";
-       buildDepends = [ base glib gtk pango ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ vte ];
+       libraryHaskellDepends = [ base glib gtk pango ];
+       libraryPkgconfigDepends = [ vte ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
@@ -134638,9 +137979,9 @@ self: {
        pname = "vtegtk3";
        version = "0.13.0.2";
        sha256 = "0dkmp6s58nmc4qvhmxpn91b1zxf0ard33dkbh4426086k1zkcfzg";
-       buildDepends = [ base glib gtk3 pango ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ vte ];
+       libraryHaskellDepends = [ base glib gtk3 pango ];
+       libraryPkgconfigDepends = [ vte ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
@@ -134662,12 +138003,15 @@ self: {
        sha256 = "0wl4qfag8hkhsbm66cgxs55nq3fgmxdxzcvjvcbcm42pcyikvx9y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers data-default deepseq
          directory filepath hashable lens mtl parallel parsec terminfo text
          transformers unix utf8-string vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base containers data-default lens mtl
+       ];
+       testHaskellDepends = [
          base blaze-builder bytestring Cabal containers data-default deepseq
          HUnit lens mtl QuickCheck quickcheck-assertions random smallcheck
          string-qq terminfo test-framework test-framework-hunit
@@ -134690,7 +138034,7 @@ self: {
        sha256 = "1iyygg5sy59f586d31zxdaz1jnpwrir6bfissarb0ag55dhl1j8x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal containers data-default deepseq lens
          mtl parallel parsec QuickCheck random string-qq terminfo text unix
          utf8-string vector vty
@@ -134710,7 +138054,7 @@ self: {
        sha256 = "1ak6k43w381qg41mc5k5shbkwzg35kvh89yldimwk5a5sc08sqbi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base vty ];
+       libraryHaskellDepends = [ base vty ];
        jailbreak = true;
        description = "A lib for displaying a menu and getting a selection using VTY";
        license = stdenv.lib.licenses.gpl3;
@@ -134728,14 +138072,18 @@ self: {
        sha256 = "1mvs2224slnkswcag6knnj9ydkfgvw6nhaiy71bijjd2wwln4fq2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring containers data-default directory filepath
-         mtl QuickCheck random regex-base stm text time unix vector vty
+       libraryHaskellDepends = [
+         array base containers data-default directory filepath mtl
+         regex-base stm text unix vector vty
+       ];
+       executableHaskellDepends = [
+         base bytestring mtl QuickCheck random text time vty
        ];
        jailbreak = true;
        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
@@ -134744,7 +138092,7 @@ self: {
        pname = "vty-ui-extras";
        version = "0.1";
        sha256 = "1c60bvhk1riilj7sl7x7nw4d9yg56f2k0ps1aivmjm0q4brhgnx7";
-       buildDepends = [ base regex-base regex-pcre vty vty-ui ];
+       libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ];
        jailbreak = true;
        description = "Extra vty-ui functionality not included in the core library";
        license = stdenv.lib.licenses.bsd3;
@@ -134761,7 +138109,11 @@ self: {
        sha256 = "0v4qhr01bqz7hb5q8hf2rdk8fxrbbmvsighi5wv2gv5b3cwh28cv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring case-insensitive containers directory
+         JuicyPixels
+       ];
+       executableHaskellDepends = [
          base binary bytestring case-insensitive containers directory
          JuicyPixels
        ];
@@ -134779,10 +138131,10 @@ self: {
        pname = "wai";
        version = "3.0.3.0";
        sha256 = "044djv5r10g92cg7wvz8zlxsyjhnr2mqb1gf3gr9a1rjlcsv8zn4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring http-types network text vault
        ];
-       testDepends = [ base blaze-builder bytestring hspec ];
+       testHaskellDepends = [ base blaze-builder bytestring hspec ];
        homepage = "https://github.com/yesodweb/wai";
        description = "Web Application Interface";
        license = stdenv.lib.licenses.mit;
@@ -134801,7 +138153,7 @@ self: {
        pname = "wai-app-file-cgi";
        version = "3.0.8";
        sha256 = "0adj4s8hxr9rpmqf6899cjaw6axwzw5jvw325wv2qxv3yp4x3w5x";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base blaze-builder blaze-html
          bytestring case-insensitive conduit conduit-extra containers
          data-default-class directory filepath http-client http-conduit
@@ -134809,7 +138161,7 @@ self: {
          process sockaddr static-hash text transformers unix wai wai-conduit
          word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra directory doctest filepath
          hspec HTTP http-types unix wai warp
        ];
@@ -134832,7 +138184,7 @@ self: {
        sha256 = "0aiywk7a25fpk9fwm6fmibi4zvg5kynnjs6syfxyzfw4hl1dazjv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder blaze-html blaze-markup
          byteable bytestring containers cryptohash cryptohash-conduit
          directory file-embed filepath http-date http-types mime-types
@@ -134840,7 +138192,10 @@ self: {
          transformers unix-compat unordered-containers wai wai-extra warp
          zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
          base bytestring hspec http-date http-types mime-types network
          old-locale text time transformers unix-compat wai wai-extra zlib
        ];
@@ -134857,7 +138212,7 @@ self: {
        pname = "wai-conduit";
        version = "3.0.0.2";
        sha256 = "1wqn8biq0ghz7ikmlq7x7vpdq2yc7mk9rnz9vlng7vcm7wpqilj7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring conduit http-types transformers wai
        ];
        homepage = "https://github.com/yesodweb/wai";
@@ -134875,11 +138230,11 @@ self: {
        pname = "wai-cors";
        version = "0.2.3";
        sha256 = "1mnybcf50d0ijbg2a40kf4sl55rb1m4p02nqqid4g7vcanmfjw92";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base-unicode-symbols bytestring case-insensitive
          charset http-types mtl parsers transformers wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-unicode-symbols directory filepath http-types network
          process text wai wai-websockets warp websockets
        ];
@@ -134897,7 +138252,7 @@ self: {
        pname = "wai-digestive-functors";
        version = "0.3";
        sha256 = "04l9m43gm1zcgq32c70870kygy87p44zb4kvqcvi86zcspqdgpld";
-       buildDepends = [
+       libraryHaskellDepends = [
          base digestive-functors http-types resourcet text transformers wai
          wai-extra wai-util
        ];
@@ -134912,7 +138267,7 @@ self: {
        pname = "wai-dispatch";
        version = "0.1";
        sha256 = "1qyarjbpnngb2x272gkmvrhy3f8kqygxj4nvi6giz09rdx9pfrza";
-       buildDepends = [ base text wai yesod-routes ];
+       libraryHaskellDepends = [ base text wai yesod-routes ];
        homepage = "https://github.com/singpolyma/wai-dispatch";
        description = "Nice wrapper around yesod-routes for use with WAI";
        license = "unknown";
@@ -134924,7 +138279,7 @@ self: {
        pname = "wai-eventsource";
        version = "3.0.0";
        sha256 = "1h5zlqky7ldqbmiaixizhk1s8ghf5i3ha1xfz8flxgzr7gr0al3q";
-       buildDepends = [ wai ];
+       libraryHaskellDepends = [ wai ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI support for server-sent events (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -134943,14 +138298,14 @@ self: {
        pname = "wai-extra";
        version = "3.0.10";
        sha256 = "0dqvfwqzkr3g030s24lzy9l9vaws27m0cs0aq771p7f22w9g6fjh";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
          directory fast-logger http-types lifted-base network old-locale
          resourcet streaming-commons stringsearch text time transformers
          unix unix-compat vault void wai wai-logger word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring case-insensitive cookie fast-logger
          hspec http-types HUnit resourcet text time transformers wai zlib
        ];
@@ -134967,7 +138322,7 @@ self: {
        pname = "wai-frontend-monadcgi";
        version = "3.0.0.1";
        sha256 = "0g0lkkfcfi9vldl0g4r6qy8an1hsd4xnqw9z8d66mw696ydynvsj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive cgi containers http-types
          transformers wai
        ];
@@ -134981,7 +138336,7 @@ self: {
        pname = "wai-graceful";
        version = "0.1.0.1";
        sha256 = "0a06yrakg9gwjjj4f9nr474j8i8xz642aj56m8vaq621i1kn7jaq";
-       buildDepends = [ base http-types mtl resourcet unix wai ];
+       libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
        jailbreak = true;
        homepage = "https://bitbucket.org/dpwiz/wai-graceful";
        description = "Graceful shutdown for WAI applications";
@@ -135000,10 +138355,11 @@ self: {
        sha256 = "13f3w31kr3zinll76i6y3walpyqz3i1rlbsh3d7c5p8hp2d88bzy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cmdargs directory hint http-types
-         network old-time text time transformers wai wai-extra warp
+       libraryHaskellDepends = [
+         attoparsec base bytestring directory hint http-types network
+         old-time text time transformers wai wai-extra warp
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "WAI server that automatically reloads code after modification. (deprecated)";
@@ -135017,8 +138373,8 @@ self: {
        pname = "wai-handler-fastcgi";
        version = "3.0.0.1";
        sha256 = "14lm9vbh213jxd1nkxcipisja90h3ay6mi6iiim65k7snm3b7w1v";
-       buildDepends = [ base bytestring wai wai-extra ];
-       extraLibraries = [ fcgi ];
+       libraryHaskellDepends = [ base bytestring wai wai-extra ];
+       librarySystemDepends = [ fcgi ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Wai handler to fastcgi";
        license = stdenv.lib.licenses.mit;
@@ -135032,7 +138388,7 @@ self: {
        pname = "wai-handler-launch";
        version = "3.0.0.4";
        sha256 = "1qfisa19rhlx241jr90mz8x844pp5yx1z8xbmflvj81gpnvsgh7i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring http-types process streaming-commons
          transformers wai warp
        ];
@@ -135046,7 +138402,7 @@ self: {
        pname = "wai-handler-scgi";
        version = "2.0.0.2";
        sha256 = "0h7d78d641bjsnmxsnz4b7s9pw4x0y0xi8bld51y4nqnbjl8gvac";
-       buildDepends = [ base bytestring wai wai-extra ];
+       libraryHaskellDepends = [ base bytestring wai wai-extra ];
        jailbreak = true;
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Wai handler to SCGI (deprecated)";
@@ -135061,7 +138417,7 @@ self: {
        pname = "wai-handler-snap";
        version = "0.1.1";
        sha256 = "0akk9h7m1hhdggbhj0grss94jzm13fmcmgj51nvh7mfj6f5kj31l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers enumerator snap-core snap-server
          transformers wai
        ];
@@ -135078,8 +138434,8 @@ self: {
        pname = "wai-handler-webkit";
        version = "3.0.0.1";
        sha256 = "1fm985jq1sa8v3vj850cpcjl6kcyq2kgq6xwpb1rmzi8zmb80kpc";
-       buildDepends = [ base wai warp ];
-       pkgconfigDepends = [ QtWebKit ];
+       libraryHaskellDepends = [ base wai warp ];
+       libraryPkgconfigDepends = [ QtWebKit ];
        jailbreak = true;
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
@@ -135095,7 +138451,7 @@ self: {
        pname = "wai-hastache";
        version = "0.1";
        sha256 = "1kkn8n33cm5r7hw0xxf815nx1ixg09r7ckspq228j1syq5j1lzq8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring hastache http-types transformers wai
        ];
        homepage = "https://github.com/singpolyma/wai-hastache";
@@ -135113,11 +138469,11 @@ self: {
        pname = "wai-hmac-auth";
        version = "1.0.0";
        sha256 = "1hjzwh9hzy29y617faa94428s7ja2ri0bggqxwmf27a0r4qpf1r4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bifunctors byteable bytestring containers
          cryptohash http-types monad-loops mtl transformers wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base64-bytestring bifunctors byteable bytestring containers
          cryptohash hspec http-types monad-loops mtl transformers wai
          wai-extra
@@ -135136,7 +138492,7 @@ self: {
        pname = "wai-lens";
        version = "0.1";
        sha256 = "05vd7pjw6jgbb11yln4h2lbyr5pr471040p51pj7iy2m65s42v4x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types lens network text vault wai
        ];
        homepage = "https://github.com/webcrank/wai-lens";
@@ -135152,7 +138508,7 @@ self: {
        pname = "wai-lite";
        version = "0.2.0.0";
        sha256 = "1ghxna51m304x5yvgfdgpml0yf6jqhfkixlxxnflg7z34h6wjzz4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit http-types text transformers wai wai-extra
        ];
        jailbreak = true;
@@ -135170,12 +138526,12 @@ self: {
        pname = "wai-logger";
        version = "2.2.4.1";
        sha256 = "1s6svvy3ci4j1dj1jaw8hg628miwj8f5gpy9n8d8hpsaxav6nzgk";
-       buildDepends = [
+       libraryHaskellDepends = [
          auto-update base blaze-builder byteorder bytestring
          case-insensitive easy-file fast-logger http-types network unix
          unix-time wai
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135188,7 +138544,7 @@ self: {
        pname = "wai-logger-prefork";
        version = "0.3.0";
        sha256 = "0cfslqr2zdj0x83dbscafhdljrn2xswym7hpf23zlrsrnpz71qy4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring date-cache fast-logger http-types unix wai
          wai-logger
        ];
@@ -135206,11 +138562,11 @@ self: {
        pname = "wai-middleware-cache";
        version = "0.3.6";
        sha256 = "1kqrqjsmnwwavcyhwx6m2x3qk7qbd0h60817ai61dz3aprwc8hdw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder-conduit bytestring conduit crypto-conduit
          http-types pureMD5 wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring http-types HUnit test-framework
          test-framework-hunit wai wai-test
        ];
@@ -135230,7 +138586,7 @@ self: {
        pname = "wai-middleware-cache-redis";
        version = "0.4.3";
        sha256 = "1vd81jcisav6jyqzwa0qn35xarm21bjrw0qps9qbbq56svkh1lw9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder-conduit bytestring case-insensitive
          conduit hedis hedis-pile http-types transformers wai
          wai-middleware-cache
@@ -135248,7 +138604,9 @@ self: {
        pname = "wai-middleware-catch";
        version = "0.3.6";
        sha256 = "1vh5sad3zhdwxqbmivmy9hkbnq9vrv4k6k17rjk4f79lv2xcq56h";
-       buildDepends = [ base bytestring http-types lifted-base wai ];
+       libraryHaskellDepends = [
+         base bytestring http-types lifted-base wai
+       ];
        jailbreak = true;
        homepage = "https://github.com/akaspin/wai-middleware-catch";
        description = "Wai error catching middleware";
@@ -135269,11 +138627,15 @@ self: {
        sha256 = "0qq7kilp9a4qjja337saqccn250s6mnf3n80sgyg935hy1dmm7fq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base base-prelude bytestring conduit conduit-extra
          consul-haskell enclosed-exceptions http-client http-types
          monad-control monad-logger network process resourcet text
-         transformers void wai wai-app-static wai-conduit wai-extra warp
+         transformers void wai wai-conduit
+       ];
+       executableHaskellDepends = [
+         async base base-prelude monad-logger transformers wai
+         wai-app-static wai-extra warp
        ];
        homepage = "https://github.com/fpco/wai-middleware-consul";
        description = "Wai Middleware for Consul";
@@ -135295,12 +138657,16 @@ self: {
        sha256 = "039vqcy16ww7cigzppl0lnmjwbvxdv0z0zq3rnklh334lyh5jfay";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          authenticate base base64-bytestring binary blaze-builder bytestring
-         case-insensitive clientsession containers cookie gitrev http-client
-         http-client-tls http-reverse-proxy http-types optparse-applicative
-         resourcet template-haskell text time transformers unix-compat vault
-         wai wai-app-static warp
+         case-insensitive clientsession containers cookie http-client
+         http-client-tls http-types resourcet text time unix-compat vault
+         wai
+       ];
+       executableHaskellDepends = [
+         base clientsession gitrev http-client http-client-tls
+         http-reverse-proxy optparse-applicative template-haskell text
+         transformers wai wai-app-static warp
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
@@ -135315,7 +138681,7 @@ self: {
        pname = "wai-middleware-etag";
        version = "0.1.0.0";
        sha256 = "0mcqnzvxx671awr2szyfpm6jskily9zxvmg61zz430km4i2q3wj8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cryptohash filepath http-date
          http-types unix-compat unordered-containers wai
        ];
@@ -135334,7 +138700,7 @@ self: {
        pname = "wai-middleware-gunzip";
        version = "0.0.2";
        sha256 = "0rbvpw4y4qr2mhijlybzwwd12mkhrwmxlrhj2q0mq9diwhp597dx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types streaming-commons wai
        ];
        homepage = "https://github.com/twittner/wai-middleware-gunzip";
@@ -135348,7 +138714,7 @@ self: {
        pname = "wai-middleware-headers";
        version = "0.1";
        sha256 = "10ap355j4dx42y7ycf1plpbg04wazv0q62mi3ibza8sb33hiiprh";
-       buildDepends = [ base bytestring http-types wai ];
+       libraryHaskellDepends = [ base bytestring http-types wai ];
        homepage = "http://github.com/seanhess/wai-middleware-headers";
        description = "cors and addHeaders for WAI";
        license = stdenv.lib.licenses.bsd3;
@@ -135365,11 +138731,11 @@ self: {
        pname = "wai-middleware-hmac";
        version = "0.1.0.0";
        sha256 = "01xd1nhi96lflh6ssaz3m5dkacrp2b2kwk611jc8q5j3kmyc0zqs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring case-insensitive
          cryptohash http-types transformers wai word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring doctest Glob hlint hspec http-types HUnit process
          regex-compat wai wai-extra
        ];
@@ -135390,11 +138756,14 @@ self: {
        sha256 = "1jmfmcdv1js6rgadfhwb071qp418440ij0hm0fmyf03dk879qhds";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring case-insensitive
          cryptohash http-client http-types mtl old-locale time transformers
          word8
        ];
+       executableHaskellDepends = [
+         base bytestring http-client transformers
+       ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135409,8 +138778,8 @@ self: {
        pname = "wai-middleware-metrics";
        version = "0.2.1";
        sha256 = "0aiig72r72vykd1f1871458d4glnqsrs7rr402jv5ka05d1rg6y0";
-       buildDepends = [ base ekg-core http-types time wai ];
-       testDepends = [
+       libraryHaskellDepends = [ base ekg-core http-types time wai ];
+       testHaskellDepends = [
          base bytestring ekg-core http-types QuickCheck scotty tasty
          tasty-hunit tasty-quickcheck time transformers wai wai-extra
        ];
@@ -135428,10 +138797,10 @@ self: {
        pname = "wai-middleware-preprocessor";
        version = "0.2.0.0";
        sha256 = "1n9z00v5a75pas22cdm26hj888s6kc98bddh2gfs3ffrazdmgbj1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory mtl split text wai wai-middleware-static
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Cabal directory mtl split text wai wai-middleware-static warp
        ];
        jailbreak = true;
@@ -135449,11 +138818,11 @@ self: {
        pname = "wai-middleware-prometheus";
        version = "0.1.0.1";
        sha256 = "0drhprxja1pp0mibs2f4asl4mycy91pvyanxa0h364k9v6fwp93d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default http-types prometheus-client text time
          wai
        ];
-       testDepends = [ base doctest prometheus-client ];
+       testHaskellDepends = [ base doctest prometheus-client ];
        homepage = "https://github.com/fimad/prometheus-haskell";
        description = "WAI middlware for exposing http://prometheus.io metrics.";
        license = stdenv.lib.licenses.asl20;
@@ -135468,10 +138837,10 @@ self: {
        pname = "wai-middleware-route";
        version = "0.7.3";
        sha256 = "0zgiaxc5rqjlkfwkb11a5zkmbybrfcqr74mq5vpj03mqz1q0lmx7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types text wai yesod-routes
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring http-types HUnit test-framework
          test-framework-hunit text wai wai-test
        ];
@@ -135491,7 +138860,7 @@ self: {
        pname = "wai-middleware-static";
        version = "0.7.0.1";
        sha256 = "0kvs3bv5yyg1j7zghl91gi12g7k20vwbbk0ag9clmq3zn33i46iw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash directory
          expiring-cache-map filepath http-types mtl old-locale text time wai
        ];
@@ -135509,7 +138878,7 @@ self: {
        pname = "wai-middleware-static-caching";
        version = "0.6.0.1";
        sha256 = "0xj4r1fr1g0fybgsq65gxcvh5zn9hafvm0f73p6dnj6jhz6dryhk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash directory
          expiring-cache-map filepath http-types mtl old-locale text time
          unix wai
@@ -135530,11 +138899,11 @@ self: {
        pname = "wai-middleware-throttle";
        version = "0.2.0.1";
        sha256 = "08qxdcbn1lg9rd2rcp10iri1maamn5cily9mbg1r65h8ivdmrdan";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers http-types network stm token-bucket transformers
          wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hlint hspec http-types HUnit stm transformers wai
          wai-extra
        ];
@@ -135552,11 +138921,11 @@ self: {
        pname = "wai-predicates";
        version = "0.8.4";
        sha256 = "06ib359k8amh15qmmv6rdmicak1rrx758xfrf75nni03z9k9rby5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion case-insensitive
          cookie http-types singletons transformers vault vector wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring case-insensitive http-types tasty
          tasty-hunit tasty-quickcheck wai
        ];
@@ -135574,7 +138943,7 @@ self: {
        pname = "wai-request-spec";
        version = "0.10.0.1";
        sha256 = "13s86z82rcsy3ai4qzjbxinwxzd81zhsvf589mhn2fhfk8qm7wdg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
        homepage = "https://gitlab.com/cpp.cabrera/wai-request-spec";
@@ -135588,7 +138957,7 @@ self: {
        pname = "wai-responsible";
        version = "0.0.0.0";
        sha256 = "0qf64g11113gl45bfn12j2ikdjwrdxg9r8cicfs4pmh0dq5vj0va";
-       buildDepends = [ base bytestring http-types wai ];
+       libraryHaskellDepends = [ base bytestring http-types wai ];
        jailbreak = true;
        homepage = "https://github.com/pharpend/wai-responsible";
        description = "Response interface for WAI";
@@ -135603,10 +138972,10 @@ self: {
        pname = "wai-route";
        version = "0.3";
        sha256 = "1gmadxdki64x2r7931vsgzzb1hkk03a1virkjmnfm3i7kz5dp4kp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types unordered-containers wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring http-types mtl QuickCheck tasty tasty-quickcheck
          wai
        ];
@@ -135620,7 +138989,7 @@ self: {
        pname = "wai-router";
        version = "1.0.0.1";
        sha256 = "1827mk64vyivdc12z4h230c4b993i6g8wl4sl0364jda586z58p7";
-       buildDepends = [ base text wai ];
+       libraryHaskellDepends = [ base text wai ];
        jailbreak = true;
        homepage = "http://github.com/mdmarek/wai-router";
        description = "Provides basic routing on URL paths for WAI";
@@ -135636,14 +139005,13 @@ self: {
        pname = "wai-routes";
        version = "0.7.2";
        sha256 = "05f8524q9rb5y4d8fryhv4jjkcgqygbckg4pkklvs86s5zlg9nsa";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers http-types
          monad-loops mtl path-pieces random template-haskell text wai
        ];
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-routing" = callPackage
@@ -135656,11 +139024,11 @@ self: {
        pname = "wai-routing";
        version = "0.12.1";
        sha256 = "01bs5mmycn7dkvnp01mh226iy1b419amab83fmgk0asd2f3jsfn5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion case-insensitive
          cookie http-types transformers wai wai-predicates wai-route
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring bytestring-conversion
          case-insensitive containers http-types tasty tasty-hunit
          tasty-quickcheck wai wai-predicates
@@ -135679,14 +139047,13 @@ self: {
        pname = "wai-session";
        version = "0.3.2";
        sha256 = "09l3gj8l127iybr8h4xcjxxcgz5b1mcy5iyyaidixnzi7jlrqww3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers cookie http-types StateVar
          time transformers vault wai
        ];
        homepage = "https://github.com/singpolyma/wai-session";
        description = "Flexible session middleware for WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session-clientsession" = callPackage
@@ -135697,14 +139064,13 @@ self: {
        pname = "wai-session-clientsession";
        version = "0.1";
        sha256 = "0kczhsmkv88g0x8mk4cfy5z9wv3fzv8v3r4z0q7jkyda0grx3gwf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal clientsession errors transformers
          wai-session
        ];
        homepage = "https://github.com/singpolyma/wai-session-clientsession";
        description = "Session store based on clientsession";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session-tokyocabinet" = callPackage
@@ -135715,7 +139081,7 @@ self: {
        pname = "wai-session-tokyocabinet";
        version = "0.1";
        sha256 = "0cd4x3byc8kaarjpfczqaiv5y3ixrdcilnnypkhcavk3vj7w7pmr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal errors tokyocabinet-haskell transformers
          wai-session
        ];
@@ -135735,7 +139101,7 @@ self: {
        pname = "wai-static-cache";
        version = "0.1.0.1";
        sha256 = "0vlkh9izxx1qsb61fak57kk9k35i3vph8qbyvlmgwcw7nplagq6l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cityhash conduit conduit-combinators containers
          http-types resourcet system-filepath text transformers vector
          vector-algorithms wai
@@ -135753,7 +139119,7 @@ self: {
        pname = "wai-static-pages";
        version = "0.3";
        sha256 = "0xam283gvcjryq541dzrymv9qy7asyfz8k44b6dwrvm5bqphjz9h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring conduit directory http-types text wai
          wai-extra
        ];
@@ -135768,7 +139134,7 @@ self: {
        pname = "wai-test";
        version = "3.0.0";
        sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx";
-       buildDepends = [ wai ];
+       libraryHaskellDepends = [ wai ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -135782,7 +139148,9 @@ self: {
        pname = "wai-throttler";
        version = "0.1.0.5";
        sha256 = "1jh53ac1q4zksxdrmwjgsyidvx8zlhx57nnf3ca4spa3paz9n9g6";
-       buildDepends = [ base bytestring containers http-types time wai ];
+       libraryHaskellDepends = [
+         base bytestring containers http-types time wai
+       ];
        jailbreak = true;
        description = "Wai middleware for request throttling";
        license = stdenv.lib.licenses.mit;
@@ -135798,7 +139166,7 @@ self: {
        pname = "wai-util";
        version = "0.8";
        sha256 = "10rkrhs7xv6qmx31ll891c2nnaqpblyfxqmn8xwjhafp7ks1wqjm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit http-accept http-types
          network-uri text transformers wai wai-extra
        ];
@@ -135818,7 +139186,11 @@ self: {
        sha256 = "0i8r5r8l3z6fk7a466n48ralq33kdihc8g91ia4z22cqhl0zkizy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring case-insensitive http-types network
+         transformers wai websockets
+       ];
+       executableHaskellDepends = [
          base blaze-builder bytestring case-insensitive file-embed
          http-types network text transformers wai wai-app-static warp
          websockets
@@ -135834,7 +139206,7 @@ self: {
        pname = "wait-handle";
        version = "0.1.1";
        sha256 = "09080zx6m4lqli85867ilck82gvgnz4vkq9nxx5f1v5fli1i0n7m";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://www.github.com/fmap/waithandle";
        description = "Wait handles are MVars which can only be written to once, and from which values can never be removed";
        license = stdenv.lib.licenses.bsd3;
@@ -135846,7 +139218,7 @@ self: {
        pname = "waitfree";
        version = "0.1.5";
        sha256 = "09hlqli7zpcxfa8w7vh937gc3rxp7s8q8v1zs8ciwnmh6ca4i8rq";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -135860,11 +139232,11 @@ self: {
        pname = "waitra";
        version = "0.0.3.0";
        sha256 = "0yismhhgwzrssla2bcg44jy0fdwwxh2szypyjn8wfjvmkfhzshvn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory filepath http-types
          regex-applicative template-haskell text wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base http-types regex-applicative tasty tasty-hunit wai
          wai-extra
        ];
@@ -135886,13 +139258,13 @@ self: {
        pname = "warp";
        version = "3.1.2";
        sha256 = "1ya8mfvb18p9d5bj0ijnlbd7m04mj7f1z9ld82a8vry37sdifidq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
          containers ghc-prim hashable http-date http-types http2 iproute
          network simple-sendfile stm streaming-commons text unix unix-compat
          vault wai word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          array async auto-update base blaze-builder bytestring
          case-insensitive containers directory doctest ghc-prim hashable
          hspec HTTP http-date http-types http2 HUnit iproute lifted-base
@@ -135913,7 +139285,10 @@ self: {
        sha256 = "1kmmy2av0ikr6mb8g7ffqmf505ha4201qv7y48fyc9p8j0p6lk6g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base data-default dyre http-types wai warp ];
+       libraryHaskellDepends = [
+         base data-default dyre http-types wai warp
+       ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://tanakh.jp";
        description = "Dynamic configurable warp HTTP server";
@@ -135931,7 +139306,7 @@ self: {
        sha256 = "181z8cr55qngy6jyqzqz5wcgiyip4rn3q1am0hkcxvmdnif2w2km";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs containers directory mime-types text
          wai-app-static wai-extra warp
        ];
@@ -135939,6 +139314,7 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Static file server based on Warp and wai-app-static (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls" = callPackage
@@ -135949,7 +139325,7 @@ self: {
        pname = "warp-tls";
        version = "3.1.0";
        sha256 = "1790hl3a327fv01w2shdslylmhp5zv0bh7ljhymipr5vpjwjknrz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
        ];
@@ -135969,7 +139345,11 @@ self: {
        sha256 = "11av9jkf8z2xcpwg3nyx018qwpdrm0cs79qj14z93ah1yxbavb5y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring certificate conduit crypto-random network
+         network-conduit pem tls tls-extra unix wai warp
+       ];
+       executableHaskellDepends = [
          base bytestring certificate conduit crypto-random http-types
          network network-conduit pem tls tls-extra unix wai warp
        ];
@@ -135985,7 +139365,7 @@ self: {
        pname = "watchdog";
        version = "0.2.2.1";
        sha256 = "06b93cqn6rbl6jbjyawzqmrx80h0dbcks7ia6l3wzdqpic8yjj6v";
-       buildDepends = [ base mtl time ];
+       libraryHaskellDepends = [ base mtl time ];
        jailbreak = true;
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
@@ -136000,7 +139380,7 @@ self: {
        pname = "watcher";
        version = "0.0.3.0";
        sha256 = "1c6025zpghqvw5xlapnfk8nwf32iq6dkpnpzi65pm5l5f5npwwgs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude containers hinotify system-fileio
          system-filepath
        ];
@@ -136022,16 +139402,21 @@ self: {
        sha256 = "134b9nrl2lmcr80hxmf72la220plh48vdl0r2la3c3k6qimsd276";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base fsnotify optparse-applicative process resource-pool
          streaming-commons system-filepath text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base fsnotify optparse-applicative process resource-pool
+         streaming-commons system-filepath text
+       ];
+       testHaskellDepends = [
          async base bytestring HUnit QuickCheck smallcheck system-fileio
          system-filepath tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "File change watching utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wavconvert" = callPackage
@@ -136042,7 +139427,7 @@ self: {
        sha256 = "028qx9b4z2gr4nc6hid0phdrysvhfqswj64s71pw2grqw4f8ddkx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base directory filepath process ];
        description = "Command-line tool for converting audio files and filling in ID3 tags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136055,7 +139440,7 @@ self: {
        pname = "wavesurfer";
        version = "0.0.6";
        sha256 = "1f9hsmvwdgrib44sj1rnkm4hv92iad27xg75n2y2qdq1a8giazn5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bytestring-lexing bytestring-show
          delimited-text
        ];
@@ -136076,9 +139461,11 @@ self: {
        sha256 = "0rvzsmd7lzimyphc2yscadwkanqpi8wnmdk5hrzwpcm6dcavyj9q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring containers filepath pretty-show riff split
-         vector
+       libraryHaskellDepends = [
+         base binary bytestring containers riff split vector
+       ];
+       executableHaskellDepends = [
+         base bytestring filepath pretty-show split vector
        ];
        jailbreak = true;
        homepage = "http://bitbucket.org/robertmassaioli/wavy";
@@ -136096,7 +139483,8 @@ self: {
        sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [
          attoparsec base bytestring containers setlocale utf8-string
        ];
        homepage = "http://github.com/solidsnack/wcwidth/";
@@ -136112,7 +139500,7 @@ self: {
        pname = "weather-api";
        version = "0.4.3";
        sha256 = "0wlh3p5z2vivhn9pgqzjhczrb7jyfzkz889fmwnvm7h87440jnyj";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring HTTP network utf8-string vector
        ];
        jailbreak = true;
@@ -136128,7 +139516,7 @@ self: {
        pname = "web-browser-in-haskell";
        version = "1.0";
        sha256 = "1y674dw8slz0m7i23j7p1qykdci2wssmx6x0yf23cf0nywz1py5k";
-       buildDepends = [ base gtk webkit ];
+       libraryHaskellDepends = [ base gtk webkit ];
        description = "Web Browser In Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136140,7 +139528,7 @@ self: {
        pname = "web-css";
        version = "0.1.0";
        sha256 = "1havyvd6f0xagynxpar2jsmx5x1izwl7wgxia0wbwbzaj0fzn2k2";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "Simple functions for CSS";
        license = stdenv.lib.licenses.bsd3;
@@ -136156,7 +139544,7 @@ self: {
        sha256 = "0lg9vbsmg9nfs2440ab2srhhawg1xfi5lnhxzd9rj7kab460w2x3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory failure old-locale text time
        ];
        jailbreak = true;
@@ -136174,13 +139562,12 @@ self: {
        pname = "web-fpco";
        version = "0.1.1.0";
        sha256 = "1iizmg1syjywd5hs9swcqxxzmix04hwa86p8c246xybwcklf667n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base happstack-server safe snap snap-core snap-server
        ];
        homepage = "https://github.com/fpco/web-fpco";
        description = "Wrappers for web frameworks to ease usage with the FP Complete environment";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -136192,7 +139579,7 @@ self: {
        pname = "web-mongrel2";
        version = "0.0.3";
        sha256 = "1j2pq3kzmk2gibrr4jcm5gksz9pk9shjqqpwc85ygb2mpf5yc1gw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default file-embed haskell98 HStringTemplate
          json mtl old-time parsec system-uuid template-haskell text
          zeromq-haskell
@@ -136214,7 +139601,7 @@ self: {
        sha256 = "1hzqwp67pj1xvhmdaxmij08820ffxf559d7jgr8037zzm7j02cql";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring clay containers jmacro
          lens mtl Stream text vector wl-pprint-text
        ];
@@ -136229,11 +139616,10 @@ self: {
        pname = "web-plugins";
        version = "0.2.8";
        sha256 = "00w0v0q2i0jxwlav1qb967nf35bxbr6vwacs5mqficzg2d4pz969";
-       buildDepends = [ base containers mtl stm text ];
+       libraryHaskellDepends = [ base containers mtl stm text ];
        homepage = "http://www.happstack.com/";
        description = "dynamic plugin system for web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes" = callPackage
@@ -136245,14 +139631,14 @@ self: {
      mkDerivation {
        pname = "web-routes";
        version = "0.27.9";
-       revision = "2";
        sha256 = "1azccgcnksz4c4pm1nayvjiq3m192zz21cnc0fm89hdixvqck346";
+       revision = "2";
        editedCabalFile = "542f5d20616359b0897018bbd347ce7f0dc948c4e031e8a5383ed85cb931406b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring exceptions ghc-prim http-types mtl
          parsec split text utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
@@ -136266,7 +139652,9 @@ self: {
        pname = "web-routes-boomerang";
        version = "0.28.4";
        sha256 = "0ailw4s0c1f054q58dwylq1g1f043vw4ywk0spg5d3sk9asy8bxh";
-       buildDepends = [ base boomerang mtl parsec text web-routes ];
+       libraryHaskellDepends = [
+         base boomerang mtl parsec text web-routes
+       ];
        description = "Library for maintaining correctness and composability of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136279,7 +139667,7 @@ self: {
        pname = "web-routes-happstack";
        version = "0.23.9";
        sha256 = "0vsjm979z21858wk9z1b855jqmr4apm35b5ff8x6nynq6kiflrzw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring happstack-server text web-routes
        ];
        description = "Adds support for using web-routes with Happstack";
@@ -136292,7 +139680,7 @@ self: {
        pname = "web-routes-hsp";
        version = "0.24.6";
        sha256 = "048dxx5cjdm7v0340p9x3s73a6y7fldykzkwkpb12bb926bir3fl";
-       buildDepends = [ base hsp text web-routes ];
+       libraryHaskellDepends = [ base hsp text web-routes ];
        description = "Adds XMLGenerator instance for RouteT monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136303,7 +139691,7 @@ self: {
        pname = "web-routes-mtl";
        version = "0.20.1";
        sha256 = "1k35ch294p2pkf7mbip8wy9rin956y31sq68b4cdrj9sj9891rx5";
-       buildDepends = [ base web-routes ];
+       libraryHaskellDepends = [ base web-routes ];
        description = "Extends web-routes with mtl-based MonadIO / MonadTrans RouteT instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136316,7 +139704,7 @@ self: {
        sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base path-pieces template-haskell text ];
+       libraryHaskellDepends = [ base path-pieces template-haskell text ];
        jailbreak = true;
        homepage = "http://docs.yesodweb.com/web-routes-quasi/";
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
@@ -136330,7 +139718,7 @@ self: {
        pname = "web-routes-regular";
        version = "0.19.0";
        sha256 = "0qllws4mzmmc6fh4hcvj3zp7kk8pwap59yq6wy0zx7mx0ac7015r";
-       buildDepends = [ base parsec regular text web-routes ];
+       libraryHaskellDepends = [ base parsec regular text web-routes ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136344,10 +139732,10 @@ self: {
        pname = "web-routes-th";
        version = "0.22.3";
        sha256 = "0ccv1mzisd0fnhbl776i0fhavjazm0l3b4ycnbdzgs1kh4w8gzfp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base parsec split template-haskell text web-routes
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th web-routes
        ];
@@ -136361,7 +139749,7 @@ self: {
        pname = "web-routes-transformers";
        version = "0.19.1";
        sha256 = "0pm1v9wqlzi6cg92lajbwbnhsdm509371i8mvyvvj6qa5m58cdib";
-       buildDepends = [ base transformers web-routes ];
+       libraryHaskellDepends = [ base transformers web-routes ];
        jailbreak = true;
        description = "Extends web-routes with some transformers instances for RouteT";
        license = stdenv.lib.licenses.bsd3;
@@ -136376,7 +139764,9 @@ self: {
        pname = "web-routes-wai";
        version = "0.24.1";
        sha256 = "13mwfyafpk29c8bbx48vhbxsgk28fmh579gjn6gjlhvkisc45q1b";
-       buildDepends = [ base bytestring http-types text wai web-routes ];
+       libraryHaskellDepends = [
+         base bytestring http-types text wai web-routes
+       ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136388,13 +139778,13 @@ self: {
      mkDerivation {
        pname = "web-routing";
        version = "0.6.2";
-       revision = "1";
        sha256 = "1x7imgnpq3998fk4pi2z5ba0r9xc7blf61rn1i51yqqd24la887f";
+       revision = "1";
        editedCabalFile = "4aa263239149f8ef52999fdc29c8e90c552081672a4476adedce903248e15524";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring primitive text types-compat unordered-containers
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/philopon/web-routing";
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
@@ -136410,15 +139800,15 @@ self: {
      mkDerivation {
        pname = "webcrank";
        version = "0.2.2";
-       revision = "1";
        sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj";
+       revision = "1";
        editedCabalFile = "487831902c68484790108f97e32098dad9711eb15e0729b9ab1ba009e8fd5747";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring case-insensitive either
          exceptions http-date http-media http-types lens mtl semigroups text
          transformers unordered-containers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring case-insensitive exceptions http-date
          http-media http-types lens mtl tasty tasty-hunit tasty-quickcheck
          unordered-containers
@@ -136435,16 +139825,17 @@ self: {
      mkDerivation {
        pname = "webcrank-dispatch";
        version = "0.1";
-       revision = "1";
        sha256 = "1w4kfcm2d6iw4d45ywg2g6iysxl2iywk3nbk5ac6p6500y6hh97k";
+       revision = "1";
        editedCabalFile = "50b6b56e1fccc20a2986ea93b04410b8131ea5f2f4df94df538c6b2369400fa8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl path-pieces reroute text unordered-containers
        ];
        jailbreak = true;
        homepage = "https://github.com/webcrank/webcrank-dispatch.hs";
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webcrank-wai" = callPackage
@@ -136456,13 +139847,14 @@ self: {
        pname = "webcrank-wai";
        version = "0.2.1";
        sha256 = "13db2hpyvzpx9i43d8pryq7f87zlajpfpf0h6biva28l9qamy1yv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring exceptions lens mtl unix-compat
          unordered-containers wai wai-lens webcrank webcrank-dispatch
        ];
        homepage = "https://github.com/webcrank/webcrank-wai";
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver" = callPackage
@@ -136477,19 +139869,18 @@ self: {
        pname = "webdriver";
        version = "0.6.2";
        sha256 = "1cr668vn51bsdwxk6az4dk8zcsgy1y5vhb7xb9mahhbv1anpnzgr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring cond
          data-default directory directory-tree exceptions filepath
          http-client http-types lifted-base monad-control mtl network
          network-uri scientific temporary text time transformers
          transformers-base unordered-containers vector zip-archive
        ];
-       testDepends = [ base parallel text ];
+       testHaskellDepends = [ base parallel text ];
        jailbreak = true;
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver-angular" = callPackage
@@ -136501,18 +139892,17 @@ self: {
        pname = "webdriver-angular";
        version = "0.1.7";
        sha256 = "18lyw9qasg9ynsa9yg90121h6z5h7kl6lzw7q5zqgkwpm1xr1p21";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base language-javascript template-haskell text transformers
          unordered-containers webdriver
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hspec-webdriver transformers wai-app-static warp
          webdriver
        ];
        homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver-snoy" = callPackage
@@ -136526,17 +139916,17 @@ self: {
      mkDerivation {
        pname = "webdriver-snoy";
        version = "0.6.0.4";
-       revision = "1";
        sha256 = "02c2ihqk5gsgnv61rj14rdd76r2nhmxacml3z9krrgxgn326hrbk";
+       revision = "1";
        editedCabalFile = "7cc952e84c8ff09b8d032df7d8089bd4d5167b32834bda67c79c62a34b12d52a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring cond
          data-default directory directory-tree exceptions filepath
          http-client http-types lifted-base monad-control mtl network
          scientific temporary text time transformers transformers-base
          unordered-containers vector zip-archive
        ];
-       testDepends = [ base parallel text ];
+       testHaskellDepends = [ base parallel text ];
        jailbreak = true;
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
@@ -136554,7 +139944,10 @@ self: {
        sha256 = "05l4y7y171g41dlzfgd25ww59r4ajqbj9jpzrsmq5zpazx6p6gzy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring HSFFIG LEXER parsec pretty utf8-env utf8-string
+       ];
+       executableHaskellDepends = [
          base bytestring HSFFIG LEXER parsec pretty utf8-env utf8-string
        ];
        jailbreak = true;
@@ -136574,7 +139967,7 @@ self: {
        sha256 = "16fsk6x875bmnqng5mfkxcxrkp3dcs3lkmsnds5fm416x4iw1sql";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary binary-strict blaze-builder bytestring containers
          filepath hopfli optparse-applicative text vector xmlgen zlib
        ];
@@ -136593,13 +139986,14 @@ self: {
        pname = "webkit";
        version = "0.13.1.3";
        sha256 = "00h9465xl6rfnd72cmn68z3mpany63dxl6fm2gqjbdzbrssj7306";
-       buildDepends = [ base bytestring cairo glib gtk mtl pango text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ webkit ];
+       libraryHaskellDepends = [
+         base bytestring cairo glib gtk mtl pango text
+       ];
+       libraryPkgconfigDepends = [ webkit ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) webkit;};
 
   "webkit-javascriptcore" = callPackage
@@ -136608,8 +140002,8 @@ self: {
        pname = "webkit-javascriptcore";
        version = "0.13.0.4";
        sha256 = "1gj40kdll7pd84graxcrc327za6kgp453zh48srmzvrk9yvnj67x";
-       buildDepends = [ base glib gtk webkit ];
-       buildTools = [ gtk2hs-buildtools ];
+       libraryHaskellDepends = [ base glib gtk webkit ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136623,9 +140017,11 @@ self: {
        pname = "webkitgtk3";
        version = "0.13.1.3";
        sha256 = "0gfznb6n46576im72m6k9wrwc2n9f48nk4dsaz2llvzlzlzx4zfk";
-       buildDepends = [ base bytestring cairo glib gtk3 mtl pango text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ webkit ];
+       libraryHaskellDepends = [
+         base bytestring cairo glib gtk3 mtl pango text
+       ];
+       libraryPkgconfigDepends = [ webkit ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
@@ -136640,9 +140036,9 @@ self: {
        pname = "webkitgtk3-javascriptcore";
        version = "0.13.0.4";
        sha256 = "0lq6n1bhvg9rf48scc5ss299dil205y23r9qzl1ls4g4msv6k25c";
-       buildDepends = [ base glib gtk3 webkitgtk3 ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ webkit ];
+       libraryHaskellDepends = [ base glib gtk3 webkitgtk3 ];
+       libraryPkgconfigDepends = [ webkit ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
@@ -136655,10 +140051,10 @@ self: {
      mkDerivation {
        pname = "webpage";
        version = "0.0.3.1";
-       revision = "1";
        sha256 = "1s9q44wvkc60g1117c3c4klf9pc92x7rpgvb7pwyhbbkvshmnirj";
+       revision = "1";
        editedCabalFile = "1829b0f7db8745498bee16ed1d70917aa781fd14ab8f8032b51472cfc3cd6787";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html data-default hastache lucid text
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
@@ -136674,7 +140070,7 @@ self: {
        pname = "webserver";
        version = "0.7.1.1";
        sha256 = "0mjbw1v0xy3ji6y0wdiv77y7bc4r5z7jk67gzzgny2cx1vx3c973";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring c10k containers directory filepath network
          old-locale parsec process stm time unix zlib
        ];
@@ -136691,7 +140087,7 @@ self: {
        sha256 = "05favr2lpc8y3qy7wahcriq8qhvzvr3ngvrgdyjcvf5bvyfwlp84";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath gtk webkit ];
+       executableHaskellDepends = [ base filepath gtk webkit ];
        homepage = "https://github.com/jrb/websnap";
        description = "Transforms URLs to PNGs";
        license = stdenv.lib.licenses.bsd3;
@@ -136708,11 +140104,11 @@ self: {
        pname = "websockets";
        version = "0.9.5.0";
        sha256 = "016h213sk3n662ri8ns1sswcnaml61qckprdgxdp0m2a77amivmy";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy mtl network random SHA text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy HUnit mtl network QuickCheck
          random SHA test-framework test-framework-hunit
@@ -136731,7 +140127,7 @@ self: {
        pname = "websockets-snap";
        version = "0.9.2.0";
        sha256 = "03szycdvygw1zkv2s090wn2jii9sqbplgbycmpm5mfm3r0jhbhxp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator mtl snap-core snap-server websockets
        ];
        description = "Snap integration for the websockets library";
@@ -136748,7 +140144,7 @@ self: {
        pname = "webwire";
        version = "0.1.0";
        sha256 = "0m2wl7cfg67yyj2bbn811g6gsvzj7sw1sb3y2zanc0dxjd4cr4r2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder blaze-html bytestring
          case-insensitive containers cookie cprng-aes hamlet http-types
          netwire shakespeare-css shakespeare-js text time transformers wai
@@ -136767,7 +140163,7 @@ self: {
        sha256 = "0rwbckf5h68170jrs1m70kgqf9h43vypj65wcw390w0xc7kmyv49";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://web.mornfall.net";
        description = "a wedding announcement";
        license = stdenv.lib.licenses.publicDomain;
@@ -136780,12 +140176,12 @@ self: {
      mkDerivation {
        pname = "wedged";
        version = "0";
-       revision = "1";
        sha256 = "1sdnqc40qg5pv0kj4qw33vk5cy3yym60csh3iwmpm7pzpray7511";
+       revision = "1";
        editedCabalFile = "64bac15c983cf83ab2b05b002439b8f125b9c942ae46ed75a187f7e2dc68dba5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base colour containers diagrams-cairo diagrams-lib
          MonadRandom strict
        ];
@@ -136803,8 +140199,8 @@ self: {
        sha256 = "0r765ppzazdsm5i3prgf6a405f88xi8sx79jdz9mck4584w7fqzr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ happy ];
        jailbreak = true;
        homepage = "http://sebfisch.github.com/haskell-regexp";
        description = "Weighted Regular Expression Matcher";
@@ -136818,7 +140214,7 @@ self: {
        pname = "weighted-search";
        version = "0.1.0.1";
        sha256 = "1va2b10g3h2wfl9d7f27d55z5c93fvz41sb023l4c2ym1w9kw8zv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/weighted-search";
        description = "A weighted nondeterministic search monad";
        license = stdenv.lib.licenses.bsd3;
@@ -136832,10 +140228,10 @@ self: {
      mkDerivation {
        pname = "welshy";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "08pgns5irmvh9c12lxq2x72ql8ggzd3npfqnrphba3l171380gki";
+       revision = "1";
        editedCabalFile = "ff6973a67b742efb8d7c1d542ba9f27056de3e547ade96d33e9b68314afec22c";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit http-types lifted-base
          resourcet text transformers unordered-containers wai warp
        ];
@@ -136852,7 +140248,7 @@ self: {
        pname = "wheb-mongo";
        version = "0.0.3.0";
        sha256 = "1xxks0jxjwph7372jqnscm6z0b28zz3dvb49b2aw37jmnvwrfdcy";
-       buildDepends = [ base bson mongoDB mtl text Wheb ];
+       libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "MongoDB plugin for Wheb";
@@ -136866,7 +140262,7 @@ self: {
        pname = "wheb-redis";
        version = "0.0.1.0";
        sha256 = "025chjp41qbjr9m6c3pd9v510h4aac1rvbyrki3c7617sca8a45h";
-       buildDepends = [ base bytestring hedis mtl text Wheb ];
+       libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Redis connection for Wheb";
@@ -136880,7 +140276,7 @@ self: {
        pname = "wheb-strapped";
        version = "0.1.0.0";
        sha256 = "1wykpp325336kk7a1vnnjffankcw0kaw3jcfin53cp8hsx4bwfdp";
-       buildDepends = [ base mtl StrappedTemplates text Wheb ];
+       libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Strapped templates for Wheb";
@@ -136894,7 +140290,7 @@ self: {
        pname = "while-lang-parser";
        version = "0.1.0.0";
        sha256 = "0dlq2rldak4lb0w8hcx7aigdj7b59crp1k130p36cha7zpqdixll";
-       buildDepends = [ base indents parsec ];
+       libraryHaskellDepends = [ base indents parsec ];
        homepage = "https://github.com/davnils/while-lang-parser";
        description = "Parser for the While language";
        license = stdenv.lib.licenses.bsd3;
@@ -136910,7 +140306,7 @@ self: {
        sha256 = "0fgasnviqmz8ifkb8ikvj721f9j1xzvix5va0jxi81gh6f400ij6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers GLUT mtl OpenGL process random X11
        ];
        jailbreak = true;
@@ -136926,7 +140322,7 @@ self: {
        pname = "whiskers";
        version = "0.1.0.3";
        sha256 = "0kbyv0q6z2d2plblafqcmwcfiyhdbijqnqg2w7qxr7dklka8245v";
-       buildDepends = [ base parsec template-haskell ];
+       libraryHaskellDepends = [ base parsec template-haskell ];
        jailbreak = true;
        description = "Mustache templates with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -136940,7 +140336,7 @@ self: {
        sha256 = "1y89bayaccz8qqzsfmpr917dczgbn5srskja6f2dab3ipxhk24z9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ haskell98 random ];
+       executableHaskellDepends = [ haskell98 random ];
        homepage = "https://github.com/haroldl/whitespace-nd";
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
@@ -136952,10 +140348,10 @@ self: {
      mkDerivation {
        pname = "whois";
        version = "1.2.2";
-       revision = "1";
        sha256 = "199fd710zicx7ijyvipc7p0d3yg18f6nppcln2wz38hl9kfv0iv0";
+       revision = "1";
        editedCabalFile = "c11f42da958683ffb7a2e958dcefe2ef1a3e732732010f44facfbb0fffd7571e";
-       buildDepends = [ base network network-uri split ];
+       libraryHaskellDepends = [ base network network-uri split ];
        homepage = "http://github.com/relrod/whois-hs";
        description = "WHOIS client library";
        license = stdenv.lib.licenses.bsd3;
@@ -136972,7 +140368,7 @@ self: {
        sha256 = "089mmwrknghkliakni3wmwrd0hcngg3kqkijfmmky4bxni6w39bd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory epub filepath haskell98 HTTP network
          regex-base regex-posix tagsoup url xml zip-archive zlib
        ];
@@ -136990,7 +140386,8 @@ self: {
        sha256 = "131hr8c4q7fwqmwzyp1fwnz349h6103v5gjvzjpbhb7ngki38nfq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base process split ];
+       libraryHaskellDepends = [ base split ];
+       executableHaskellDepends = [ base process split ];
        homepage = "http://github.com/ygale/win-hp-path";
        description = "Work with multiple Haskell Platform versions on Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -137006,7 +140403,7 @@ self: {
        sha256 = "15dk3wdv99ggxwypgnv8hs5ygn5bzqml9jhhz6l9kgnc0rrn3jbz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Crypto dataenc mtl network parsec pretty split time urlencoded
        ];
        jailbreak = true;
@@ -137035,10 +140432,10 @@ self: {
        pname = "winio";
        version = "0.1";
        sha256 = "0f13x6fcb7cb4rfza5vp1dfxx3rcggh5rgw05lkqx9jwvnqcnjwm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-exceptions network winerror
        ];
-       extraLibraries = [ kernel32 ws2_32 ];
+       librarySystemDepends = [ kernel32 ws2_32 ];
        homepage = "http://github.com/felixmar/winio";
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -137053,8 +140450,8 @@ self: {
        pname = "wiring";
        version = "0.3.0";
        sha256 = "0c7xg6xq5bmb0qc2f9509sx5yrnngp4q5v1bgxl636qp9mhck68x";
-       buildDepends = [ base mtl template-haskell transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base mtl template-haskell transformers ];
+       testHaskellDepends = [
          base hspec mtl QuickCheck template-haskell transformers
        ];
        homepage = "http://github.com/seanparsons/wiring/";
@@ -137070,7 +140467,7 @@ self: {
        pname = "witherable";
        version = "0.1.3";
        sha256 = "0n0l169xh23925blgzy2i90gz8lsa0176dp49bl6cncq362bqcn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans containers hashable transformers
          unordered-containers vector
        ];
@@ -137085,7 +140482,9 @@ self: {
        pname = "witness";
        version = "0.3";
        sha256 = "0r0395blixr5g3s2dm4x4mj93yjk4zlig0b5acbnnr7yimjmnd11";
-       buildDepends = [ base categories constraints transformers ];
+       libraryHaskellDepends = [
+         base categories constraints transformers
+       ];
        homepage = "https://github.com/AshleyYakeley/witness";
        description = "values that witness types";
        license = stdenv.lib.licenses.bsd3;
@@ -137099,7 +140498,7 @@ self: {
        sha256 = "1k8c74j28nji46gib7r2ivfbvvzmkka9qnyf8hh7cyjgsmxxvq83";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring network unix ];
+       executableHaskellDepends = [ base bytestring network unix ];
        homepage = "https://github.com/kazu-yamamoto/witty/blob/master/README.md";
        description = "A network server to show bottlenecks of GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -137113,7 +140512,7 @@ self: {
        pname = "wizards";
        version = "1.0.2";
        sha256 = "02yk9d01d39c3hpvlh2c6v35fzyf3nm92f6vff0qns30dmr2r8ab";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers control-monad-free haskeline mtl transformers
        ];
        description = "High level, generic library for interrogative user interfaces";
@@ -137126,7 +140525,7 @@ self: {
        pname = "wkt";
        version = "0.2.5";
        sha256 = "02r453wx1kv50lw0hx4nvzzv5wjfsy16gyjqphc25aq45rl5hr8g";
-       buildDepends = [ base lens linear parsec parsec-numbers ];
+       libraryHaskellDepends = [ base lens linear parsec parsec-numbers ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/wkt";
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
@@ -137139,7 +140538,7 @@ self: {
        pname = "wl-pprint";
        version = "1.2";
        sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137152,7 +140551,7 @@ self: {
        pname = "wl-pprint-ansiterm";
        version = "0.2.0.0";
        sha256 = "02s47f58ah08fvjqpdscxqiq9609agi5iplczrdkgxrv1vj8vkpz";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring containers mtl nats semigroups text
          transformers wl-pprint-extras
        ];
@@ -137170,10 +140569,12 @@ self: {
        pname = "wl-pprint-extras";
        version = "3.5.0.5";
        sha256 = "13wdx7l236yyv9wqsgcjlbrm5gk1bmw1z2lk4b21y699ly2imhm9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers nats semigroupoids semigroups text utf8-string
        ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        homepage = "http://github.com/ekmett/wl-pprint-extras/";
        description = "A free monad based on the Wadler/Leijen pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -137187,7 +140588,7 @@ self: {
        pname = "wl-pprint-terminfo";
        version = "3.7.1.3";
        sha256 = "19z5cr1wqc3xcy39dswx78b6fpxhb41798zkiwkmb97nnvzwbdmv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers nats semigroups terminfo text
          transformers wl-pprint-extras
        ];
@@ -137202,7 +140603,7 @@ self: {
        pname = "wl-pprint-text";
        version = "1.1.0.4";
        sha256 = "1xgizzimfw17mpmw2afvmnvyag976j8ggn7k5r564rkw9f0m6bgz";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        description = "A Wadler/Leijen Pretty Printer for Text values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137215,12 +140616,12 @@ self: {
        pname = "wlc-hs";
        version = "0.1.0.0";
        sha256 = "0z553h86dznsf2wagbfhh8p27aa20jm3wmxkklr51al35xralvv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default lens pretty process transformers
          xkbcommon
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ wlc ];
+       librarySystemDepends = [ wlc ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
@@ -137242,14 +140643,18 @@ self: {
        sha256 = "1w2j7xr4f0a63bwz96js8wrdpfw73qzdg6d607lx2526yrq8xlh2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base-prelude bytestring hastache http-types
+       libraryHaskellDepends = [
+         attoparsec base-prelude bytestring hastache http-types
          monad-control network network-simple old-locale pipes
          pipes-bytestring pipes-network pipes-parse pipes-safe pipes-text
-         safe stm stm-containers system-fileio system-filepath text time
-         transformers unordered-containers yaml
+         stm stm-containers system-fileio system-filepath text time
+         transformers unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base-prelude bytestring network safe system-fileio
+         system-filepath text unordered-containers yaml
+       ];
+       testHaskellDepends = [
          base-prelude bytestring HTF http-client http-types HUnit
          lifted-async mwc-random network QuickCheck quickcheck-instances
          safe system-fileio system-filepath text transformers
@@ -137269,7 +140674,9 @@ self: {
        sha256 = "0b83s5q4i3f4l45dklp1xgrlcpzrsdbd16fvlpazlcglzxk81xmv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring filepath zlib ];
+       executableHaskellDepends = [
+         base binary bytestring filepath zlib
+       ];
        jailbreak = true;
        description = "Web Open Font Format (WOFF) unpacker";
        license = stdenv.lib.licenses.bsd3;
@@ -137284,7 +140691,8 @@ self: {
        sha256 = "0w0m91srvgbj3qcxw2djpb482qlinsi2dyyb76qksdd2gw0jm57i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network split ];
+       libraryHaskellDepends = [ base network split ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://tom.lokhorst.eu/wol";
        description = "Send a Wake on LAN Magic Packet";
@@ -137304,12 +140712,15 @@ self: {
        sha256 = "1g98xjl8qpayj8ynz0391cqhfagaxa03hxqaz2wvyppalqdp44k9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson amazonka amazonka-s3 amazonka-swf base bytestring conduit
          conduit-extra cryptohash exceptions fast-logger http-conduit lens
          monad-control monad-logger mtl mtl-compat optparse-applicative safe
-         shelly text transformers transformers-base unordered-containers
-         uuid yaml
+         text transformers transformers-base unordered-containers uuid yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring cryptohash optparse-applicative shelly text
+         transformers yaml
        ];
        jailbreak = true;
        homepage = "https://github.com/swift-nav/wolf";
@@ -137323,11 +140734,11 @@ self: {
      mkDerivation {
        pname = "word-trie";
        version = "0.3.0";
-       revision = "1";
        sha256 = "10ljyb1hl4awg2c3wq5shdqj2s53q5fklf7p6np1jhn6i30c5wx3";
+       revision = "1";
        editedCabalFile = "85582eefb0020e6e35a0e2588e1dd647fb20bb7f70108f29493f994af5b74a05";
-       buildDepends = [ base binary containers ];
-       testDepends = [ base binary containers hspec QuickCheck ];
+       libraryHaskellDepends = [ base binary containers ];
+       testHaskellDepends = [ base binary containers hspec QuickCheck ];
        homepage = "https://github.com/yi-editor/word-trie";
        description = "Implementation of a finite trie over words";
        license = stdenv.lib.licenses.gpl2;
@@ -137339,8 +140750,8 @@ self: {
        pname = "word12";
        version = "1.0.0";
        sha256 = "19a22vs314bps0fq7md9jv43xzrya28mmfxi39zd8a1d8h99yd5c";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "http://github.com/minpou/word12";
        description = "Word12 library";
        license = stdenv.lib.licenses.bsd3;
@@ -137354,8 +140765,8 @@ self: {
        pname = "word24";
        version = "1.0.7";
        sha256 = "1rh766jrmfw1hy1p4xllfq2ygxpm3zyglw4vcjainajn2r7whnhi";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://www.tiresiaspress.us/haskell/word24";
@@ -137370,8 +140781,8 @@ self: {
        pname = "word8";
        version = "0.1.2";
        sha256 = "1pbn8ra3qhwvw07p375cdmp7jzlg07hgdcr4cpscz3h7b9sy7fiw";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        description = "Word8 library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137393,8 +140804,8 @@ self: {
        pname = "wordexp";
        version = "0.2.0.0";
        sha256 = "1hfpvzbyyh47ai166xyrhmhvg2shrqcswsfalwa16wab6hcg32ki";
-       buildDepends = [ array base semigroups ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ array base semigroups ];
+       libraryToolDepends = [ c2hs ];
        description = "wordexp(3) wrappers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137409,7 +140820,11 @@ self: {
        sha256 = "0plyggai2mq38bmmgc92gd0n3q4dlsywh44yflradg50aslqw0vv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers deepseq directory filepath random-fu random-source
+         text unix-compat vector
+       ];
+       executableHaskellDepends = [
          base containers deepseq directory filepath hflags random-fu
          random-source text unix-compat vector
        ];
@@ -137424,7 +140839,7 @@ self: {
        pname = "words";
        version = "0.1.2";
        sha256 = "0najaqi9fkqdkfks1c6w3fz4qf7dnr4h4brzgglg1h9ik8x5a910";
-       buildDepends = [ base directory text ];
+       libraryHaskellDepends = [ base directory text ];
        description = "Cross-platform access to a list of words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137437,7 +140852,8 @@ self: {
        sha256 = "0jq1aiw35xiklc9asa1pgw2rn6i8q17fq780chqpqz0ryq0iv4x2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers fclabels ];
+       libraryHaskellDepends = [ array base containers fclabels ];
+       executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137453,7 +140869,7 @@ self: {
        sha256 = "0kzbs1ps8fxdsjcpyvccgpw1y6i1q5gw6brgf6j1vv6r24wsh00w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring containers directory filepath hashmap
          process
        ];
@@ -137470,7 +140886,9 @@ self: {
        sha256 = "04aq760z5jn81z03yi9l0d0w034qjiqiwb702lkvk2002b61mk5z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base feed HTTP network parallel tagsoup ];
+       executableHaskellDepends = [
+         base feed HTTP network parallel tagsoup
+       ];
        jailbreak = true;
        description = "Subscribe to a wiki's RSS feed and archive external links";
        license = stdenv.lib.licenses.bsd3;
@@ -137483,7 +140901,7 @@ self: {
        pname = "wrap";
        version = "0.0.0";
        sha256 = "03pmfwwx2ykjglzrc4k09q2lv8piq107j32dg0r1aadj2ysc9fzq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Wrap a function's return value with another function";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137494,7 +140912,7 @@ self: {
        pname = "wraparound";
        version = "0.0.2";
        sha256 = "161mz5bfmx13s9azh3dss64fw98vbaab8krysr9pbbp9dh79i1cf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://frigidcode.com";
        description = "Convenient handling of points on a seamless 2-dimensional plane";
        license = stdenv.lib.licenses.bsd3;
@@ -137511,7 +140929,7 @@ self: {
        sha256 = "1h8lqav0q6vka8yr64032yh3ncjvz6fxp1j9q5jqhzm0ai34air3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-accessor explicit-exception HaXml hxt
          hxt-filter polyparse tagchup tagsoup transformers utility-ht
          xml-basic
@@ -137540,13 +140958,13 @@ self: {
        sha256 = "15vjamr3sain8cdgqhg0jfy0rz3bbb6chrivyzvki5rs2g6pzrja";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive containers cryptohash exceptions ghc-prim hashable
          http-client http-client-tls http-types lens lens-aeson mime-types
          old-locale psqueues template-haskell text time unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring
          case-insensitive containers directory doctest filepath hashable
          http-client http-types HUnit lens lens-aeson network-info
@@ -137577,14 +140995,14 @@ self: {
        sha256 = "0m0vjykj1wqv07xxy2r7xz68syx5r3chni4x399f5fwn6shw1jfz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
          ghc-prim hashable http-client http-client-tls http-types lens
          lens-aeson mime-types old-locale psqueues template-haskell text
          time unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring
          case-insensitive containers directory doctest filepath hashable
          http-client http-types HUnit lens lens-aeson network-info
@@ -137605,8 +141023,8 @@ self: {
        pname = "wright";
        version = "0.1.0.2";
        sha256 = "180012vyslprj06npavh44fmii1813w22sws9zwxzlb4r4jdm4zi";
-       buildDepends = [ base bed-and-breakfast containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bed-and-breakfast containers ];
+       testHaskellDepends = [
          assertions base bed-and-breakfast containers filepath lens
        ];
        jailbreak = true;
@@ -137625,7 +141043,7 @@ self: {
        sha256 = "1035v9c22pngk2r3yisr2vvnfdjgynlgq8adj8z50xak998x22ri";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bencode bytestring containers directory safe utf8-string
        ];
        jailbreak = true;
@@ -137639,7 +141057,7 @@ self: {
        pname = "wtk";
        version = "0.2.1";
        sha256 = "080y0ks5q6bv7dvla08x4cvcmzd13b5v1c5p5336k0vkg2c3fq79";
-       buildDepends = [ base old-locale time transformers ];
+       libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137653,7 +141071,7 @@ self: {
        pname = "wtk-gtk";
        version = "0.2";
        sha256 = "0n9fvp83z71jvv67zjpz34r427s898shns00v84kfjjklhd61q5y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers gtk lenses mtl old-locale parsec time wtk
        ];
        description = "GTK tools within Wojcik Tool Kit";
@@ -137669,7 +141087,7 @@ self: {
        pname = "wumpus-basic";
        version = "0.24.0";
        sha256 = "1mahlvja39jc6zvm32n23p8ya2pfwwawbyawx8srds0bsfyqqmng";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath vector-space wumpus-core
        ];
        homepage = "http://code.google.com/p/copperbox/";
@@ -137684,7 +141102,7 @@ self: {
        pname = "wumpus-core";
        version = "0.52.1";
        sha256 = "10q991xb9v2r3z7q53rwrqcqd4m6qazvdibrxsn2620l2zbjxnd8";
-       buildDepends = [ base containers time vector-space ];
+       libraryHaskellDepends = [ base containers time vector-space ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
@@ -137699,7 +141117,7 @@ self: {
        pname = "wumpus-drawing";
        version = "0.9.0";
        sha256 = "1y9j2d3k862zi8681q3b2pl4nx4vyazdfwx5ji4mfgy73z62lbxw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers vector-space wumpus-basic wumpus-core
        ];
        homepage = "http://code.google.com/p/copperbox/";
@@ -137716,7 +141134,7 @@ self: {
        pname = "wumpus-microprint";
        version = "0.14.0";
        sha256 = "1rrw8hzns7qa9jyzhbal0x0xbi5wa99afixs0cxqk0kgm6sar9cz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base vector-space wumpus-basic wumpus-core wumpus-drawing
        ];
        jailbreak = true;
@@ -137734,7 +141152,7 @@ self: {
        pname = "wumpus-tree";
        version = "0.20.0";
        sha256 = "1xndkri4ayxb12xhik77r59qlg05nhibc8b257csrw9br7xkk8ja";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers vector-space wumpus-basic wumpus-core
          wumpus-drawing
        ];
@@ -137752,12 +141170,13 @@ self: {
        pname = "wuss";
        version = "1.0.2";
        sha256 = "0i4ln8pvjv1cgqcwid111azrls00g1jdhls3wrhnkw8wjcbiiqps";
-       buildDepends = [ base bytestring connection network websockets ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://taylor.fausak.me/wuss/";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -137766,7 +141185,7 @@ self: {
        pname = "wx";
        version = "0.91.0.0";
        sha256 = "133cjc3vfqxyw71a5x99flzg23qa2k28p2zajw6vp0z7qhv8kfjy";
-       buildDepends = [ base stm wxcore ];
+       libraryHaskellDepends = [ base stm wxcore ];
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
@@ -137780,7 +141199,7 @@ self: {
        sha256 = "0mwsh9bhzhnf8la5khy17j2brbphvkicqg0yd0y9ymnn6bgnq4br";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory random wx wxcore ];
+       executableHaskellDepends = [ base directory random wx wxcore ];
        homepage = "http://www.haskell.org/haskellwiki/wxAsteroids";
        description = "Try to avoid the asteroids with your space ship";
        license = stdenv.lib.licenses.bsd3;
@@ -137795,7 +141214,8 @@ self: {
        sha256 = "09n0b8znrwa65z1cjfizxkxj2rlsp56akagih5cycxpwivj1d7p9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base old-time wx wxcore Yampa ];
+       libraryHaskellDepends = [ base old-time wx wxcore Yampa ];
+       executableHaskellDepends = [ base wx wxcore Yampa ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/WxFruit";
        description = "An implementation of Fruit using wxHaskell";
@@ -137809,11 +141229,12 @@ self: {
        pname = "wxc";
        version = "0.91.0.0";
        sha256 = "0siab2h28dlyliznydxll22l9hdgwbmgddj01k1xw8hj4g7b53sa";
-       buildDepends = [ base wxdirect ];
-       extraLibraries = [ libX11 mesa wxGTK ];
-       postInstall = ''
-         cp -v dist/build/libwxc.so.0.91.0.0 $out/lib/libwxc.so
-       '';
+       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";
+       postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
@@ -137822,22 +141243,21 @@ self: {
 
   "wxcore" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
-     , filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect, wxGTK
+     , filepath, parsec, stm, time, wxc, wxdirect, wxGTK
      }:
      mkDerivation {
        pname = "wxcore";
        version = "0.91.0.0";
        sha256 = "01pvaysihyijklyw129vcafjqyh8bpafjzvscxvzll1g86qbqlkz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath parsec stm time
          wxc wxdirect
        ];
-       extraLibraries = [ libX11 mesa wxGTK ];
+       libraryPkgconfigDepends = [ wxGTK ];
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;
-          inherit (pkgs) wxGTK;};
+     }) { inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, parsec
@@ -137849,7 +141269,7 @@ self: {
        sha256 = "17xlviyyagcvmc7m1f4djnsw0wdakirarmv12j4fmwbnfnbryp27";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath parsec process strict time
        ];
        jailbreak = true;
@@ -137866,7 +141286,7 @@ self: {
        sha256 = "10897yb7mkc9hy2037r9yb4192n65lz997fd5apksra1rifrazyp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base wx wxcore ];
+       executableHaskellDepends = [ base wx wxcore ];
        jailbreak = true;
        homepage = "http://github.com/elbrujohalcon/wxhnotepad";
        description = "An example of how to implement a basic notepad with wxHaskell";
@@ -137882,7 +141302,9 @@ self: {
        sha256 = "0sdbi9dfja2ia0n3kggvqc3n3c5rgw096d767yvyzc52k5caakn7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base convertible Imlib wx yjsvg yjtools ];
+       libraryHaskellDepends = [
+         base convertible Imlib wx yjsvg yjtools
+       ];
        description = "turtle like LOGO with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137897,11 +141319,11 @@ self: {
        pname = "wybor";
        version = "0.1.0";
        sha256 = "0cyfhjpb775891qbfc3y15y16mx2hraavgvsrvqkb701rh5vngf6";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base conduit containers lens resourcet semigroups
          terminal-size text transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base conduit containers hspec lens process resourcet
          semigroups terminal-size text transformers unix
        ];
@@ -137920,7 +141342,7 @@ self: {
        sha256 = "147v55c1ravnb769sjw2c8i4qw0gxh3scvx5cvb1fa6nng4x0hnq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring ConfigFile containers dgs directory filepath mtl
          parsec process sgf split
        ];
@@ -137939,7 +141361,7 @@ self: {
        pname = "x-dsp";
        version = "0.2.3.1";
        sha256 = "12l3zy9lmg7sf4q8b3yz2cb9pj9n0sgjglnqhcfkzzdg6pb0g4hj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers monads-tf text transformers
          type-level
        ];
@@ -137955,10 +141377,10 @@ self: {
      mkDerivation {
        pname = "x11-xim";
        version = "0.0.9.0";
-       revision = "1";
        sha256 = "0sn789j0kz891l9p0srx6537yq44b5jlyph9vc3xdb3ygy20bjrw";
+       revision = "1";
        editedCabalFile = "4404aa037f4df2ef8cd16834c8149d596f09b30379f0b85a3b8db9ddd30fa6b0";
-       buildDepends = [ base utf8-string X11 ];
+       libraryHaskellDepends = [ base utf8-string X11 ];
        homepage = "https://github.com/YoshikuniJujo/x11-xim_haskell/wiki/";
        description = "A binding to the xim of X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
@@ -137970,9 +141392,9 @@ self: {
        pname = "x11-xinput";
        version = "0.1.0.0";
        sha256 = "15ij6yfjjyqgzka1163a08ngrraxa4jpbwjq2izdl2l44k0mw29v";
-       buildDepends = [ base containers mtl X11 ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ libXi ];
+       libraryHaskellDepends = [ base containers mtl X11 ];
+       librarySystemDepends = [ libXi ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://redmine.iportnov.ru/projects/x11-xinput";
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
        license = stdenv.lib.licenses.bsd3;
@@ -137988,11 +141410,11 @@ self: {
        pname = "x509";
        version = "1.6.0";
        sha256 = "0fy2jyqkz6qi4x5x9hipnkwqcp3iqyb8h3cj23b69mqx98bfr7lk";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          cryptonite directory filepath hourglass memory mtl pem process
        ];
-       testDepends = [
+       testHaskellDepends = [
          asn1-types base bytestring cryptonite hourglass mtl tasty
          tasty-quickcheck
        ];
@@ -138010,7 +141432,7 @@ self: {
        pname = "x509-store";
        version = "1.6.0";
        sha256 = "08ifb2gy2ssq7ci1rlmxvm344rvcil8418ymj95l5c361nl4gcym";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base bytestring containers cryptonite
          directory filepath mtl pem process x509
        ];
@@ -138027,7 +141449,7 @@ self: {
        pname = "x509-system";
        version = "1.6.0";
        sha256 = "0d8ppvszc1xlvz7ixb8bbqmvhv2d9yyrrh51f5yng8mb2d2w5yah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath mtl pem process x509
          x509-store
        ];
@@ -138047,7 +141469,7 @@ self: {
        sha256 = "12nhxi1lqr5arlj586ai6n86n226iz6k4gbnm0dq07dwgky4j0iy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          asn1-encoding asn1-types base bytestring crypto-pubkey
          crypto-pubkey-types cryptohash directory pem x509 x509-store
          x509-system x509-validation
@@ -138068,7 +141490,7 @@ self: {
        pname = "x509-validation";
        version = "1.6.0";
        sha256 = "07lz6klfslrlkc5zn8x4ynkpa9vfbn19vz7i67ygm1g608jcj1yc";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base byteable bytestring containers
          cryptonite data-default-class directory filepath hourglass memory
          mtl network pem process x509 x509-store
@@ -138086,12 +141508,12 @@ self: {
        pname = "xattr";
        version = "0.6.2";
        sha256 = "02vbxxn0qvkxvfxv1zgr95bvdzx14fp9h7s27wbz6mjfkfgvc39q";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ attr ];
+       testHaskellDepends = [
          base bytestring containers directory filepath HUnit test-framework
          test-framework-hunit unix
        ];
-       extraLibraries = [ attr ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) attr;};
@@ -138104,7 +141526,7 @@ self: {
        sha256 = "1hc3k3w5x1c027jj4lgpwl4cxvy01sx78sc560fdfj6bpsqlcln0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base old-time select X11 ];
+       executableHaskellDepends = [ base old-time select X11 ];
        homepage = "https://github.com/polachok/xbattbar";
        description = "Simple battery indicator";
        license = stdenv.lib.licenses.mit;
@@ -138116,7 +141538,7 @@ self: {
        pname = "xcb-types";
        version = "0.7.0";
        sha256 = "1kzqsd85zp937yna2yfpc3jy0hba92h2fp6j0a6r8r7zz5l8yk3k";
-       buildDepends = [ base containers mtl pretty xml ];
+       libraryHaskellDepends = [ base containers mtl pretty xml ];
        homepage = "http://community.haskell.org/~aslatter/code/xcb-types";
        description = "Parses XML files used by the XCB project";
        license = stdenv.lib.licenses.bsd3;
@@ -138134,11 +141556,15 @@ self: {
        sha256 = "03z31c5gnybpfvh3idqimnz90pzbijhrqa8hlikryab148gp1gzn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers filemanip filepath
+         language-python mtl split xcb-types
+       ];
+       executableHaskellDepends = [
          attoparsec base bytestring containers directory filemanip filepath
          language-python mtl optparse-applicative split xcb-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base filepath HUnit language-python test-framework
          test-framework-hunit xcb-types
        ];
@@ -138155,7 +141581,10 @@ self: {
        sha256 = "0rjpj6i4fn504m7s3hwqbydn0m0ryih0hw4xnc409338sval6xj6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath process unix ];
+       libraryHaskellDepends = [ base directory filepath process unix ];
+       executableHaskellDepends = [
+         base directory filepath process unix
+       ];
        description = "XChat";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138169,7 +141598,7 @@ self: {
        pname = "xcp";
        version = "0.1.0.1";
        sha256 = "1hx9avr6zinrqar0c1zh0l49gy0d61gch8ff12am7zjxk7lbmmzs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl network transformers
        ];
        description = "Partial implementation of the XCP protocol with ethernet as transport layer";
@@ -138182,7 +141611,7 @@ self: {
        pname = "xdg-basedir";
        version = "0.2.2";
        sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4";
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
        homepage = "http://github.com/willdonnelly/xdg-basedir";
        description = "A basic implementation of the XDG Base Directory specification";
        license = stdenv.lib.licenses.bsd3;
@@ -138195,7 +141624,9 @@ self: {
        pname = "xdg-userdirs";
        version = "0.1.0.2";
        sha256 = "0vh4m385a828qb61845bb7zfcqfm000g4fjkmmlvdrfyh35vpal8";
-       buildDepends = [ base containers directory filepath xdg-basedir ];
+       libraryHaskellDepends = [
+         base containers directory filepath xdg-basedir
+       ];
        homepage = "http://redmine.iportnov.ru/projects/xdg-userdirs";
        description = "Basic implementation of XDG user directories specification";
        license = stdenv.lib.licenses.bsd3;
@@ -138210,7 +141641,10 @@ self: {
        sha256 = "1izf892748g7f1h4m49d52zkbzfv164r4zyqss5lsbh3brh15v3g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cairo graphviz gtk mtl polyparse text ];
+       libraryHaskellDepends = [
+         base cairo graphviz gtk mtl polyparse text
+       ];
+       executableHaskellDepends = [ base cairo graphviz gtk text ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138223,7 +141657,7 @@ self: {
        sha256 = "0x788lpkkxg7ds1bgnw0kvkf6pkfbknn7jy0njhz85k7rv4kidf2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cereal mtl network ];
+       libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138236,9 +141670,11 @@ self: {
        sha256 = "0q63zavh3fz03dmky42gafypd0gpn8fs0nb9qn2a2zzj961vzswz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base glib ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ libxfconf-0 ];
+       libraryHaskellDepends = [ base glib ];
+       libraryPkgconfigDepends = [ libxfconf-0 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
+       executablePkgconfigDepends = [ libxfconf-0 ];
+       executableToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
@@ -138251,8 +141687,8 @@ self: {
        pname = "xformat";
        version = "0.1.2.1";
        sha256 = "1q2wm0wffvppbv5rd16z367yfkx2sq7j0i5dkfwpawf859c9pz7x";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/spl/xformat";
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
        license = stdenv.lib.licenses.bsd3;
@@ -138266,7 +141702,7 @@ self: {
        pname = "xhaskell-library";
        version = "0.0.6";
        sha256 = "13nnlaw56izwy0m7k4kh4g75sa5pvxn0pf9h3w8l9hnjcpv4l2ya";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers ghc-prim mtl parsec regex-base
        ];
        jailbreak = true;
@@ -138284,14 +141720,13 @@ self: {
        pname = "xhb";
        version = "0.6.2015.8.1";
        sha256 = "1rq6g96v1fs66kdmnkvlkcxrv614ha77czclm3sfw274f7q2r2kb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary byteorder bytestring containers network parsec stm
          Xauth
        ];
        homepage = "https://github.com/aslatter/xhb";
        description = "X Haskell Bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhb-atom-cache" = callPackage
@@ -138302,14 +141737,13 @@ self: {
        pname = "xhb-atom-cache";
        version = "0.1.0.2";
        sha256 = "113yff75i5pc0kcz4w7npbp34bl92aibpvj2cgg30f66nml61xg9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable mtl transformers unordered-containers xhb
        ];
        jailbreak = true;
        homepage = "http://github.com/jotrk/xhb-atom-cache/";
        description = "Atom cache for XHB";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhb-ewmh" = callPackage
@@ -138320,7 +141754,7 @@ self: {
        pname = "xhb-ewmh";
        version = "0.1.3.1";
        sha256 = "02qfpwa9558svk0481dxjchr9h0phacsyqzail94kmzkhnnly64l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring dlist hashable mtl transformers xhb
          xhb-atom-cache
        ];
@@ -138337,7 +141771,7 @@ self: {
        pname = "xhtml";
        version = "3000.2.1";
        sha256 = "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/haskell/xhtml";
        description = "An XHTML combinator library";
        license = stdenv.lib.licenses.bsd3;
@@ -138350,7 +141784,9 @@ self: {
        pname = "xhtml-combinators";
        version = "0.3";
        sha256 = "06bmdl34kly965qj7phw1hm7p7siwjprflr72n7ck32lrknmy2hk";
-       buildDepends = [ base containers random text transformers xml ];
+       libraryHaskellDepends = [
+         base containers random text transformers xml
+       ];
        homepage = "http://www.dcs.shef.ac.uk/~aca08aa/xhtmlc.html";
        description = "Fast and easy to use XHTML combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -138364,7 +141800,10 @@ self: {
        sha256 = "13g44483bcgbfi3366m7l49z40prvr2abml6h6vcjbjnc575cs37";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base directory mtl old-time process ];
+       libraryHaskellDepends = [
+         array base directory mtl old-time process
+       ];
+       executableHaskellDepends = [ base directory process ];
        description = "The Lava system for Xilinx FPGA design with layout combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138375,10 +141814,10 @@ self: {
        pname = "xine";
        version = "0.0.0.4";
        sha256 = "1mvi486vjf4brg6iks24wvb7gr5n7gdcqzdvv9xnncmxrscr6x36";
-       buildDepends = [ base containers ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ xine ];
-       pkgconfigDepends = [ libxine ];
+       libraryHaskellDepends = [ base containers ];
+       librarySystemDepends = [ xine ];
+       libraryPkgconfigDepends = [ libxine ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/joachifm/hxine";
        description = "Bindings to xine-lib";
        license = "LGPL";
@@ -138396,12 +141835,14 @@ self: {
        sha256 = "1z135lcyyq7as166k3vhkqa75a555wbmfhpsdr4rsvpliq4ipqmk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring containers http-conduit
          http-types lifted-base monad-control resourcet text time
          transformers
        ];
-       testDepends = [ aeson base bytestring containers HTF text time ];
+       testHaskellDepends = [
+         aeson base bytestring containers HTF text time
+       ];
        jailbreak = true;
        homepage = "http://github.com/JanAhrens/xing-api-haskell";
        description = "Wrapper for the XING API, v1";
@@ -138417,7 +141858,7 @@ self: {
        pname = "xinput-conduit";
        version = "0.0.0";
        sha256 = "05pcaakqc6krv13480dp7ygr8s2k5wdwr6kixmc9fcp6baa1zkn4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra transformers
        ];
        description = "Conduit of keys pressed by xinput";
@@ -138433,12 +141874,12 @@ self: {
        pname = "xkbcommon";
        version = "0.0.1";
        sha256 = "1chv156z6208jypl2grjjgbyja4ai3acx65rfyfpqb30987yf0r5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cpphs data-flags filepath process storable-record
          template-haskell text transformers
        ];
-       testDepends = [ base unix ];
-       extraLibraries = [ libxkbcommon ];
+       librarySystemDepends = [ libxkbcommon ];
+       testHaskellDepends = [ base unix ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) libxkbcommon;};
@@ -138453,7 +141894,7 @@ self: {
        sha256 = "15zwx7rkxm52pnxjhx3p979h48cls1ipb7hmryxll5rcxz9aga29";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath HTTP network tagsoup
        ];
        homepage = "http://github.com/sellweek/xkcd";
@@ -138472,12 +141913,12 @@ self: {
        pname = "xlsior";
        version = "0.1.0.1";
        sha256 = "0dkb3dkc2srvc1951hv6m69z3d7xprsaj7lsdkj9npykqpv6nkgk";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-markup bytestring conduit conduit-extra
          data-default exceptions mtl resourcet scientific text time
          time-locale-compat vector xml-conduit xml-types zip-archive
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-markup bytestring text time time-locale-compat
          zip-archive
        ];
@@ -138499,12 +141940,17 @@ self: {
        sha256 = "0zd3p0dkb4v9gcd3mvp6g64z1gr1m5x0pf2zyj3w7ab0dgz4gzsz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary-search bytestring conduit containers data-default
          digest lens old-locale old-time text time transformers utf8-string
          vector xml-conduit xml-types zip-archive zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary-search bytestring conduit containers data-default
+         digest lens old-locale old-time text time transformers utf8-string
+         vector xml-conduit xml-types zip-archive zlib
+       ];
+       testHaskellDepends = [
          base containers HUnit old-time smallcheck tasty tasty-hunit
          tasty-smallcheck time
        ];
@@ -138523,7 +141969,7 @@ self: {
        sha256 = "00m5x9vhl0rf8azwgin6a75xpj74gybn757021z9dkn1qy35zjwr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring conduit containers data-default parsec text time
          transformers xlsx
        ];
@@ -138540,7 +141986,7 @@ self: {
        pname = "xml";
        version = "1.3.14";
        sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "http://code.galois.com";
        description = "A simple XML library";
        license = stdenv.lib.licenses.bsd3;
@@ -138554,7 +142000,7 @@ self: {
        pname = "xml-basic";
        version = "0.1.1.3";
        sha256 = "0m3pwg8b9pvqh9559p7nq39vnkklmf9gcay8vpvrkh17p8n14z6c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-accessor explicit-exception utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/XML-Basic";
@@ -138570,7 +142016,7 @@ self: {
        pname = "xml-catalog";
        version = "1.1.0.2";
        sha256 = "0jzi63v8v2ksrqrk13pcl10awx57i2vm0k8xgi01rr1ncmlrnyfc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers text transformers uri-conduit
          xml-conduit
        ];
@@ -138591,12 +142037,12 @@ self: {
        pname = "xml-conduit";
        version = "1.3.1";
        sha256 = "094gkf3j7xk42km9zlkjdz0bicwxcf4207q1yalwi69zfnqmprhr";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
          resourcet text transformers xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-markup bytestring conduit containers hspec HUnit
          resourcet text transformers xml-types
        ];
@@ -138614,18 +142060,17 @@ self: {
        pname = "xml-conduit-parse";
        version = "0.3.0.0";
        sha256 = "0dhg2wgb7gbyn5h1z8fq813l158c49lazfxp1kx9p5jfbc12kk7s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions parsers text
          xml-conduit xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-parse data-default hlint parsers resourcet
          tasty tasty-hunit
        ];
        homepage = "https://github.com/k0ral/xml-conduit-parse";
        description = "Streaming XML parser based on conduits";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-writer" = callPackage
@@ -138636,10 +142081,10 @@ self: {
        pname = "xml-conduit-writer";
        version = "0.1.1.1";
        sha256 = "1ibiqxjr63gb3v0h9fdfzm205sqjixb5vm5y6413yn4scbf7qm2b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dlist mtl text xml-conduit xml-types
        ];
-       testDepends = [ base text ];
+       testHaskellDepends = [ base text ];
        homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer";
        description = "Warm and fuzzy creation of XML documents";
        license = stdenv.lib.licenses.mit;
@@ -138655,12 +142100,12 @@ self: {
        pname = "xml-enumerator";
        version = "0.4.4.1";
        sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring containers data-default
          enumerator failure text transformers xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers enumerator hspec HUnit text transformers
          xml-types
        ];
@@ -138681,7 +142126,7 @@ self: {
        sha256 = "1n2lywzbbjkpccpgwlj8ycf4p5wlhjs60hgqzwb33j7qiraf5jb3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers enumerator xml-enumerator xml-types
        ];
        jailbreak = true;
@@ -138696,7 +142141,7 @@ self: {
        pname = "xml-extractors";
        version = "0.4.0.0";
        sha256 = "02380x94zvm736lj2j02926xn8asc6bq4hbhm3nshh9iw8x4phwq";
-       buildDepends = [ base mtl safe transformers xml ];
+       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";
@@ -138711,11 +142156,11 @@ self: {
        pname = "xml-hamlet";
        version = "0.4.0.11";
        sha256 = "128ypil2c86zpkivrla031hn4rmhbpisy4zj0xmff473hz9qln9x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers parsec shakespeare template-haskell text
          xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec HUnit parsec shakespeare template-haskell
          text xml-conduit
        ];
@@ -138730,7 +142175,7 @@ self: {
        pname = "xml-helpers";
        version = "1.0.0";
        sha256 = "0rrk0j7m8ws86hbjw0l4ryq4m9i8llhsag2sfisy5r1iv2zwa0lv";
-       buildDepends = [ base xml ];
+       libraryHaskellDepends = [ base xml ];
        homepage = "http://github.com/acw/xml-helpers";
        description = "Some useful helper functions for the xml library";
        license = stdenv.lib.licenses.bsd3;
@@ -138743,13 +142188,13 @@ self: {
      mkDerivation {
        pname = "xml-html-conduit-lens";
        version = "0.3.2.1";
-       revision = "2";
        sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12";
+       revision = "2";
        editedCabalFile = "6c3305bb07c0fd40c933640ebe9e6114a798115cfb2f3cb976e40f1ece955132";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers html-conduit lens text xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest hspec hspec-expectations-lens lens xml-conduit
        ];
        jailbreak = true;
@@ -138765,10 +142210,10 @@ self: {
      mkDerivation {
        pname = "xml-lens";
        version = "0.1.6.3";
-       revision = "1";
        sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd";
+       revision = "1";
        editedCabalFile = "1a0768a259fb0aeaaecc092c6a9777c4d498d2695b0385a0e620e47f362773b9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base case-insensitive containers lens text xml-conduit
        ];
        homepage = "https://github.com/fumieval/xml-lens";
@@ -138783,7 +142228,9 @@ self: {
        pname = "xml-monad";
        version = "0.5";
        sha256 = "17axppy0xzshmvw8y23hxcj2ixm2fqw3hqrjk90qmpkjcv4nk44r";
-       buildDepends = [ base mtl transformers transformers-compose xml ];
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compose xml
+       ];
        jailbreak = true;
        homepage = "http://github.com/aristidb/xml-monad";
        description = "Monadic extensions to the xml package";
@@ -138796,7 +142243,7 @@ self: {
        pname = "xml-parsec";
        version = "1.0.3";
        sha256 = "1zcmiqyw6bs50kl2417ygvnpsk9wy025ls5ck8cd863x47bqpdn2";
-       buildDepends = [ base HaXml parsec ];
+       libraryHaskellDepends = [ base HaXml parsec ];
        homepage = "http://sep07.mroot.net/";
        description = "Parsing XML with Parsec";
        license = "GPL";
@@ -138811,8 +142258,8 @@ self: {
        pname = "xml-picklers";
        version = "0.3.6";
        sha256 = "196iy4z58x58bjk5jy4fpmn8zhiramlyca4rd732i8j3jp6h5f6i";
-       buildDepends = [ base containers text xml-types ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers text xml-types ];
+       testHaskellDepends = [
          base Cabal QuickCheck tasty tasty-hunit tasty-quickcheck text
          xml-types
        ];
@@ -138826,7 +142273,7 @@ self: {
        pname = "xml-pipe";
        version = "0.0.0.11";
        sha256 = "0j5fjnf6r7cagcl1ni5idwj1k5q6vjp6c59ajwsx39iqx1kdmly4";
-       buildDepends = [ base bytestring papillon simple-pipe ];
+       libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
        homepage = "https://github.com/YoshikuniJujo/xml-pipe/wiki";
        description = "XML parser which uses simple-pipe";
        license = stdenv.lib.licenses.bsd3;
@@ -138841,7 +142288,8 @@ self: {
        sha256 = "1abjmxihh0ldlh8k4mp922s0h39303farmdbm08qn909pbrzm0f0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs unix ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base cmdargs unix ];
        homepage = "http://github.com/rosenbergdm/xml-prettify";
        description = "Pretty print XML";
        license = stdenv.lib.licenses.bsd3;
@@ -138858,7 +142306,7 @@ self: {
        pname = "xml-push";
        version = "0.0.0.18";
        sha256 = "1i8qmz7mr8rfspkn4wwyq7f7fi1grpggmqmfsmx6l7bjsjv15n3y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-random handle-like monad-control monads-tf
          peyotls random sasl simple-pipe stm tighttp transformers-base uuid
          x509 x509-store x509-validation xml-pipe xmpipe
@@ -138881,11 +142329,12 @@ self: {
        sha256 = "0brfdlarr4yyfsfawkfjdbk4z3lvi9ihkhvqh5ws2ll0h80ja6md";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers curl hashable hxt hxt-curl
          hxt-expat hxt-tagsoup regex-posix tagsoup text unordered-containers
          vector
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/sinelaw/xml-to-json";
        description = "Library and command line tool for converting XML files to json";
        license = stdenv.lib.licenses.mit;
@@ -138899,7 +142348,8 @@ self: {
        sha256 = "0gsn8wdiwmvr7nvxbfj9vpzlxwdh8m9lprx2hxnkrnslmbhjz1fx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory process tagsoup text ];
+       libraryHaskellDepends = [ base tagsoup text ];
+       executableHaskellDepends = [ base directory process ];
        homepage = "https://github.com/sinelaw/xml-to-json-fast";
        description = "Fast, light converter of xml to json capable of handling huge xml files";
        license = stdenv.lib.licenses.mit;
@@ -138911,7 +142361,7 @@ self: {
        pname = "xml-types";
        version = "0.3.6";
        sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr";
-       buildDepends = [ base deepseq text ];
+       libraryHaskellDepends = [ base deepseq text ];
        homepage = "https://john-millikin.com/software/haskell-xml/";
        description = "Basic types for representing XML";
        license = stdenv.lib.licenses.mit;
@@ -138923,7 +142373,7 @@ self: {
        pname = "xml2html";
        version = "0.2.0";
        sha256 = "1kf4vjg4cfkd4vx8jpikbb0ib4pglmyf5vqrg3j0yllmycj22ska";
-       buildDepends = [ base xml-conduit ];
+       libraryHaskellDepends = [ base xml-conduit ];
        homepage = "http://github.com/snoyberg/xml";
        description = "blaze-html instances for xml-conduit types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -138941,12 +142391,17 @@ self: {
        sha256 = "15x3339qqy75qyj97dc7qbw7fs5dw4xvcslfrjpi36yd2596hamx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder
          blaze-builder-conduit bytestring case-insensitive conduit
          tagstream-conduit text transformers unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson attoparsec attoparsec-conduit base blaze-builder
+         blaze-builder-conduit bytestring case-insensitive conduit
+         tagstream-conduit text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson base bytestring hspec resourcet text transformers
        ];
        jailbreak = true;
@@ -138966,7 +142421,7 @@ self: {
        sha256 = "0cp21xzzqczb49mpnsxlgc4fyhmmgyy4mfczqnz85h383js5sbia";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bio bytestring containers directory xhtml
        ];
        jailbreak = true;
@@ -138983,10 +142438,10 @@ self: {
        pname = "xmlgen";
        version = "0.6.2.1";
        sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers mtl text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers filepath HUnit hxt process QuickCheck
          text unix
        ];
@@ -139001,10 +142456,10 @@ self: {
      mkDerivation {
        pname = "xmlhtml";
        version = "0.2.3.4";
-       revision = "1";
        sha256 = "0cv5jqzbq7mi5lcrnaxr5qaprp8biv1jlyzpjhwnwqzla6fqamfr";
+       revision = "1";
        editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring containers
          parsec text unordered-containers
        ];
@@ -139023,7 +142478,8 @@ self: {
        sha256 = "15i0a28svafjsziz1h3px0qys81xw0bs5bpq66hcwzxdv3s15lv9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base old-locale time xml ];
+       executableHaskellDepends = [
          base bytestring configurator filepath http-client network-uri
          old-locale split terminfo time unix wl-pprint-extras
          wl-pprint-terminfo xdg-basedir xml
@@ -139042,8 +142498,10 @@ self: {
        pname = "xmms2-client";
        version = "0.0.7.0";
        sha256 = "0ahsxah1irfsbgkkr4vnvasb7shk4b5iyjhgpj2dc9vi26p6y5dz";
-       buildDepends = [ base containers haskell98 mtl utf8-string ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [
+         base containers haskell98 mtl utf8-string
+       ];
+       libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139055,8 +142513,8 @@ self: {
        pname = "xmms2-client-glib";
        version = "0.0.7.0";
        sha256 = "1rrc8w9nrmxl8kzjkbmdxh0j1krvai396mx50wsnlqn1cxgb54h3";
-       buildDepends = [ base haskell98 xmms2-client ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base haskell98 xmms2-client ];
+       libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139073,16 +142531,18 @@ self: {
        pname = "xmobar";
        version = "0.23.1";
        sha256 = "0yjnymiw518pjcks0kvpbj73kf0dvl1aj3a40qgmdf5xff1mac9v";
+       configureFlags = [ "-fall_extensions" ];
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          alsa-core alsa-mixer base bytestring containers dbus directory
          filepath hinotify HTTP libmpd mtl old-locale parsec process
          regex-compat stm time timezone-olson timezone-series transformers
          unix utf8-string X11 X11-xft
        ];
-       extraLibraries = [ libXpm libXrandr wirelesstools Xrender ];
-       configureFlags = [ "-fall_extensions" ];
+       executableSystemDepends = [
+         libXpm libXrandr wirelesstools Xrender
+       ];
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
@@ -139099,16 +142559,11 @@ self: {
        sha256 = "1pfjssamiwpwjp1qqkm9m9p9s35pv381m0cwg6jxg0ppglibzq1r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory extensible-exceptions filepath mtl
          process unix utf8-string X11
        ];
        jailbreak = true;
-       postInstall = ''
-         shopt -s globstar
-         mkdir -p $out/share/man/man1
-         mv "$out/"**"/man/"*.1 $out/share/man/man1/
-       '';
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
@@ -139124,7 +142579,7 @@ self: {
        sha256 = "1ymn56rc9kkzvdla9bpj3aq2z6rnz669xbj7n87z1b42aj74s8gn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory extensible-exceptions filepath mtl
          process unix X11
        ];
@@ -139144,7 +142599,7 @@ self: {
        pname = "xmonad-contrib";
        version = "0.11.4";
        sha256 = "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory extensible-exceptions mtl old-locale
          old-time process random unix utf8-string X11 X11-xft xmonad
        ];
@@ -139162,7 +142617,7 @@ self: {
        pname = "xmonad-contrib-bluetilebranch";
        version = "0.9.1.4";
        sha256 = "1ysf8yp8jwf7a1am83w5q66ys3j6kn7ss0i86n9dmfmkc3rms6l7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory extensible-exceptions mtl old-locale
          old-time process random unix utf8-string X11 X11-xft
          xmonad-bluetilebranch
@@ -139180,7 +142635,7 @@ self: {
        pname = "xmonad-contrib-gpl";
        version = "0.12.1";
        sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9";
-       buildDepends = [ base mtl xmonad xmonad-contrib ];
+       libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
        homepage = "http://xmonad.org/";
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.gpl3;
@@ -139194,7 +142649,7 @@ self: {
        pname = "xmonad-entryhelper";
        version = "0.1.0.0";
        sha256 = "1xwjdy7swc4bqqx0y7bny7rci4wpq2318m9nbz365x2r7i379v9h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory extensible-exceptions filepath mtl process unix X11
          xmonad xmonad-contrib
        ];
@@ -139211,7 +142666,7 @@ self: {
        pname = "xmonad-eval";
        version = "0.1";
        sha256 = "0k0lb4z50kj4q3dzmii4pd8lbdnlxh5l91fx4f90a35hl3v9zggk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory hint mtl old-locale old-time process
          random unix X11 xmonad xmonad-contrib
        ];
@@ -139231,14 +142686,14 @@ self: {
        pname = "xmonad-extras";
        version = "0.12.1";
        sha256 = "14g8i3rvfiqp6mq1xhw8f9q0svcfz5nhlsgbz20zlk1az7673z55";
-       buildDepends = [
+       configureFlags = [
+         "-f-with_hlist" "-fwith_parsec" "-fwith_split"
+       ];
+       libraryHaskellDepends = [
          base containers directory hint mtl network old-locale old-time
          parsec process random regex-posix split unix X11 xmonad
          xmonad-contrib
        ];
-       configureFlags = [
-         "-f-with_hlist" "-fwith_parsec" "-fwith_split"
-       ];
        homepage = "http://projects.haskell.org/xmonad-extras";
        description = "Third party extensions for xmonad with wacky dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -139250,7 +142705,7 @@ self: {
        pname = "xmonad-screenshot";
        version = "0.1.2";
        sha256 = "1m7bmdhc1nlwflli1ymnjlmysg9d54w0shpxq05xwmiycg4jbwr1";
-       buildDepends = [ base gtk xmonad ];
+       libraryHaskellDepends = [ base gtk xmonad ];
        homepage = "https://github.com/supki/xmonad-screenshot";
        description = "Workspaces screenshooting utility for XMonad";
        license = stdenv.lib.licenses.mit;
@@ -139264,7 +142719,7 @@ self: {
        sha256 = "1y72f8dnjbpf4kmg0fp8rfbvhwshkp10g4cj3yhy9z78w84dp9a5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghc random unix X11 ];
+       executableHaskellDepends = [ base ghc random unix X11 ];
        homepage = "https://github.com/LeifW/xmonad-utils";
        description = "A small collection of X utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -139278,7 +142733,7 @@ self: {
        pname = "xmonad-windownames";
        version = "0.1.0.0";
        sha256 = "1w1f0v81dnbxkmavk5d3hbnanx24yzrqacg4m8j4w36k041w7zn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers utf8-string xmonad xmonad-contrib
        ];
        jailbreak = true;
@@ -139295,7 +142750,7 @@ self: {
        pname = "xmpipe";
        version = "0.0.0.4";
        sha256 = "09g11mfq93w3097rzydva8qwq1sjq0hwi11lg1x1yshwcb1if2iw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring handle-like monads-tf sasl
          simple-pipe uuid xml-pipe
        ];
@@ -139311,7 +142766,7 @@ self: {
        pname = "xorshift";
        version = "2.0.1";
        sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf";
-       buildDepends = [ base random time ];
+       libraryHaskellDepends = [ base random time ];
        description = "Haskell implementation of the xorshift random generator";
        license = "LGPL";
      }) {};
@@ -139322,8 +142777,8 @@ self: {
        pname = "xosd";
        version = "0.2.1";
        sha256 = "1j0j64668vi0jxrzxrwyp8gwcz5zpaiai2r5k5rfsfrglhrhvhrv";
-       buildDepends = [ base ];
-       extraLibraries = [ xosd ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ xosd ];
        homepage = "http://code.haskell.org/~dons/code/xosd";
        description = "A binding to the X on-screen display";
        license = stdenv.lib.licenses.bsd3;
@@ -139337,7 +142792,7 @@ self: {
        pname = "xournal-builder";
        version = "0.1.1.1";
        sha256 = "0v7lfhyr28gmsbzizhbw4lddhhhv74y3vb8kb9z06b32lg5wm591";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring double-conversion strict
          xournal-types
        ];
@@ -139358,10 +142813,11 @@ self: {
        sha256 = "1vyykx5kbq8jja6cxy38j905b23ndj73xsg0hirz0sq4pw36shmi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo cmdargs directory filepath HStringTemplate
          mtl xournal-parser xournal-render xournal-types
        ];
+       executableHaskellDepends = [ base cmdargs ];
        jailbreak = true;
        homepage = "http://ianwookim.org/hxournal";
        description = "convert utility for xoj files";
@@ -139379,7 +142835,7 @@ self: {
        pname = "xournal-parser";
        version = "0.5.1";
        sha256 = "07b1gflqsjsydn304vw6zwgwlc0g7riv0b80lr165mw6c2fkmx78";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base bytestring conduit conduit-extra
          containers exceptions lens mtl strict text transformers xml-conduit
          xml-types xournal-types zlib-conduit
@@ -139398,7 +142854,7 @@ self: {
        pname = "xournal-render";
        version = "0.6.0";
        sha256 = "0fsijjzxizhb7dx1pc83rsini8xzqj21mmkqj1x0ysyzh78siaf3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo containers fclabels mtl poppler strict
          TypeCompose xournal-types
        ];
@@ -139416,7 +142872,7 @@ self: {
        pname = "xournal-types";
        version = "0.5.1";
        sha256 = "1ii4d560wvy6iky09wbz2kdf370y87ldgr0ymsv50d7cqxfgbjap";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers lens strict TypeCompose
        ];
        description = "Data types for programs for xournal file format";
@@ -139434,7 +142890,7 @@ self: {
        sha256 = "180svhrkj3fp69abg0ichgc9l6iv760j302bb612qzxkpyjsyz0h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory process random unix
        ];
        jailbreak = true;
@@ -139452,8 +142908,8 @@ self: {
        pname = "xsd";
        version = "0.5.0.1";
        sha256 = "1a5i2idpkm5i70jpp2kjglpylja4b9cd0nklgvl6lm8cpjn2j0k0";
-       buildDepends = [ attoparsec base lens text time ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base lens text time ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck quickcheck-instances
        ];
        homepage = "https://github.com/tonymorris/xsd";
@@ -139467,7 +142923,7 @@ self: {
        pname = "xsha1";
        version = "0.0.0";
        sha256 = "0xljcmc8rsvkpchrdam3lpp4igq1gmym9v3drp15a9k8rfa8irmi";
-       buildDepends = [ base HUnit QuickCheck uniplate vector ];
+       libraryHaskellDepends = [ base HUnit QuickCheck uniplate vector ];
        description = "cryptanalysis of Blizzard's broken SHA-1 implementation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -139478,8 +142934,8 @@ self: {
        pname = "xslt";
        version = "0.1";
        sha256 = "0i03ihk0rjj6vk2blqdhqqqk6qqrrkxx2ckigwd5mgvp3jp64648";
-       buildDepends = [ base libxml ];
-       extraLibraries = [ xslt ];
+       libraryHaskellDepends = [ base libxml ];
+       librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139493,11 +142949,11 @@ self: {
        pname = "xss-sanitize";
        version = "0.3.5.6";
        sha256 = "1j2qrn2dbfx01m7zyk9ilgnp9zjwq9mk62b0rdal4zkg4vh212h0";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers css-text network-uri tagsoup text
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base containers css-text hspec HUnit network-uri tagsoup
          text utf8-string
        ];
@@ -139512,7 +142968,7 @@ self: {
        pname = "xtc";
        version = "1.0.1";
        sha256 = "0jfs3qbcx5h26irkq73dyc2m84qyrlj5dvy6d1s6p6520vhnqfal";
-       buildDepends = [ base wx wxcore ];
+       libraryHaskellDepends = [ base wx wxcore ];
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -139524,8 +142980,8 @@ self: {
        pname = "xtest";
        version = "0.2";
        sha256 = "118xxx7sydpsvdqz0x107ngb85fggn630ysw6d2ckky75fmhmxk7";
-       buildDepends = [ base X11 ];
-       extraLibraries = [ libXtst ];
+       libraryHaskellDepends = [ base X11 ];
+       librarySystemDepends = [ libXtst ];
        description = "Thin FFI bindings to X11 XTest library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libXtst;};
@@ -139538,7 +142994,7 @@ self: {
        pname = "xturtle";
        version = "0.1.25";
        sha256 = "161fpfvzbz2kks5pxmq3wrkgfkrfjvqrl4izlq0v7sicqphfkgmd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base convertible Imlib setlocale X11 X11-xft x11-xim yjsvg yjtools
        ];
        description = "turtle like LOGO";
@@ -139552,11 +143008,11 @@ self: {
      mkDerivation {
        pname = "xxhash";
        version = "0.0.1";
-       revision = "1";
        sha256 = "0crmvkvk2604a06jjsn613bxx0n1lv59picl2656rx2pc7wbyidn";
+       revision = "1";
        editedCabalFile = "1d641797e9e431c6152dc41cbe72551bb2f91cec8265d3a5e3b2b9718764d274";
-       buildDepends = [ base bytestring crypto-api tagged ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base bytestring crypto-api tagged ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        jailbreak = true;
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -139572,7 +143028,7 @@ self: {
        sha256 = "0gjvnl5px7ir2lf7arpiji324n32mc1a90x3w6vh5xcyb13wvkv9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers mtl network old-locale old-time safe
          split text time
        ];
@@ -139590,7 +143046,7 @@ self: {
        sha256 = "05avn1m1mmgvzx9vkjy0fyyy38vmz39km0b190lz7lhy9qrwa2bb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base word8 ];
+       executableHaskellDepends = [ base word8 ];
        homepage = "https://github.com/fgaz/yabi";
        description = "Yet Another Brainfuck Interpreter";
        license = stdenv.lib.licenses.mit;
@@ -139606,9 +143062,10 @@ self: {
        sha256 = "169ndqawpkaj43iq6mbddqxprc7w6lsv3ws8a7cq7nmyn7n3r0jg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers lens mtl mtl-compat parsec
        ];
+       executableHaskellDepends = [ base containers mtl parsec ];
        jailbreak = true;
        description = "Yet Another Brainfuck Interpreter";
        license = stdenv.lib.licenses.mit;
@@ -139626,7 +143083,7 @@ self: {
        sha256 = "1wp7vqlnwxiq4fi0dly25n9jxqi1rpgngd5dn4w4gqla1mqpb43c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder blaze-html bytestring Cabal cmdargs conduit
          containers directory http-conduit http-types shakespeare tar text
          transformers unordered-containers vector wai warp yaml yesod-core
@@ -139635,6 +143092,7 @@ self: {
        homepage = "http://github.com/snoyberg/yackage";
        description = "Personal Hackage replacement for testing new packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -139645,7 +143103,7 @@ self: {
        pname = "yahoo-finance-conduit";
        version = "0.1.0.0";
        sha256 = "1kvs12l84lgs26knrqv5f354a3bql3fg54wgnmsfcjli1vvnn1di";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base cassava conduit lens mtl text vector wreq
        ];
        jailbreak = true;
@@ -139659,7 +143117,7 @@ self: {
        pname = "yahoo-web-search";
        version = "0.2";
        sha256 = "064qakx4khzz9ih9isw46c8pm8wpg662fwnis4d64nszy6y9yfck";
-       buildDepends = [ base HTTP network xml ];
+       libraryHaskellDepends = [ base HTTP network xml ];
        homepage = "http://www.people.fas.harvard.edu/~stewart5/code/yahoo-web-search";
        description = "Yahoo Web Search Services";
        license = stdenv.lib.licenses.bsd3;
@@ -139672,9 +143130,9 @@ self: {
        pname = "yajl";
        version = "0.3.2";
        sha256 = "07186ilac22zym1jlgl915k2a82k418xa5z9h40ss62dgmaz2xkk";
-       buildDepends = [ base bytestring text ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ yajl ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ yajl ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://john-millikin.com/software/haskell-yajl/";
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
@@ -139689,7 +143147,7 @@ self: {
        pname = "yajl-enumerator";
        version = "0.4.1";
        sha256 = "0dz81l58qpm3gk7zmvb702qwgq79j7d0dnyimqi6k3fp0byb5wdj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator json-types text transformers yajl
        ];
        jailbreak = true;
@@ -139705,7 +143163,7 @@ self: {
        pname = "yall";
        version = "0.2.1";
        sha256 = "131x7hl309zpwl31k6mwqd4fdrhkcwxvn4dvlky9bh3prc8kdm2s";
-       buildDepends = [ base categories transformers ];
+       libraryHaskellDepends = [ base categories transformers ];
        homepage = "http://brandon.si/code/yall/";
        description = "Lenses with a southern twang";
        license = stdenv.lib.licenses.bsd3;
@@ -139717,7 +143175,7 @@ self: {
        pname = "yamemo";
        version = "0.6.0";
        sha256 = "12qh9fi5dj4i5lprm24gc2b66qzc3mf59m22sxf93sx3dsf7rygn";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Simple memoisation function";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -139734,12 +143192,13 @@ self: {
        sha256 = "0nmpc1n80sv2bjqhzq5jdhd0zxzz9vka31y7k54fmdwr2jbg879i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit containers directory
          enclosed-exceptions filepath resourcet scientific text transformers
          unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ aeson base bytestring ];
+       testHaskellDepends = [
          aeson aeson-qq base base-compat bytestring conduit hspec HUnit
          mockery resourcet text transformers unordered-containers vector
        ];
@@ -139756,10 +143215,10 @@ self: {
        pname = "yaml-config";
        version = "0.2.2";
        sha256 = "1a6n18q6sy5sfw4r8j42d4vhcmvjggi2ax4i89ap2gmnah53jm50";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq failure text unordered-containers yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base deepseq failure hashable QuickCheck tasty tasty-quickcheck
          text unordered-containers yaml
        ];
@@ -139774,7 +143233,7 @@ self: {
        pname = "yaml-light";
        version = "0.1.4";
        sha256 = "05pxkqp91l275n48p1aqijzh34vvzi7cx2nls879b95fz2dr8lhk";
-       buildDepends = [ base bytestring containers HsSyck ];
+       libraryHaskellDepends = [ base bytestring containers HsSyck ];
        description = "A light-weight wrapper with utility functions around HsSyck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -139787,13 +143246,12 @@ self: {
        pname = "yaml-light-lens";
        version = "0.3.3";
        sha256 = "0apl8j5i8mbn1rqmv4wk5rhhh2zcpfqsh2q6d1sl798x96c72v8y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing containers lens yaml-light
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        description = "Lens interface to yaml-light";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-rpc" = callPackage
@@ -139805,7 +143263,7 @@ self: {
        pname = "yaml-rpc";
        version = "1.0.3";
        sha256 = "01ir8yh7g3xvybg2nyfnzci0xlqpizkdkyhd8jfhyk8yka6jbr9g";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-client http-types lens
          template-haskell text th-lift transformers unordered-containers
          vector wreq yaml
@@ -139824,7 +143282,7 @@ self: {
        pname = "yaml-rpc-scotty";
        version = "1.0.2";
        sha256 = "1kbvziqd78fr47m3w86hc6pxa6jy3ljjwc0s2ga0d8zrh0irf3b3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers http-types mmorph scotty text transformers
          yaml yaml-rpc
        ];
@@ -139842,7 +143300,7 @@ self: {
        pname = "yaml-rpc-snap";
        version = "1.0.3";
        sha256 = "17csdfr4g0vb46yi2jhf6phin17rcn9arc71kmgdgx0xh2hrfin9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-types snap text transformers
          yaml yaml-rpc
        ];
@@ -139862,7 +143320,7 @@ self: {
        sha256 = "1yz7cq6xbxjh3j5hljrzla7dpgsa2ag4ywbvc6ynf7bpikdymq65";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath network swish text xml yaml
        ];
        homepage = "http://github.com/leifw/yaml2owl";
@@ -139881,7 +143339,7 @@ self: {
        sha256 = "13s5qiydxcwpp0j8xap556yrlmqs7bsi62ql2c9clr4hpbw8may7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers parsec text unordered-containers yaml
        ];
        jailbreak = true;
@@ -139898,7 +143356,10 @@ self: {
        sha256 = "16plby17rnr4c25sdacqx4vlyx338gbmadp1c6mr4c67zx76bi4a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base blank-canvas stm text time Yampa ];
+       libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
+       executableHaskellDepends = [
+         base blank-canvas stm text time Yampa
+       ];
        jailbreak = true;
        description = "blank-canvas frontend for yampa";
        license = stdenv.lib.licenses.bsd3;
@@ -139914,7 +143375,10 @@ self: {
        sha256 = "133nz8916c99bby6ikkh4kplx4hbwmqhdg0h2g5vsp25w67ndmjr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base GLFW-b newtype OpenGL vector-space Yampa ];
+       libraryHaskellDepends = [ base GLFW-b newtype OpenGL Yampa ];
+       executableHaskellDepends = [
+         base GLFW-b newtype OpenGL vector-space Yampa
+       ];
        jailbreak = true;
        homepage = "https://github.com/deepfire/yampa-glfw";
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
@@ -139932,7 +143396,10 @@ self: {
        sha256 = "0163whn909s4zzmhgnbs0x90ky6kxvr6630g650i69hhqapbihpp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base GLUT newtype OpenGL vector-space Yampa-core
+       ];
+       executableHaskellDepends = [
          base GLUT newtype OpenGL vector-space vector-space-opengl
          Yampa-core
        ];
@@ -139950,7 +143417,7 @@ self: {
        sha256 = "03plrnzxsci4fk23h8a992n5al1jc93igf61pskmhx8zgl3j3qmz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gloss random Yampa ];
+       executableHaskellDepends = [ base gloss random Yampa ];
        jailbreak = true;
        homepage = "https://github.com/ksaveljev/yampa-2048";
        description = "2048 game clone using Yampa/Gloss";
@@ -139962,10 +143429,10 @@ self: {
      mkDerivation {
        pname = "yaop";
        version = "0.1.2.1";
-       revision = "1";
        sha256 = "0z66ffxb89bksgqfji9x8msch9yk7nmbzm2qrcn5j3w4ylg7dpdr";
+       revision = "1";
        editedCabalFile = "5333f04af0a27a0197004dc2e686dbbf29e5e2dc248277eb2afcb7587092a55c";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/esmolanka/yaop";
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
@@ -139978,7 +143445,7 @@ self: {
        pname = "yap";
        version = "0.2";
        sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "yet another prelude - a simplistic refactoring with algebraic classes";
        license = stdenv.lib.licenses.bsd3;
@@ -139992,7 +143459,7 @@ self: {
        pname = "yarr";
        version = "1.4.0.1";
        sha256 = "0kk2yhhh6cjbav30sh68fg880kgdpks018c9gmn4gw98621nc6al";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq fixed-vector ghc-prim missing-foreign primitive
          template-haskell
        ];
@@ -140008,8 +143475,8 @@ self: {
        pname = "yarr-image-io";
        version = "1.3.2.1";
        sha256 = "1wmmzw62wb5hz4qavy51wb3wwqn07zd6iiwsrzcck1jdxwy0p81x";
-       buildDepends = [ base yarr ];
-       extraLibraries = [ libdevil ];
+       libraryHaskellDepends = [ base yarr ];
+       librarySystemDepends = [ libdevil ];
        jailbreak = true;
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
@@ -140026,10 +143493,10 @@ self: {
        sha256 = "0h2gd0k8vbz8rl34j42ayvcqp0ksz6642k9pznrd28h145wk8gz5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base Cabal directory event-driven filepath monads-tf process
-         regexpr
+       libraryHaskellDepends = [
+         base event-driven filepath monads-tf regexpr
        ];
+       executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140041,7 +143508,9 @@ self: {
        pname = "ycextra";
        version = "0.1";
        sha256 = "0aa0g2r7ck052wqkqqxzvkdqv9d7x3v7rqqd8iajwys9cvqny4m5";
-       buildDepends = [ base containers csv mtl uniplate yhccore ];
+       libraryHaskellDepends = [
+         base containers csv mtl uniplate yhccore
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Additional utilities to work with Yhc Core";
        license = stdenv.lib.licenses.bsd3;
@@ -140058,7 +143527,7 @@ self: {
        sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath process strict time unix
          xdg-basedir
        ];
@@ -140076,11 +143545,11 @@ self: {
        pname = "yeller";
        version = "0.1.0.4";
        sha256 = "0r9kcjax591v366m5nrm75cy97wr4ykzb7kj1bwsgss21k185a3j";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-client http-client-tls
          http-types network stm text unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers hspec http-client http-client-tls
          http-types network stm text unordered-containers
        ];
@@ -140100,8 +143569,13 @@ self: {
        sha256 = "0a5qiz0sx8kbi1ijq8lqjfszp5cvqnq1jpxx18wqndfkscjfsjbd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal containers mtl parsec random ];
-       testDepends = [ base containers hspec QuickCheck ];
+       libraryHaskellDepends = [
+         base Cabal containers mtl parsec random
+       ];
+       executableHaskellDepends = [
+         base Cabal containers mtl parsec random
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        homepage = "https://github.com/igrep/yes-precure5-command/";
        description = "Extended yes command to reproduce phrases in Yes! Precure 5";
        license = stdenv.lib.licenses.mit;
@@ -140119,7 +143593,7 @@ self: {
        pname = "yesod";
        version = "1.4.1.5";
        sha256 = "0sr9z3lxnwn5bdfwja97jsya3j0y0i8z5j6mph11bjgjdhv0s5m1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring conduit-extra
          data-default directory fast-logger monad-control monad-logger safe
          semigroups shakespeare streaming-commons template-haskell text
@@ -140139,7 +143613,7 @@ self: {
        pname = "yesod-angular";
        version = "0.1.0.1";
        sha256 = "1f2aghs78jc3v2raq2f07mrcpmkc4jjp2vvpal4bh4qq6jnyigzd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers shakespeare template-haskell text
          transformers yesod
        ];
@@ -140157,7 +143631,7 @@ self: {
        pname = "yesod-angular-ui";
        version = "0.1.1.0";
        sha256 = "08rr8w4bibjjchgfp1j9gywldr8v10vg8ddmkxj6dx5b6w2kvm8k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html containers directory hjsmin mtl resourcet
          shakespeare template-haskell text transformers yesod yesod-core
        ];
@@ -140182,7 +143656,7 @@ self: {
        pname = "yesod-auth";
        version = "1.4.6";
        sha256 = "0c0h1pivqk276l0l7nlrwpswvg72x39ikyfzbdnmxgmain878v2x";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
          conduit-extra containers cryptohash data-default email-validate
@@ -140206,11 +143680,11 @@ self: {
        pname = "yesod-auth-account";
        version = "1.4.1";
        sha256 = "18bi75kx89gfzh7vi5p8pcqwip1qfpkab415bmn6pcqrlh3jd90i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring mtl nonce persistent pwstore-fast text
          yesod-auth yesod-core yesod-form yesod-persistent
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec monad-logger mtl persistent-sqlite resourcet
          text xml-conduit yesod yesod-auth yesod-test
        ];
@@ -140230,12 +143704,12 @@ self: {
        pname = "yesod-auth-account-fork";
        version = "2.0";
        sha256 = "0y3xd8iw15il05bpnkicnlv9xznqlirapbr6gmr7lxzjhgddrzyn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html bytestring email-validate http-types mtl
          nonce persistent pwstore-fast random tagged text yesod-auth
          yesod-core yesod-form yesod-persistent
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec monad-logger mtl persistent-sqlite resourcet
          text xml-conduit yesod yesod-auth yesod-auth-account yesod-test
        ];
@@ -140254,10 +143728,10 @@ self: {
        pname = "yesod-auth-basic";
        version = "0.1.0.2";
        sha256 = "0b4vyf731wb7idmbqz7n8zm4p7i7y66x94ph7kaxv1jvq05k7bxa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring exceptions text wai word8 yesod
        ];
-       testDepends = [ base hlint hspec text yesod yesod-test ];
+       testHaskellDepends = [ base hlint hspec text yesod yesod-test ];
        description = "Yesod Middleware for HTTP Basic Authentication";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140270,7 +143744,7 @@ self: {
        pname = "yesod-auth-bcrypt";
        version = "0.2.0";
        sha256 = "06pbzk09zfnr290sczjpqjrfbbz1c6qig402siakp7lnizav4xz5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bcrypt bytestring text yesod-auth yesod-core yesod-form
          yesod-persistent
        ];
@@ -140290,7 +143764,7 @@ self: {
        pname = "yesod-auth-deskcom";
        version = "1.4.0";
        sha256 = "17lpkwrfc10rdmvkjg6qmbi7gysjjhqyh7n5d1mxgxhzxzqbi06w";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring byteable bytestring cipher-aes
          cprng-aes crypto-api crypto-random cryptohash data-default
          http-conduit http-types template-haskell text time transformers
@@ -140310,7 +143784,7 @@ self: {
        pname = "yesod-auth-fb";
        version = "1.7";
        sha256 = "1kp4vka9sjij8zyp15vj1jkaqwgy483q2gjb5wmhlqwcyp843h02";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit fb http-conduit lifted-base
          shakespeare text time transformers wai yesod-auth yesod-core
          yesod-fb
@@ -140329,11 +143803,11 @@ self: {
        pname = "yesod-auth-hashdb";
        version = "1.4.2.2";
        sha256 = "0s2qmpn4iwzdpps7yqcwb63cp8v1za9fp4amg0qc6b0pllzr616r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cryptohash persistent pwstore-fast text yesod-auth
          yesod-core yesod-form yesod-persistent
        ];
-       testDepends = [ base hspec text ];
+       testHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -140348,7 +143822,7 @@ self: {
        pname = "yesod-auth-kerberos";
        version = "1.4.2";
        sha256 = "1q25p6kzk4xksi64gl2k4vdnfiw2pmqmca1w5zwzvdr4zzgkmx18";
-       buildDepends = [
+       libraryHaskellDepends = [
          authenticate-kerberos base bytestring shakespeare text transformers
          yesod-auth yesod-core yesod-form
        ];
@@ -140367,7 +143841,7 @@ self: {
        pname = "yesod-auth-ldap";
        version = "0.0.3";
        sha256 = "1ps2vk2pvni3h4pk4v2siqb3a714r09ahgr5d1l89hspb9fbzfyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          authenticate-ldap base bytestring hamlet LDAP text transformers
          yesod-auth yesod-core yesod-form
        ];
@@ -140386,7 +143860,7 @@ self: {
        pname = "yesod-auth-ldap-mediocre";
        version = "0.1.0.0";
        sha256 = "03pij218i9lk79n02c2pfrxsxyqi6lzjn5bzg7zgk5a87b6b57jh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base LDAP text yesod-auth yesod-core yesod-form
        ];
        jailbreak = true;
@@ -140402,7 +143876,7 @@ self: {
        pname = "yesod-auth-oauth";
        version = "1.4.0.2";
        sha256 = "0vwp08rx4bnqx9mr6ixq15s334cdjadhl9n84rs3n1xd94sj1p6l";
-       buildDepends = [
+       libraryHaskellDepends = [
          authenticate-oauth base bytestring lifted-base text transformers
          yesod-auth yesod-core yesod-form
        ];
@@ -140420,7 +143894,7 @@ self: {
        pname = "yesod-auth-oauth2";
        version = "0.1.2";
        sha256 = "1bprc8n2f591igm5yfrxga7zim5vyib07h413ainhfc7g8pbaky9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate base bytestring hoauth2 http-conduit http-types
          lifted-base network-uri random text transformers yesod-auth
          yesod-core yesod-form
@@ -140439,7 +143913,7 @@ self: {
        pname = "yesod-auth-pam";
        version = "1.0.0.0";
        sha256 = "02cpg67ldjvv9sb6jr7liq3ac20rqc6lq1wjybii5vsah8hmvkhy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hamlet pam text yesod-auth yesod-core yesod-form
        ];
        description = "Provides PAM authentication module";
@@ -140455,7 +143929,7 @@ self: {
        pname = "yesod-auth-smbclient";
        version = "2.0.0.0";
        sha256 = "108bmfb68rvmx3q21hz55jbic331fnplcx062vlbk6sx3jyjqgaa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hamlet sys-auth-smbclient text yesod-auth yesod-core
          yesod-form
        ];
@@ -140474,7 +143948,7 @@ self: {
        pname = "yesod-auth-zendesk";
        version = "1.2.1";
        sha256 = "0jjfydbgjcymd9x47g0acjdml55f3n40193lvl4l9l02q54g9qnb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring cryptohash data-default
          http-conduit http-types template-haskell text time transformers wai
          yesod-auth yesod-core
@@ -140503,7 +143977,7 @@ self: {
        sha256 = "1vnqiibdjvkja80b8i352afrhphx8v6nihylgxaywch20b2fbkrc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async attoparsec base base64-bytestring blaze-builder bytestring
          Cabal conduit conduit-extra containers data-default-class deepseq
          directory file-embed filepath fsnotify ghc ghc-paths http-client
@@ -140529,7 +144003,7 @@ self: {
        pname = "yesod-bootstrap";
        version = "0.1.0.0";
        sha256 = "19hzc1k0ssmsi9k4r5bxmngr1h8a42qhaxcl5y99fbf6khpndxzg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup conduit conduit-extra containers
          either email-validate lens-family-core lens-family-th MonadRandom
          mtl persistent shakespeare text time transformers yesod-core
@@ -140537,6 +144011,7 @@ self: {
        ];
        description = "Bootstrap widgets for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-comments" = callPackage
@@ -140548,7 +144023,7 @@ self: {
        pname = "yesod-comments";
        version = "0.9.2";
        sha256 = "1isw8cwzwwsm7p3hqj0ynwncsdfg7x0ihphyv02awchqbgc2c87i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory friendly-time gravatar old-locale
          persistent template-haskell text time wai yesod yesod-auth
          yesod-form yesod-markdown
@@ -140570,7 +144045,7 @@ self: {
        sha256 = "1pzc0v18fapfbwd4pn4nchmsp4nvnrkm33av83zqfb5gyzhlk1in";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base datetime hashable hashmap stm system-uuid template-haskell
          yesod
        ];
@@ -140597,7 +144072,7 @@ self: {
        pname = "yesod-core";
        version = "1.4.12";
        sha256 = "1sdp2lg88c9gnwr3ffa8kj2vdd3y2kd7ark4qrm4gab07x2qflq3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          bytestring case-insensitive cereal clientsession conduit
          conduit-extra containers cookie data-default deepseq directory
@@ -140607,7 +144082,7 @@ self: {
          time transformers transformers-base unix-compat
          unordered-containers vector wai wai-extra wai-logger warp word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base blaze-builder bytestring clientsession conduit
          conduit-extra containers cookie hspec hspec-expectations http-types
          HUnit lifted-base mwc-random network path-pieces QuickCheck random
@@ -140628,7 +144103,7 @@ self: {
        pname = "yesod-crud";
        version = "0.1.2";
        sha256 = "0krjhskrjgymgp0nclggnivy03hmlvfy8c9d9ks4s14jw82rnhf1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base classy-prelude containers MissingH monad-control persistent
          random safe stm uuid yesod-core yesod-form yesod-persistent
        ];
@@ -140646,14 +144121,13 @@ self: {
        pname = "yesod-crud-persist";
        version = "0.1.1";
        sha256 = "171papb9hns62jswqxkg4q41wb8sb72714i4wghx7g8svh17lv28";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens persistent text transformers wai yesod-core yesod-form
          yesod-persistent
        ];
        homepage = "https://github.com/andrewthad/yesod-crud-persist";
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-datatables" = callPackage
@@ -140668,11 +144142,11 @@ self: {
        pname = "yesod-datatables";
        version = "0.1.1";
        sha256 = "0yn6fky83069pp4i13dlx9dlk4ck2k4c6sizgnrwqcjhm39m1bz6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring data-default persistent text yesod
          yesod-auth yesod-core yesod-default yesod-form yesod-static
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring HUnit monad-control persistent
          persistent-sqlite persistent-template QuickCheck resourcet
          template-haskell test-framework test-framework-hunit
@@ -140691,7 +144165,7 @@ self: {
        pname = "yesod-default";
        version = "1.2.0";
        sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
-       buildDepends = [ base yesod-core ];
+       libraryHaskellDepends = [ base yesod-core ];
        homepage = "http://www.yesodweb.com/";
        description = "Default config and main functions for your yesod application (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -140708,12 +144182,16 @@ self: {
        sha256 = "0pr5z3kg27j4fgyzs7ac263wd0qxfa3m45b6fn9hg18lwjb0fgd7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty array base bytestring Cabal containers directory
          filepath MissingH mtl shakespeare strict syb text transformers
          uniplate vector
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         array base Cabal containers directory filepath MissingH mtl
+         shakespeare strict text
+       ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140727,7 +144205,7 @@ self: {
        pname = "yesod-eventsource";
        version = "1.4.0.1";
        sha256 = "0j2x2zfr1s5a8m22kf27r6bdw041vmgf9b4v2ylc89n4m0f0dv55";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder conduit transformers wai wai-eventsource
          wai-extra yesod-core
        ];
@@ -140748,12 +144226,12 @@ self: {
        sha256 = "1ikrx9ys8civmf1m12fbms258xa7aj55rr02x3rjwchykmzianp4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html bytestring data-object data-object-yaml hamlet
          persistent-sqlite persistent-template stm text transformers yesod
          yesod-core yesod-static
        ];
-       extraLibraries = [ sqlite ];
+       executableSystemDepends = [ sqlite ];
        jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "Example programs using the Yesod Web Framework. (deprecated)";
@@ -140771,7 +144249,7 @@ self: {
        pname = "yesod-fay";
        version = "0.8.0";
        sha256 = "0inx11w4wdgnbxqghm9738qs19519dcdgyjmm3aah12wzv4i68gf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default directory fay fay-dom filepath
          monad-loops process pureMD5 shakespeare template-haskell text
          transformers utf8-string yesod-core yesod-form yesod-static
@@ -140789,7 +144267,7 @@ self: {
        pname = "yesod-fb";
        version = "0.3.4";
        sha256 = "09cymp9y21vawbgr6gcj41s5xkq6j22mvk0vgl3pnyq382j33rmp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit crypto-api fb http-conduit text wai
          yesod-core
        ];
@@ -140809,14 +144287,14 @@ self: {
        pname = "yesod-form";
        version = "1.4.4.1";
        sha256 = "14v4vhrbca0281im2bnvk36bm7i1r8yanxhv7lvrq5y5nqbc5bl3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html blaze-markup
          byteable bytestring containers data-default email-validate
          network-uri persistent resourcet semigroups shakespeare
          template-haskell text time transformers wai xss-sanitize yesod-core
          yesod-persistent
        ];
-       testDepends = [ base hspec text time ];
+       testHaskellDepends = [ base hspec text time ];
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
@@ -140830,7 +144308,7 @@ self: {
        pname = "yesod-form-json";
        version = "0.0.1";
        sha256 = "1hr53p4sp0zm7l1ap07kv2q6hi1xli74k13h0df4cmf9y2xn7bxz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
          yesod-core yesod-form
        ];
@@ -140846,7 +144324,7 @@ self: {
        pname = "yesod-gitrepo";
        version = "0.2.1.0";
        sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory enclosed-exceptions http-types lifted-base process
          temporary text wai yesod-core
        ];
@@ -140862,7 +144340,9 @@ self: {
        pname = "yesod-gitrev";
        version = "0.1.0.0";
        sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih";
-       buildDepends = [ aeson base gitrev template-haskell yesod-core ];
+       libraryHaskellDepends = [
+         aeson base gitrev template-haskell yesod-core
+       ];
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140875,7 +144355,7 @@ self: {
        pname = "yesod-goodies";
        version = "0.0.5";
        sha256 = "0wxdwyb5dg00ycb09kbl1m12w2bzi6kxbjr4dqgrwfd3dgypcjdz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring directory HTTP old-locale pandoc pureMD5
          text time yesod yesod-form
        ];
@@ -140892,7 +144372,7 @@ self: {
        pname = "yesod-json";
        version = "1.2.0";
        sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
-       buildDepends = [ base yesod-core ];
+       libraryHaskellDepends = [ base yesod-core ];
        homepage = "http://www.yesodweb.com/";
        description = "Generate content for Yesod using the aeson package. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -140904,7 +144384,7 @@ self: {
        pname = "yesod-links";
        version = "0.3.0";
        sha256 = "0i1b4lgwv98pp7251fm3h4cdb1d868fqwm6175rk7zg699g2v61y";
-       buildDepends = [ base text yesod-core ];
+       libraryHaskellDepends = [ base text yesod-core ];
        jailbreak = true;
        homepage = "http://github.com/pbrisbin/yesod-goodies/yesod-links";
        description = "A typeclass which simplifies creating link widgets throughout your site";
@@ -140918,7 +144398,7 @@ self: {
        pname = "yesod-lucid";
        version = "0.1";
        sha256 = "1ymmpi9g3pjl23ymdjwiv748lnq1hyjq24la2ffgwrm4b6f41xip";
-       buildDepends = [ base lucid monads-tf text yesod-core ];
+       libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140939,14 +144419,18 @@ self: {
        sha256 = "0syg5a0xihrdbclsrbgqgf6llhji7zdn1g50fbvlklfpw4dkb1f7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers http-conduit http-types lifted-base mangopay
+         persistent-template text time yesod yesod-core
+       ];
+       executableHaskellDepends = [
          aeson base bytestring conduit conduit-extra containers
          country-codes data-default directory fast-logger hamlet hjsmin
-         http-conduit http-types lifted-base mangopay monad-control
-         monad-logger persistent persistent-postgresql persistent-template
-         resourcet shakespeare template-haskell text time wai wai-extra
-         wai-logger warp yaml yesod yesod-auth yesod-core yesod-form
-         yesod-persistent yesod-static
+         http-conduit lifted-base mangopay monad-control monad-logger
+         persistent persistent-postgresql persistent-template resourcet
+         shakespeare template-haskell text time wai wai-extra wai-logger
+         warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent
+         yesod-static
        ];
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
@@ -140963,15 +144447,14 @@ self: {
        pname = "yesod-markdown";
        version = "0.10.0";
        sha256 = "0n9rcpf8s89swj0pz86xddl5zjbkkw1fa1h292wvs15y77lrl0zi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
        ];
-       testDepends = [ base blaze-html hspec text ];
+       testHaskellDepends = [ base blaze-html hspec text ];
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-media-simple" = callPackage
@@ -140982,7 +144465,7 @@ self: {
        pname = "yesod-media-simple";
        version = "0.1.0.1";
        sha256 = "1ajlrqsq7x83vc67xqb4r3328akwjp0a0vwf7nvqj3bsjqg5af76";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring diagrams-cairo diagrams-core diagrams-lib directory
          JuicyPixels vector yesod
        ];
@@ -140999,7 +144482,7 @@ self: {
        pname = "yesod-newsfeed";
        version = "1.4.0.1";
        sha256 = "02ydkri23vrm7mak2b1ybfhkdgc2dmv9vq3ki2d7sd005sp3zdly";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring containers shakespeare text
          time xml-conduit yesod-core
        ];
@@ -141014,7 +144497,7 @@ self: {
        pname = "yesod-paginate";
        version = "0.1";
        sha256 = "088m7prg774wdh8fp7zljxj65zj5krl4pggl63anv2wk7nlw27py";
-       buildDepends = [ base template-haskell yesod ];
+       libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141029,8 +144512,8 @@ self: {
        pname = "yesod-pagination";
        version = "2.0.0";
        sha256 = "0d42b8y7zpl624d7wa2caarni9g10hg14xsbamlkykki3bl197m1";
-       buildDepends = [ base esqueleto yesod ];
-       testDepends = [
+       libraryHaskellDepends = [ base esqueleto yesod ];
+       testHaskellDepends = [
          base hspec monad-logger persistent persistent-sqlite resource-pool
          resourcet shakespeare utf8-string wai-test yesod yesod-test
        ];
@@ -141048,7 +144531,7 @@ self: {
        pname = "yesod-paginator";
        version = "0.9.1";
        sha256 = "0xi19gf6vdna3nwwmciypqgaprzb7gdjpwvfrpj82gr6yar1va5m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base persistent resourcet text transformers yesod
        ];
        jailbreak = true;
@@ -141067,11 +144550,11 @@ self: {
        pname = "yesod-persistent";
        version = "1.4.0.3";
        sha256 = "0prvrz52c2pr4qsanjzndviyq4f6zc49in69xz5153h2vagbfmb4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder conduit persistent persistent-template
          resource-pool resourcet transformers yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder conduit hspec persistent persistent-sqlite text
          wai-extra yesod-core
        ];
@@ -141116,7 +144599,7 @@ self: {
        pname = "yesod-platform";
        version = "1.2.13.3";
        sha256 = "1j71m9bqam7dl1ghhwvkw5ispp8z06hbkvdxslx5sca998vx9awv";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint asn1-encoding asn1-parse asn1-types
          attoparsec-conduit authenticate auto-update base base16-bytestring
          base64-bytestring blaze-builder blaze-builder-conduit blaze-html
@@ -141160,7 +144643,7 @@ self: {
        pname = "yesod-pnotify";
        version = "0.5.0";
        sha256 = "05ic4n6g8jp575qj8mq9lbnhvmdm5zwxn3wf8f1blgigqimamsps";
-       buildDepends = [
+       libraryHaskellDepends = [
          base shakespeare text transformers yesod yesod-form
        ];
        jailbreak = true;
@@ -141175,7 +144658,7 @@ self: {
        pname = "yesod-pure";
        version = "0.1.0.2";
        sha256 = "0v3xvhk5nxc2y3c21y6h7w6lg5vm1s2vzf9f02qw8gj928vsidzg";
-       buildDepends = [ base fast-logger text yesod yesod-core ];
+       libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
        jailbreak = true;
        homepage = "https://github.com/snoyberg/yesod-pure";
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
@@ -141193,7 +144676,7 @@ self: {
        pname = "yesod-purescript";
        version = "0.0.5";
        sha256 = "0arij86cfzy5hh82gc5l4i3s3z4qa9rfrnj9nrp6q25qhvgiclmy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default formatting fsnotify
          mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio
          system-filepath template-haskell text time transformers yesod-core
@@ -141216,12 +144699,16 @@ self: {
        sha256 = "1vcllxsyqvr26a27l9vfi76kpdzld3ws1i0q6g9jnwhkr16bmc3f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers network-uri regex-posix
+         template-haskell text unordered-containers yaml yesod-core
+       ];
+       executableHaskellDepends = [
          aeson base bytestring containers network-uri optparse-applicative
          regex-posix template-haskell text unordered-containers yaml
          yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers hspec network-uri regex-posix
          template-haskell text unordered-containers yaml yesod-core
        ];
@@ -141239,7 +144726,7 @@ self: {
        pname = "yesod-recaptcha";
        version = "1.4";
        sha256 = "1dvbpzcfwmjv836i8g0gv80dj1iwb9gnvgwg3m5h2hi95249m471";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default http-conduit http-types lifted-base
          network network-info resourcet text wai yesod-auth yesod-core
          yesod-form
@@ -141256,13 +144743,13 @@ self: {
      mkDerivation {
        pname = "yesod-routes";
        version = "1.2.0.7";
-       revision = "1";
        sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j";
+       revision = "1";
        editedCabalFile = "0d622fd91f5c82a3ae54849a9f55e15b39dcc6240f9f2119151362255cd7334e";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers path-pieces template-haskell text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec HUnit path-pieces template-haskell
          text
        ];
@@ -141280,12 +144767,13 @@ self: {
        pname = "yesod-routes-flow";
        version = "1.0";
        sha256 = "1bb0w1910mnzci4mi6r2zxhjy4wsridi5h2g97nqhd65qncq4km0";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base classy-prelude system-fileio text yesod-core
        ];
        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
@@ -141296,7 +144784,7 @@ self: {
        pname = "yesod-routes-typescript";
        version = "0.3.0.0";
        sha256 = "1gn0fvspgwhzpg7pfaj029vdhlm8ypx9kyn2wdz2wzm5jkl7bnn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base classy-prelude system-fileio text yesod-core
          yesod-routes
        ];
@@ -141314,7 +144802,7 @@ self: {
        pname = "yesod-rst";
        version = "0.2.3";
        sha256 = "1dv8xq7hndpk3d86dxwjjplv0la8fn32pwzb5l00db9cg420jp71";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html directory hamlet pandoc persistent text
          xss-sanitize yesod-core yesod-form
        ];
@@ -141333,7 +144821,7 @@ self: {
        pname = "yesod-s3";
        version = "0.1.1";
        sha256 = "0vl24qa2aidrr7a082yhnscava06x6jf5y5x9fi9jdry3rnkhzbv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra gd hS3 mtl network resourcet
          text yesod-core
        ];
@@ -141351,7 +144839,7 @@ self: {
        pname = "yesod-sass";
        version = "0.1.2.0";
        sha256 = "0mxk007csmzbrx169jlbg07vqm7ixjrfvjy6xa2lfd5g1xpc7s94";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default hsass shakespeare template-haskell text
          yesod-core
        ];
@@ -141368,7 +144856,7 @@ self: {
        pname = "yesod-session-redis";
        version = "0.1.0";
        sha256 = "06ilc1xjic66xj46nib8y6cq7n8hyc27kzz9zd001d12qh342brv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers cookie hedis mtl network
          pool-conduit random text time wai yesod-core
        ];
@@ -141386,7 +144874,7 @@ self: {
        pname = "yesod-sitemap";
        version = "1.4.0.1";
        sha256 = "0ri67r3yjngn4m2lj071n2v3r9w7pvsl24rayf41k7w9j3ylk100";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit containers data-default text time xml-conduit
          xml-types yesod-core
        ];
@@ -141409,7 +144897,7 @@ self: {
        pname = "yesod-static";
        version = "1.5.0.1";
        sha256 = "1yda1m7dafcmq9s2gv0cdq3kphl5gg1279crqjgf3x57dyrypjpl";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base base64-bytestring blaze-builder byteable
          bytestring conduit conduit-extra containers cryptohash
          cryptohash-conduit css-text data-default directory file-embed
@@ -141417,7 +144905,7 @@ self: {
          resourcet template-haskell text transformers unix-compat
          unordered-containers wai wai-app-static yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base base64-bytestring byteable bytestring conduit
          conduit-extra containers cryptohash cryptohash-conduit data-default
          directory file-embed filepath hjsmin hspec http-types HUnit
@@ -141443,19 +144931,21 @@ self: {
        sha256 = "17dqk60076la64n4j6bndg9ya16q764j2cl07s2dlldw4z1g4sn1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder blaze-markup bytestring data-default
          directory filepath hamlet language-javascript mime-types
-         shakespeare template-haskell text yesod yesod-core yesod-static
+         shakespeare template-haskell text yesod-core yesod-static
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base data-default shakespeare yesod yesod-static
+       ];
+       testHaskellDepends = [
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
        ];
        homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-table" = callPackage
@@ -141465,11 +144955,12 @@ self: {
        pname = "yesod-table";
        version = "1.0.3";
        sha256 = "02w7ddyi0zzcvhlj1b01p3zjii2g7bn2f7wcgrdidk8dlg9hrgj5";
-       buildDepends = [ base containers contravariant text yesod-core ];
+       libraryHaskellDepends = [
+         base containers contravariant text yesod-core
+       ];
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-tableview" = callPackage
@@ -141478,7 +144969,7 @@ self: {
        pname = "yesod-tableview";
        version = "0.2.1";
        sha256 = "1qf7439c31a8xi0qs8fn2xdlrldi42n1k25lj6vn061lm8wg35yy";
-       buildDepends = [ base hamlet persistent yesod ];
+       libraryHaskellDepends = [ base hamlet persistent yesod ];
        description = "Table view for Yesod applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141495,13 +144986,13 @@ self: {
        pname = "yesod-test";
        version = "1.4.3.1";
        sha256 = "150kzp8h9wl3c1diz6h6m62qd6w0qz4drgrm095amb0sndrh37m2";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          case-insensitive containers cookie hspec-core html-conduit
          http-types HUnit monad-control network persistent text time
          transformers wai wai-extra xml-conduit xml-types yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec html-conduit HUnit text wai
          xml-conduit yesod-core yesod-form
        ];
@@ -141519,7 +145010,7 @@ self: {
        pname = "yesod-test-json";
        version = "0.2.0.0";
        sha256 = "1z6cps85fypgymfmq0z67f1z5cr2x9l9hf4wrkncvkivbcb330bh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit hspec http-types HUnit text
          transformers wai wai-test yesod-default
        ];
@@ -141538,7 +145029,7 @@ self: {
        pname = "yesod-text-markdown";
        version = "0.1.8";
        sha256 = "1k48wjnn4vvlh9cvh8p3yanjmr772vqz4jbz9nxk0vv9ab9dns81";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base markdown persistent shakespeare text yesod-core
          yesod-form yesod-persistent
        ];
@@ -141554,13 +145045,14 @@ self: {
        pname = "yesod-tls";
        version = "1.4.1";
        sha256 = "0zvhchiky51pwhbcj4c86xsa98nwfw86188jxhnk2jwdgpdb9j68";
-       buildDepends = [
+       libraryHaskellDepends = [
          base fast-logger monad-logger template-haskell unix wai wai-extra
          warp warp-tls yesod
        ];
        homepage = "http://github.com/netom/yesod-tls";
        description = "Provides main functions using warp-tls for yesod projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-transloadit" = callPackage
@@ -141573,12 +145065,12 @@ self: {
        pname = "yesod-transloadit";
        version = "0.3.0.0";
        sha256 = "0p2npza0clflh1vswyjr4gxx5fxggzv1x61x7c7d79jadq88bi4m";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
          old-locale shakespeare text time transformers unordered-containers
          yesod yesod-core yesod-form
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base containers hspec lens old-locale text time yesod
          yesod-form yesod-test
        ];
@@ -141596,7 +145088,10 @@ self: {
        sha256 = "163ah4g6k62hypm2kj1aiwnzfjx1ngss6iqfg467vjhg71s5l1j9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-html hamlet persistent text yesod yesod-form
+       ];
+       executableHaskellDepends = [
          base blaze-html hamlet monad-logger persistent persistent-sqlite
          resourcet text yesod yesod-form
        ];
@@ -141616,7 +145111,7 @@ self: {
        pname = "yesod-websockets";
        version = "0.2.3";
        sha256 = "15kklk4wkxclrmsvwzjcy8ggal14c6nrckfn0kqcrfp0hbxzj09m";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base conduit enclosed-exceptions monad-control transformers
          wai wai-websockets websockets yesod-core
        ];
@@ -141633,7 +145128,7 @@ self: {
        pname = "yesod-websockets-extra";
        version = "0.1.0.0";
        sha256 = "042gl7w8cipjhqfl5h933b0p3j9d5m58v91p1rylz4mjgvhxpk5g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base enclosed-exceptions transformers websockets yesod-websockets
        ];
        description = "Extension to yesod-websockets";
@@ -141649,7 +145144,7 @@ self: {
        pname = "yesod-worker";
        version = "0.0.1";
        sha256 = "1rwmw1hhx2mm6ikmqcfjg9vgi95mjhv2w5r4dwn8796jkkw8zpkd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fast-logger monad-control monad-logger persistent
          resourcet stm template-haskell transformers transformers-base yesod
          yesod-core
@@ -141675,14 +145170,15 @@ self: {
        sha256 = "1m9sb4kshdvr4nd4dsd6ss2f4dfhxnbs9g1xd9rmzrd7bw9k5am0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-terminal async base base-unicode-symbols bytestring
-         Cabal case-insensitive clock configuration-tools deepseq either
+         case-insensitive clock configuration-tools deepseq either
          enclosed-exceptions lens lifted-base monad-control mtl
          optparse-applicative stm stm-chans text time trace transformers
          transformers-base void
        ];
-       testDepends = [
+       executableHaskellDepends = [ base Cabal ];
+       testHaskellDepends = [
          async base base-unicode-symbols configuration-tools
          enclosed-exceptions lens lifted-base tagged tasty tasty-hunit text
          transformers transformers-base void
@@ -141690,7 +145186,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yhccore" = callPackage
@@ -141699,7 +145194,7 @@ self: {
        pname = "yhccore";
        version = "0.9.1";
        sha256 = "18gjzlpxn0hp723ybjgq1zdbpl35iqphs7b8r5x9ddbkm435sw93";
-       buildDepends = [ base containers mtl pretty uniplate ];
+       libraryHaskellDepends = [ base containers mtl pretty uniplate ];
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Yhc's Internal Core language";
        license = stdenv.lib.licenses.bsd3;
@@ -141720,9 +145215,10 @@ self: {
        pname = "yi";
        version = "0.12.0";
        sha256 = "167x1zmkhrh7s4wjvvpp0pydgif1yl05by8j6wimi79wwvnkiyi7";
+       configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Cabal containers data-default
          directory dlist dynamic-state dyre exceptions filepath glib gtk
          hashable lens mtl old-locale oo-prototypes pango parsec pointedlist
@@ -141730,11 +145226,11 @@ self: {
          template-haskell text time transformers-base unix unix-compat
          unordered-containers vty word-trie xdg-basedir yi-language yi-rope
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base directory filepath HUnit lens QuickCheck semigroups tasty
          tasty-hunit tasty-quickcheck text yi-language yi-rope
        ];
-       configureFlags = [ "-fpango" "-fvty" ];
        homepage = "https://yi-editor.github.io";
        description = "The Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
@@ -141749,7 +145245,7 @@ self: {
        pname = "yi-contrib";
        version = "0.10.1";
        sha256 = "053hsahkxwg2mnf3h4j95gj18x5791dqqji43l310i4l7mliw91k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath lens mtl old-locale
          oo-prototypes split text time transformers-base yi yi-language
          yi-rope
@@ -141767,7 +145263,7 @@ self: {
        pname = "yi-emacs-colours";
        version = "0.1.0.1";
        sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv";
-       buildDepends = [ base containers split yi-language ];
+       libraryHaskellDepends = [ base containers split yi-language ];
        homepage = "https://github.com/Fuuzetsu/yi-emacs-colours";
        description = "Simple mapping from colour names used in emacs to Color";
        license = stdenv.lib.licenses.gpl2;
@@ -141782,7 +145278,7 @@ self: {
        pname = "yi-fuzzy-open";
        version = "0.1.0";
        sha256 = "03y7ddas8w380asx4ldafp1r3h4nlyjky7n4n5sdyvwbi0rix1gc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-default directory filepath mtl text
          transformers-base vector yi yi-language yi-rope
        ];
@@ -141814,17 +145310,17 @@ self: {
        pname = "yi-language";
        version = "0.2.0";
        sha256 = "1a0lvddn35q9jqr0w7g2m268dy8s9dwsss7sf4460rvkg1xvkvvh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers data-default hashable lens
          oo-prototypes pointedlist regex-base regex-tdfa template-haskell
          transformers-base unordered-containers
        ];
-       testDepends = [
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
          array base binary containers data-default filepath hashable hspec
          lens pointedlist QuickCheck regex-base regex-tdfa template-haskell
          transformers-base unordered-containers
        ];
-       buildTools = [ alex ];
        homepage = "https://github.com/yi-editor/yi-language";
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
@@ -141836,7 +145332,7 @@ self: {
        pname = "yi-monokai";
        version = "0.1.1.2";
        sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l";
-       buildDepends = [ base yi ];
+       libraryHaskellDepends = [ base yi ];
        homepage = "https://github.com/Fuuzetsu/yi-monokai";
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
@@ -141851,11 +145347,13 @@ self: {
        pname = "yi-rope";
        version = "0.7.0.1";
        sha256 = "190rb5rbvdzy4d52dj3ih0kwzigh7v0fg412p3848pkv3836vmg0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring charsetdetect-ae data-default deepseq
          fingertree text text-icu
        ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances text ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances text
+       ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -141866,7 +145364,7 @@ self: {
        pname = "yi-snippet";
        version = "0.1.0.0";
        sha256 = "0qbn5x7lbvb9h6gdqgvldzyy7z5y5aa9a02ss48zkccss5p6939d";
-       buildDepends = [ base containers yi yi-rope ];
+       libraryHaskellDepends = [ base containers yi yi-rope ];
        homepage = "https://github.com/yi-editor/yi-snippet";
        description = "Snippet support for Yi";
        license = stdenv.lib.licenses.gpl2;
@@ -141878,7 +145376,7 @@ self: {
        pname = "yi-solarized";
        version = "0.1.1";
        sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc";
-       buildDepends = [ base yi ];
+       libraryHaskellDepends = [ base yi ];
        homepage = "https://github.com/NorfairKing/yi-solarized";
        description = "Solarized colour theme for the Yi text editor";
        license = stdenv.lib.licenses.mit;
@@ -141890,7 +145388,7 @@ self: {
        pname = "yi-spolsky";
        version = "0.1";
        sha256 = "152ys2x416322c13nxmi25wpilq0ddd6hj36mr25jaacf1qszv6q";
-       buildDepends = [ base yi ];
+       libraryHaskellDepends = [ base yi ];
        jailbreak = true;
        homepage = "https://github.com/melrief/yi-spolsky";
        description = "Spolsky colour theme for the Yi text editor";
@@ -141915,7 +145413,7 @@ self: {
        pname = "yices";
        version = "0.0.0.12";
        sha256 = "1k3q789dapk0c311x72w4r008rnbfz3cvajahxq208gy8iyjx9iz";
-       buildDepends = [ base parsec process ];
+       libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141926,7 +145424,9 @@ self: {
        pname = "yices-easy";
        version = "0.1";
        sha256 = "13nl3isf8npqmgsa7mc7713g7y0nk33a654rm1qnn1s6zyz41v70";
-       buildDepends = [ base bindings-yices containers transformers ];
+       libraryHaskellDepends = [
+         base bindings-yices containers transformers
+       ];
        homepage = "http://www.ugcs.caltech.edu/~keegan/haskell/yices-easy/";
        description = "Simple interface to the Yices SMT (SAT modulo theories) solver";
        license = stdenv.lib.licenses.bsd3;
@@ -141940,10 +145440,10 @@ self: {
        pname = "yices-painless";
        version = "0.1.2";
        sha256 = "1q0hxzvhd9p0qb0fyps6hn06nhqcwldxyfljk8880il17ky92p3h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers pretty strict-concurrency vector
        ];
-       extraLibraries = [ gmp yices ];
+       librarySystemDepends = [ gmp yices ];
        homepage = "http://code.haskell.org/~dons/code/yices-painless";
        description = "An embedded language for programming the Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
@@ -141959,9 +145459,10 @@ self: {
        sha256 = "11iwz7mrx3f72i3d4l9zvqb8g0722aj00s7h7wa06y4l69rfnj6m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base directory ftphs haskeline hsConfigure mtl process unix
+       libraryHaskellDepends = [
+         base directory ftphs haskeline mtl process unix
        ];
+       executableHaskellDepends = [ hsConfigure ];
        jailbreak = true;
        homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml";
        description = "CUI FTP client like 'ftp', 'ncftp'";
@@ -141977,7 +145478,7 @@ self: {
        sha256 = "1rlw9i1a034lg7gc60fkxjh6kc5yrbapc745gwl1ddi2wisy3h24";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory ftphs mtl process unix ];
+       libraryHaskellDepends = [ base directory ftphs mtl process unix ];
        jailbreak = true;
        homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml";
        description = "CUI FTP client like 'ftp', 'ncftp'";
@@ -141990,7 +145491,7 @@ self: {
        pname = "yjsvg";
        version = "0.1.18";
        sha256 = "1k9shfj53vqg1wgm06k2729md0q5y252sypjkx245sn3x0a7ffji";
-       buildDepends = [ base HaXml ];
+       libraryHaskellDepends = [ base HaXml ];
        description = "make SVG string from Haskell data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142001,7 +145502,7 @@ self: {
        pname = "yjtools";
        version = "0.9.18";
        sha256 = "13zbq37p2prbyxq1wply7qqpc2wwsic78wzcgbc430nfrrpiq4lv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/yjtools/index.xhtml";
        description = "some tools for Monad, List, Tuple and so on";
        license = "LGPL";
@@ -142015,8 +145516,8 @@ self: {
        pname = "yocto";
        version = "1.0.1";
        sha256 = "0i92yraawhn6qkw23wm5vmgwcjgy9pis684jyq8mkawbw0nv3q9a";
-       buildDepends = [ base containers parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
          base containers parsec QuickCheck quickcheck-instances
        ];
        homepage = "https://github.com/ajg/yocto";
@@ -142034,7 +145535,7 @@ self: {
        pname = "yoko";
        version = "2.0";
        sha256 = "07ivcx6xbmjpyj7053fp151k47y7pllwjddxxrwayrlx2qx456z6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers invariant kinds mtl records semigroups
          template-haskell th-sccs type-cereal type-digits type-equality
          type-functions type-ord type-ord-spine-cereal type-spine
@@ -142050,7 +145551,7 @@ self: {
        pname = "york-lava";
        version = "0.2";
        sha256 = "1rpkxlfvk84zl965ik5bpplzcskd96wsnicp66ixnfs9bkqfj7qb";
-       buildDepends = [ base containers haskell98 ];
+       libraryHaskellDepends = [ base containers haskell98 ];
        homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "A library for digital circuit description";
        license = stdenv.lib.licenses.bsd3;
@@ -142065,7 +145566,7 @@ self: {
        sha256 = "0n33778aflcdzdkc6p0qaxdqvmyzdyg0r6rg4q2wh0g74m6pl2m4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring process utility-ht ];
+       executableHaskellDepends = [ base bytestring process utility-ht ];
        description = "Upload video to YouTube via YouTube API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142083,12 +145584,15 @@ self: {
        sha256 = "1qwk78adndk2m48inxklqj1rc58wx4jrdim60gwy7ax2d3w92pg6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring containers cryptohash
          data-default ecma262 exceptions hslogger http-conduit http-types
-         hxt lens opendatatable parsec SHA text transformers
+         lens opendatatable parsec SHA text transformers
          unordered-containers uri-template utf8-string uuid vector zlib
        ];
+       executableHaskellDepends = [
+         base containers ecma262 exceptions hxt opendatatable
+       ];
        jailbreak = true;
        homepage = "https://github.com/fabianbergmark/YQL";
        description = "A YQL engine to execute Open Data Tables";
@@ -142108,7 +145612,7 @@ self: {
        sha256 = "1bnmh7caj9s6sfj2hhfwdnsg75wci1qw8c3pwryqy57knwcwbvkz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base containers csv directory filepath HDBC HDBC-sqlite3
          HStringTemplate lucid old-locale old-time pandoc parsec scientific
          split text time unordered-containers yaml
@@ -142116,7 +145620,6 @@ self: {
        homepage = "http://github.com/jgm/yst";
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yuiGrid" = callPackage
@@ -142125,7 +145628,7 @@ self: {
        pname = "yuiGrid";
        version = "0.1";
        sha256 = "005l0rr9l0l81706drq57nww4h0j4rw8n0ncpnkdb139941gywzq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Grids defined by layout hints and implemented on top of Yahoo grids";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142141,7 +145644,11 @@ self: {
        sha256 = "01pf0mg6lgm34src1mfz3qj41vyhmvi50yjyv72zwamd0g7sx374";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers curl deepseq directory filepath
+         haskell98 mtl network parsec
+       ];
+       executableHaskellDepends = [
          base bytestring containers curl deepseq directory filepath
          haskell98 mtl network parsec
        ];
@@ -142167,7 +145674,7 @@ self: {
        sha256 = "05aba4fdpqx7sar7yrw4gg341wzfhhlbvx7453ns8mccqhx9dag8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bimap binary binary-conduit bytestring
          Codec-Compression-LZF conduit conduit-combinators conduit-extra
          containers csv-conduit Decimal directory exceptions ghc-prim lens
@@ -142175,7 +145682,8 @@ self: {
          reinterpret-cast resourcet text text-binary time transformers
          vector xml-conduit
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          array attoparsec base bimap binary binary-conduit bytestring
          Codec-Compression-LZF conduit conduit-combinators conduit-extra
          containers csv-conduit Decimal directory exceptions ghc-prim HUnit
@@ -142197,10 +145705,9 @@ self: {
        sha256 = "1vpmwizxcab1mlz7vp3hp72ddla7805jn0lq60fmkjgmj95ryvq9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl ];
-       testDepends = [ base hspec QuickCheck ];
-       extraLibraries = [ gomp z3 ];
-       preBuild = stdenv.lib.optionalString stdenv.isDarwin "export DYLD_LIBRARY_PATH=${z3}/lib";
+       libraryHaskellDepends = [ base containers mtl ];
+       librarySystemDepends = [ gomp z3 ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "http://bitbucket.org/iago/z3-haskell";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
@@ -142216,7 +145723,7 @@ self: {
        sha256 = "1bhp98bn41lqxdl48xxcb4b4fknva2aigq5gxffcha535igdmdy3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers directory filepath HSH MissingH old-locale
          parsec time
        ];
@@ -142232,7 +145739,7 @@ self: {
        pname = "zasni-gerna";
        version = "0.0.7";
        sha256 = "1zl2kcd0hr021xl6pjvvxwxvmpb02cq04ck39qkwil56vannnksw";
-       buildDepends = [ base papillon ];
+       libraryHaskellDepends = [ base papillon ];
        homepage = "https://skami.iocikun.jp/haskell/packages/zasni-gerna";
        description = "lojban parser (zasni gerna)";
        license = stdenv.lib.licenses.bsd3;
@@ -142245,7 +145752,9 @@ self: {
        pname = "zcache";
        version = "0.0.0";
        sha256 = "10j0fwf58ig0j44f7p57zr8by6i9j1agnjzk6cs65iimm79m9avb";
-       buildDepends = [ array base containers mersenne-random-pure64 ];
+       libraryHaskellDepends = [
+         array base containers mersenne-random-pure64
+       ];
        homepage = "https://patch-tag.com/r/salazar/zcache/";
        description = "Zobrist keys for game state tracking";
        license = stdenv.lib.licenses.bsd3;
@@ -142257,7 +145766,7 @@ self: {
        pname = "zenc";
        version = "0.1.1";
        sha256 = "0p0h7vz14k9v8gsnpkb9ca61i1k67vvsjg0bzy0ag4m20k94zlb2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "GHC style name Z-encoding and Z-decoding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142273,7 +145782,7 @@ self: {
        pname = "zendesk-api";
        version = "0.1.0.0";
        sha256 = "1x6801i5rw6a0nfdihi04bmka8qww9c77r7ygbhp3zx1hqdpdmmc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring case-insensitive conduit connection
          data-default failure http-client http-client-tls http-conduit
          http-types monad-logger mtl pem template-haskell text time tls
@@ -142296,7 +145805,7 @@ self: {
        sha256 = "03jwhgi9n9iv7zpn8nwkdyvsybsksnhsji8k2ma9rzayk36aba6v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory ghc ghc-paths mtl parallel process
          random text transformers
        ];
@@ -142311,7 +145820,7 @@ self: {
        pname = "zero";
        version = "0.1.2";
        sha256 = "01hfsi29g42b4jj3ahddv1ry7qgav17pwpngipz8igq2w81v1y9p";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        homepage = "https://github.com/phaazon/zero";
        description = "Semigroups with absorption";
        license = stdenv.lib.licenses.bsd3;
@@ -142325,12 +145834,12 @@ self: {
        pname = "zeromq-haskell";
        version = "0.8.4";
        sha256 = "0lvjszi08r5wm5ch03153y7lir6cdgqr2gnhq45j4b0kid6gkpv3";
-       buildDepends = [ base bytestring containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ zeromq ];
+       testHaskellDepends = [
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       extraLibraries = [ zeromq ];
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
@@ -142345,7 +145854,7 @@ self: {
        pname = "zeromq3-conduit";
        version = "0.1.0.0";
        sha256 = "1n6xl5izdkbl2mb4msryrcasg08prjbgzwilz4b7yi1g79y1yf77";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit lifted-base monad-control mtl resourcet
          transformers zeromq3-haskell
        ];
@@ -142364,15 +145873,15 @@ self: {
        pname = "zeromq3-haskell";
        version = "0.5.2";
        sha256 = "1ky92qwyk27qsxnvaj0mc9yyhk7g19ry2nq55666ayahc899z213";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers MonadCatchIO-transformers
          semigroups transformers
        ];
-       testDepends = [
+       libraryPkgconfigDepends = [ zeromq ];
+       testHaskellDepends = [
          ansi-terminal async base bytestring checkers containers
          MonadCatchIO-transformers QuickCheck transformers
        ];
-       pkgconfigDepends = [ zeromq ];
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
@@ -142388,13 +145897,13 @@ self: {
        pname = "zeromq4-haskell";
        version = "0.6.3";
        sha256 = "0yrwqxm208n9k76i9aby5hiv55kd1p27pq6hyry5ngw95fh95p67";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers exceptions semigroups transformers
        ];
-       testDepends = [
+       libraryPkgconfigDepends = [ zeromq ];
+       testHaskellDepends = [
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       pkgconfigDepends = [ zeromq ];
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 4.x";
        license = stdenv.lib.licenses.mit;
@@ -142411,7 +145920,11 @@ self: {
        sha256 = "10ilsxlha4l7c4z3jl6lykcjns6igyk2qma2a03yzpvgz7ijy4c0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal derive directory filepath haskell-src-exts hskeleton
+         monoid-record process syb template-haskell
+       ];
+       executableHaskellDepends = [
          base Cabal derive directory filepath haskell-src-exts hskeleton
          monoid-record process syb template-haskell
        ];
@@ -142429,10 +145942,10 @@ self: {
        pname = "zigbee-znet25";
        version = "0.1.1.0";
        sha256 = "0kv52f7zhgd2x44a2dg89jrsxiis73m8884f4zmxdbznhq1prqf5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal MissingH mtl transformers
        ];
-       testDepends = [ base bytestring mtl QuickCheck random ];
+       testHaskellDepends = [ base bytestring mtl QuickCheck random ];
        homepage = "https://github.com/djoyner/zigbee-znet25";
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
        license = stdenv.lib.licenses.bsd3;
@@ -142449,14 +145962,15 @@ self: {
        sha256 = "169nkxr5zlbymiz1ydlhlqr66vqiycmg85xh559phpkr64w3nqj1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers digest directory filepath
          mtl old-time pretty text time unix zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [ base bytestring directory ];
+       testHaskellDepends = [
          base bytestring directory HUnit old-time process time
        ];
-       buildTools = [ zip ];
+       testToolDepends = [ zip ];
        homepage = "http://github.com/jgm/zip-archive";
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
@@ -142472,11 +145986,11 @@ self: {
        pname = "zip-conduit";
        version = "0.2.2.2";
        sha256 = "0spb6b1mwcqwzrr231i5s6hcln9jck0z03jdfh1zlm87mvp8670v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra digest directory
          filepath mtl old-time resourcet time transformers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit directory filepath hpc HUnit mtl resourcet
          temporary test-framework test-framework-hunit time
        ];
@@ -142492,7 +146006,7 @@ self: {
        pname = "zipedit";
        version = "0.2.3";
        sha256 = "17msh3gwylmsiabyz5x05ir2xh8h904kbp5isnvbf0z4kzfv33cr";
-       buildDepends = [ base directory mtl process ];
+       libraryHaskellDepends = [ base directory mtl process ];
        homepage = "http://code.haskell.org/~byorgey/code/zipedit";
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
@@ -142505,7 +146019,7 @@ self: {
        pname = "zipper";
        version = "0.4.2";
        sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44";
-       buildDepends = [ base multirec ];
+       libraryHaskellDepends = [ base multirec ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
        description = "Generic zipper for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -142518,11 +146032,11 @@ self: {
      mkDerivation {
        pname = "zippers";
        version = "0.2";
-       revision = "1";
        sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls";
+       revision = "1";
        editedCabalFile = "3e27022f7ed27e35e73ed36f3aa6b396c7e7b52e864965b8d3cd4dab8394e960";
-       buildDepends = [ base lens profunctors semigroupoids ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base lens profunctors semigroupoids ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/zippers/";
        description = "Traversal based zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -142534,7 +146048,7 @@ self: {
        pname = "zippo";
        version = "0.3";
        sha256 = "1ihdird5yryfb2ki9bwwchj8bxjcmmgjkp3hl605zzhi2lz3awx2";
-       buildDepends = [ base mtl yall ];
+       libraryHaskellDepends = [ base mtl yall ];
        homepage = "http://brandon.si/code/zippo/";
        description = "A simple lens-based, generic, heterogenous, type-checked zipper library";
        license = stdenv.lib.licenses.bsd3;
@@ -142546,8 +146060,8 @@ self: {
        pname = "zlib";
        version = "0.5.4.2";
        sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ zlib ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) zlib;};
@@ -142560,11 +146074,11 @@ self: {
        pname = "zlib";
        version = "0.6.1.1";
        sha256 = "0dd79dxf56d8f6ad9if3j87s9gg7yd17ckypjxwplrbkahlb9xf5";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       extraLibraries = [ zlib ];
        jailbreak = true;
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
@@ -142576,10 +146090,12 @@ self: {
        pname = "zlib-bindings";
        version = "0.1.1.5";
        sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8";
-       buildDepends = [ base bytestring zlib ];
-       testDepends = [ base bytestring hspec QuickCheck zlib ];
-       homepage = "http://github.com/snoyberg/zlib-bindings";
-       description = "Low-level bindings to the zlib package. (deprecated)";
+       revision = "2";
+       editedCabalFile = "0c6f9f81832af2473281fd58631aff8c6bbad24191e00d2a5a6ae2479249043b";
+       libraryHaskellDepends = [ base bytestring zlib ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
+       homepage = "http://github.com/snapframework/zlib-bindings";
+       description = "Low-level bindings to the zlib package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -142589,7 +146105,7 @@ self: {
        pname = "zlib-conduit";
        version = "1.1.0";
        sha256 = "1b22mca8bbg7f84h8y0qsb5ckzg2dw1b26y27x7b7xdxqbwpz93a";
-       buildDepends = [ base conduit ];
+       libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming compression/decompression via conduits. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -142605,7 +146121,7 @@ self: {
        sha256 = "1nfczminxafzk69ry1sqkj1ha0jlv3l9ak10yk205snfhpmcjgg4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator transformers zlib-bindings
        ];
        homepage = "http://github.com/maltem/zlib-enum";
@@ -142618,10 +146134,10 @@ self: {
      mkDerivation {
        pname = "zlib-lens";
        version = "0.1.2";
-       revision = "1";
        sha256 = "1vm12sm9ypik5qnnizmwx56fmpjghldzb06kn020hwlabz8c4j8n";
+       revision = "1";
        editedCabalFile = "353e3ef6e0281894cd494b95563bb93a30ec0ff96e309a173c36bddfc4069e66";
-       buildDepends = [ base bytestring profunctors zlib ];
+       libraryHaskellDepends = [ base bytestring profunctors zlib ];
        homepage = "http://lens.github.io/";
        description = "Lenses for zlib";
        license = stdenv.lib.licenses.bsd3;
@@ -142635,7 +146151,8 @@ self: {
        sha256 = "0lg5fn89wj5blbp2gh760ibxb2zz9f11jnwicfsmsayra51micip";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring zeromq3-haskell ];
+       libraryHaskellDepends = [ base bytestring zeromq3-haskell ];
+       executableHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/lucasdicioccio/zmcat";
        description = "Command-line tool for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
@@ -142648,7 +146165,7 @@ self: {
        pname = "zmidi-core";
        version = "0.7.0";
        sha256 = "0v8zcybr46rcdpvsji0dzr78skj79jp8l9sd49z6c7s5sddzjm9l";
-       buildDepends = [ base binary bytestring containers ];
+       libraryHaskellDepends = [ base binary bytestring containers ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Read and write MIDI files";
        license = stdenv.lib.licenses.bsd3;
@@ -142663,7 +146180,7 @@ self: {
        pname = "zmidi-score";
        version = "0.3.0.0";
        sha256 = "0zhh6bdpbng69sajxdvj2mnd385gc8yyli3jzyjfxp0wr0hv3biv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary containers data-ordlist deepseq deepseq-generics
          directory filepath mtl parallel-io text zmidi-core
        ];
@@ -142683,7 +146200,7 @@ self: {
        sha256 = "1k10wflfsivq792jvl3bhb8nkpx6m3z8qzarz6q8aw5hs2wslvrv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base classy-prelude optparse-applicative semigroups zeromq4-haskell
        ];
        description = "A socat-like tool for zeromq library";
@@ -142697,7 +146214,7 @@ self: {
        pname = "zoneinfo";
        version = "0.5";
        sha256 = "1n27j8ca79a1ijn7k7dp61kjz62i6zfzlns8n0kwgyvpx413ws8y";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        description = "ZoneInfo library";
        license = stdenv.lib.licenses.bsd3;
@@ -142714,8 +146231,9 @@ self: {
        sha256 = "0zsr3k4c6da1l5cw3laj2snfszm4g0bz76hj2bjj61yrwmc99vnl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base directory filepath ghc hamlet hint mtl template-haskell text
+       libraryHaskellDepends = [ base ghc hamlet template-haskell text ];
+       executableHaskellDepends = [
+         base directory filepath ghc hint mtl
        ];
        jailbreak = true;
        homepage = "http://github.com/iand675/Zoom";
@@ -142737,12 +146255,17 @@ self: {
        sha256 = "0761xpfmmm309r6r44ax7x2zs49dskygl2c09x2kpxpfr7rr3k5f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers data-default iteratee
+         iteratee-compress ListLike MonadCatchIO-transformers mtl old-locale
+         QuickCheck time transformers type-level unix zlib
+       ];
+       executableHaskellDepends = [
          base blaze-builder bytestring containers data-default iteratee
          iteratee-compress ListLike MonadCatchIO-transformers mtl old-locale
          QuickCheck time transformers type-level ui-command unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder iteratee QuickCheck random test-framework
          test-framework-quickcheck2 transformers type-level unix
        ];
@@ -142760,7 +146283,7 @@ self: {
        pname = "zoom-cache-pcm";
        version = "0.3.0.1";
        sha256 = "0r676wb4q7wmin3liqh525w43pgdf0gmcfx2ccpbvc4ahain9vyq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers iteratee ListLike mtl
          type-level zoom-cache
        ];
@@ -142781,7 +146304,7 @@ self: {
        sha256 = "0722wy6rqbx4gajn3sp946scganr2arhinxrqyq5fvvsbdxacwhz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers data-default hsndfile hsndfile-vector
          mtl ui-command vector zoom-cache zoom-cache-pcm
        ];
@@ -142797,7 +146320,7 @@ self: {
        pname = "zoom-refs";
        version = "0.0.0.0";
        sha256 = "0pbnwgsfl4rgmgsq30snki34xh9iaky01jnxycppf0h93mbdv01p";
-       buildDepends = [ base lens stm ];
+       libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142807,12 +146330,12 @@ self: {
      mkDerivation {
        pname = "zot";
        version = "0.0.2";
-       revision = "1";
        sha256 = "12wgkrlvhby0gy6kngjwyx468yarpgkiwy51v6zb8jhx79mhidq3";
+       revision = "1";
        editedCabalFile = "325ccedb3426935b4a56f838f3d05fc914b72729a2b80d6c804bec5657593a40";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base monads-tf ];
+       executableHaskellDepends = [ base monads-tf ];
        description = "Zot language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142826,7 +146349,7 @@ self: {
        sha256 = "04d812dcvkbjg2y0q4q855r6g9nr2k54k2jhnbksbpnxkz0cmaxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath mtl ];
+       executableHaskellDepends = [ base directory filepath mtl ];
        homepage = "https://github.com/MasseR/zsh-battery";
        description = "Ascii bars representing battery status";
        license = stdenv.lib.licenses.bsd3;
@@ -142843,7 +146366,7 @@ self: {
        sha256 = "11x6whwyfgdgda5bhdck0k12inzix8cjfm42hh09p703nalk07nq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers filepath hinotify old-locale process
          regex-compat time unix
        ];
diff --git a/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch b/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch
deleted file mode 100644
index c3df98043b3..00000000000
--- a/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 24e6f45408083745080ff2f3710f58209041113c Mon Sep 17 00:00:00 2001
-From: Luite Stegeman <stegeman@gmail.com>
-Date: Sun, 28 Dec 2014 21:33:22 +0100
-Subject: [PATCH] updates for GHC 7.10 and Template Haskell 2.10
-
----
- haskell-src-meta.cabal                        | 4 ++--
- src/Language/Haskell/Meta/Syntax/Translate.hs | 6 ++++++
- src/Language/Haskell/Meta/Utils.hs            | 5 ++++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs
-index 189d32e..36a08f1 100644
---- a/src/Language/Haskell/Meta/Syntax/Translate.hs
-+++ b/src/Language/Haskell/Meta/Syntax/Translate.hs
-@@ -384,9 +384,15 @@ a .->. b = AppT (AppT ArrowT a) b
- toCxt :: Hs.Context -> Cxt
- toCxt = fmap toPred
-  where
-+#if MIN_VERSION_template_haskell(2,10,0)
-+  toPred (Hs.ClassA n ts) = foldl' AppT (ConT (toName n)) (fmap toType ts)
-+  toPred (Hs.InfixA t1 n t2) = foldl' AppT (ConT (toName n)) (fmap toType [t1,t2])
-+  toPred (Hs.EqualP t1 t2) = foldl' AppT EqualityT (fmap toType [t1,t2])
-+#else
-   toPred (Hs.ClassA n ts) = ClassP (toName n) (fmap toType ts)
-   toPred (Hs.InfixA t1 n t2) = ClassP (toName n) (fmap toType [t1, t2])
-   toPred (Hs.EqualP t1 t2) = EqualP (toType t1) (toType t2)
-+#endif
-   toPred a@Hs.IParam{} = noTH "toCxt" a
- 
- foldAppT :: Type -> [Type] -> Type
-diff --git a/src/Language/Haskell/Meta/Utils.hs b/src/Language/Haskell/Meta/Utils.hs
-index 36f7e96..d194f3e 100644
---- a/src/Language/Haskell/Meta/Utils.hs
-+++ b/src/Language/Haskell/Meta/Utils.hs
-@@ -166,6 +166,9 @@ renameT env new (ForallT ns cxt t) =
-     unVarT (VarT n) = PlainTV n
-     renamePreds = renameThings renamePred
- 
-+#if MIN_VERSION_template_haskell(2,10,0)
-+    renamePred = renameT
-+#else
-     renamePred env new (ClassP n ts) = let
-         (ts', env', new') = renameTs env new [] ts
-       in (ClassP (normaliseName n) ts', env', new')
-@@ -174,7 +177,7 @@ renameT env new (ForallT ns cxt t) =
-         (t1', env1, new1) = renameT env new t1
-         (t2', env2, new2) = renameT env1 new1 t2
-       in (EqualP t1' t2', env2, new2)
--
-+#endif
- 
- -- | Remove qualification, etc.
- normaliseName :: Name -> Name
-
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 9ee12cdde37..526bb5c3248 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -31,6 +31,9 @@ rec {
   addBuildDepend = drv: x: addBuildDepends drv [x];
   addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; });
 
+  addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x];
+  addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.pkgconfigDepends or []) ++ xs; });
+
   enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}";
   disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
 
diff --git a/pkgs/development/haskell-modules/dyre-nix.patch b/pkgs/development/haskell-modules/patches/dyre-nix.patch
similarity index 100%
rename from pkgs/development/haskell-modules/dyre-nix.patch
rename to pkgs/development/haskell-modules/patches/dyre-nix.patch
diff --git a/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
similarity index 100%
rename from pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch
rename to pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
diff --git a/pkgs/development/haskell-modules/ghc-paths-nix.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch
similarity index 100%
rename from pkgs/development/haskell-modules/ghc-paths-nix.patch
rename to pkgs/development/haskell-modules/patches/ghc-paths-nix.patch
diff --git a/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
similarity index 100%
rename from pkgs/development/haskell-modules/graphviz-fix-ghc710.patch
rename to pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
diff --git a/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch b/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch
new file mode 100644
index 00000000000..ef349b1cb64
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch
@@ -0,0 +1,21 @@
+--- regex-tdfa-text-1.0.0.2/Text/Regex/TDFA/Text/Lazy.orig.hs	2015-08-05 20:30:01.228983428 +0100
++++ regex-tdfa-text-1.0.0.2/Text/Regex/TDFA/Text/Lazy.hs	2015-08-05 20:39:25.682563005 +0100
+@@ -26,7 +26,7 @@
+ import Data.Array.IArray((!),elems,amap)
+ import qualified Data.Text.Lazy as L(Text,empty,take,drop,uncons,unpack)
+
+-import Text.Regex.Base(MatchArray,RegexContext(..),Extract(..),RegexMaker(..),RegexLike(..))
++import Text.Regex.Base(MatchText,MatchArray,RegexContext(..),Extract(..),RegexMaker(..),RegexLike(..))
+ import Text.Regex.Base.Impl(polymatch,polymatchM)
+ import Text.Regex.TDFA.ReadRegex(parseRegex)
+ import Text.Regex.TDFA.String() -- piggyback on RegexMaker for String
+@@ -74,7 +74,8 @@
+                ,after (o+l) source))
+          (matchOnce regex source)
+   matchAllText regex source =
+-    let go i _ _ | i `seq` False = undefined
++    let go :: Int -> L.Text -> [MatchArray] -> [MatchText L.Text]
++        go i _ _ | i `seq` False = undefined
+         go _i _t [] = []
+         go i t (x:xs) =
+           let (off0,len0) = x!0
diff --git a/pkgs/development/haskell-modules/xmonad-nix.patch b/pkgs/development/haskell-modules/patches/xmonad-nix.patch
similarity index 100%
rename from pkgs/development/haskell-modules/xmonad-nix.patch
rename to pkgs/development/haskell-modules/patches/xmonad-nix.patch
diff --git a/pkgs/development/haskell-modules/wxc-no-ldconfig.patch b/pkgs/development/haskell-modules/wxc-no-ldconfig.patch
deleted file mode 100644
index 72a8648cab6..00000000000
--- a/pkgs/development/haskell-modules/wxc-no-ldconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Only in wxc-0.91.0.0: dist
-diff -ubr wxc-0.91.0.0-orig/Setup.hs wxc-0.91.0.0/Setup.hs
---- wxc-0.91.0.0-orig/Setup.hs	2014-10-31 13:30:15.514809137 +0100
-+++ wxc-0.91.0.0/Setup.hs	2014-10-31 13:33:53.606372005 +0100
-@@ -507,5 +507,3 @@
-         inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest
- 
-     installOrdinaryFile (verbosity flags) (bld_dir </> lib_name) (inst_lib_dir </> lib_name)
--    ldconfig inst_lib_dir
--
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 290abca5474..e9893dfd1c7 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -39,7 +39,9 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # Tests are currently broken on i686 see
+  # http://hydra.nixos.org/build/24003763/nixlog/1
+  doCheck = if stdenv.isi686 then false else true;
   checkTarget = "test";
 
   installPhase = ''
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 011e4ecd48e..dbea97a0271 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -11,10 +11,9 @@ stdenv.mkDerivation rec {
   patches = [
     # ToDo: there might be more impurities than FMA support check
     ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
-
     (fetchpatch {
       name = "bug-39055.patch";
-      url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d0377";
+      url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
       sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
     })
   ];
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 2510e3b8621..b441719d31c 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-oss";
 
+  postInstall = ''
+    for f in $out/lib/*.la; do
+      sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $f
+    done
+  '';
+
   passthru = {
     gtkModule = "/lib/gtk-2.0/";
   };
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 6eca14767c5..94b483e1f5d 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, udev }:
+{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
 
-let version = "2.2.0"; in
+let version = "3.0.1"; in
 
 stdenv.mkDerivation {
   name = "libcec-${version}";
 
   src = fetchurl {
-    url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}-repack.tar.gz";
-    sha256 = "1kdfak8y96v14d5vp2apkjjs0fvvim9phc0nkhlq5pjlagk8v32x";
+    url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
+    sha256 = "0gi5gq8pz6vfdx80pimx23d5g243zzgmc7s8wpb686csjk470dky";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig udev ];
+  buildInputs = [ cmake pkgconfig udev libcec_platform ];
+
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ];
 
   # Fix dlopen path
   patchPhase = ''
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
new file mode 100644
index 00000000000..6db2656c9f4
--- /dev/null
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake }:
+
+let version = "1.0.10"; in
+
+stdenv.mkDerivation {
+  name = "libcec-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Pulse-Eight/platform/archive/${version}.tar.gz";
+    sha256 = "1kdmi9b62nky4jrb5519ddnw5n7s7m6qyj7rzhg399f0n6f278vb";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Platform library for libcec and Kodi addons";
+    homepage = "https://github.com/Pulse-Eight/platform";
+    repositories.git = "https://github.com/Pulse-Eight/libcec.git";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.titanous ];
+  };
+}
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 2a523793559..3071aa3fdfc 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -3,11 +3,11 @@
 assert !(stdenv ? cross) -> zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.52";
+  name = "libpng-1.2.53";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "1h0fa67x4bh7gcdh7qx87m4xpkdfqa7ihd4h678dcyh52jzhzyyl";
+    sha256 = "02jwfqk1ahqfvbs9gdyb5v0123by9ws6m7jnfvainig7i7v4jpml";
   };
 
   propagatedBuildInputs = [ zlib ];
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 17820fa8188..53777a0c56f 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, zlib, apngSupport ? false }:
+{ stdenv, fetchurl, zlib, apngSupport ? true }:
 
 assert zlib != null;
 
 let
-  version = "1.6.16";
-  sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2";
+  version = "1.6.18";
+  sha256 = "0qq96rf31483kxz32h6l6921hy6p2v2pfqfvc74km229g4xw241f";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
-    sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh";
+    sha256 = "0g2ljh2vhclas1hacys1c4gk6l6hyy6sngb2yvdsnjz50nyq16kv";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index c304b9e6930..753577a2918 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,16 +1,48 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, icu, libxslt, pkgconfig }:
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc
+, icu, libxslt, pkgconfig }:
 
-let version = "0.7.1"; in
-stdenv.mkDerivation rec {
+let
+
+  version = "${libVersion}-list-${listVersion}";
+
+  listVersion = "2015-08-03";
+  listArchive = let
+    rev = "447962d71bf512fe41e828afc7fa66a1701c7c3c";
+  in fetchurl {
+    sha256 = "0gp0cb6p8yvyy5kvgdwg45ian9rb07bb0a9ibdj58g21l54mx3r2";
+    url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}";
+  };
+
+  libVersion = "0.8.0";
+
+in stdenv.mkDerivation {
   name = "libpsl-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0hbsidbmwgpg0h48wh2pzsq59j8az7naz3s5q3yqn99yyjji2vgw";
-    rev = name;
+    sha256 = "0mjnj36igk6w3c0d4k2fqqg1kl6bpnxfrcgcgz1zdw33gfa5gdi7";
+    rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";
   };
 
+  buildInputs = [ icu libxslt ];
+  nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig ];
+
+  preAutoreconf = ''
+    mkdir m4
+    gtkdocize
+  '';
+
+  preConfigure = ''
+    # The libpsl check phase requires the list's test scripts (tests/) as well
+    tar --directory=list --strip-components=1 -xf "${listArchive}"
+  '';
+  configureFlags = "--disable-static --enable-gtk-doc --enable-man";
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
   meta = with stdenv.lib; {
     inherit version;
     description = "C library for the Publix Suffix List";
@@ -26,13 +58,4 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ nckx ];
   };
-
-  buildInputs = [ icu libxslt ];
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
-  configureFlags = "--disable-static --enable-man";
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
 }
diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
new file mode 100644
index 00000000000..a81d5a686bc
--- /dev/null
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, cmake, perl }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "libtap-${version}";
+  version = "1.12.0";
+
+  src = fetchurl {
+    url = "http://web-cpan.shlomifish.org/downloads/${name}.tar.bz2";
+    sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ cmake perl ];
+
+  meta = {
+    description = "A library to implement a test protocol";
+    longDescription = ''
+      libtap is a library to implement the Test Anything Protocol for
+      C originally created by Nik Clayton. This is a maintenance
+      branch by Shlomi Fish.
+    '';
+    homepage = "http://www.shlomifish.org/open-source/projects/libtap/";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 8c7301e3c40..26d412e5a8c 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
     qmake qscintilla.pro
   '';
 
-  # TODO PyQt Support.
-
   meta = {
     description = "A Qt port of the Scintilla text editing library";
     longDescription = ''
diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix
index 6a039313f0e..41b397a51e7 100644
--- a/pkgs/development/pure-modules/octave/default.nix
+++ b/pkgs/development/pure-modules/octave/default.nix
@@ -21,5 +21,8 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ asppsa ];
+
+    # See https://bitbucket.org/purelang/pure-lang/issues/38
+    broken = true;
   };
 }
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 60fad74cbfe..2501cd9662b 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -21,12 +21,12 @@ AffyExpress = derive { name="AffyExpress"; version="1.35.0"; sha256="1ysn3c8mpnq
 AffyRNADegradation = derive { name="AffyRNADegradation"; version="1.15.0"; sha256="0x7mwlzvcxplvijprch0anwbfmj1qkrxqd9rc6f4p0zf88z2csal"; depends=[affy]; };
 AffyTiling = derive { name="AffyTiling"; version="1.27.0"; sha256="1jqil9hd10cwsqdlxjd7c8s0p9fvrfcqxiw8rfrq117c8dlgl7w6"; depends=[affxparser affy preprocessCore]; };
 AgiMicroRna = derive { name="AgiMicroRna"; version="2.19.0"; sha256="1m1fi6pdqwnfn21a4i7psxdg12bn6bhvcsi43bhwlzxzkrz00257"; depends=[affy affycoretools Biobase limma preprocessCore]; };
-AllelicImbalance = derive { name="AllelicImbalance"; version="1.7.17"; sha256="0fgqsdlnch5rh04pnzjypgba2n67j3m2aab2yddl0kf0wsmb8zwg"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
-AnalysisPageServer = derive { name="AnalysisPageServer"; version="1.1.2"; sha256="057xik4hxaqz1f9m8clq504xa4km2byag546iw20v6i0qa9s1dwi"; depends=[Biobase graph log4r rjson]; };
+AllelicImbalance = derive { name="AllelicImbalance"; version="1.7.19"; sha256="09kjl7rka00vqysg13naqqcks5mjygg45yb6z6k1qmbc7xd19ggl"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
+AnalysisPageServer = derive { name="AnalysisPageServer"; version="1.1.3"; sha256="1k07v1flb7zvni6gmmpjrwl5hrs7adfhcjcg58vqj0b3nbij7aa0"; depends=[Biobase graph log4r rjson]; };
 AnnotationDbi = derive { name="AnnotationDbi"; version="1.31.17"; sha256="04xkhqnr9hmgxihfhn35a6s68s8x5layl7mf5whwhwxmlcd76lx4"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
-AnnotationForge = derive { name="AnnotationForge"; version="1.11.7"; sha256="00agvwzmnvs8vx2y62x5qd9y09045j74kk9kp69v8m1iqpigs1v0"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors]; };
+AnnotationForge = derive { name="AnnotationForge"; version="1.11.15"; sha256="02z3kxqcn87ykdsxfzs9j0qzpjkb2k79sz89lxrggk24jxk0rr35"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors]; };
 AnnotationFuncs = derive { name="AnnotationFuncs"; version="1.19.0"; sha256="1qjvkbqpyhwibdqv1c4n2z5wjnzx0h3kdas3fs33jhb597bxhl1y"; depends=[AnnotationDbi]; };
-AnnotationHub = derive { name="AnnotationHub"; version="2.1.28"; sha256="055biw0izf0la405igpp22azgharwhr6xfks32lr4dgbh8n70qjd"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
+AnnotationHub = derive { name="AnnotationHub"; version="2.1.32"; sha256="1a8hxbj97fhg64zxfhwk107ih8y4zgq48yx6xgpzm2pdsx5x9ndx"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
 ArrayExpress = derive { name="ArrayExpress"; version="1.29.1"; sha256="0gyckxsmmh81ykf7mj952h2a4z58xrf9lbnmv884hz7zj317lf83"; depends=[affy Biobase limma XML]; };
 ArrayExpressHTS = derive { name="ArrayExpressHTS"; version="1.19.0"; sha256="0qyd9jhkvw4lxqjvix28yzdx08hi7vf77ynlqxcl2q1lb3gmbxar"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
 ArrayTV = derive { name="ArrayTV"; version="1.7.0"; sha256="11dlq4lmzw0x8z2qrxff6xlcilp95nd71jpdvg3i5yni3ws6z5m1"; depends=[DNAcopy foreach oligoClasses]; };
@@ -41,14 +41,14 @@ BEclear = derive { name="BEclear"; version="1.1.0"; sha256="1icaxkxwr2rkii4fffln
 BGmix = derive { name="BGmix"; version="1.29.0"; sha256="0s2s6ylbw2wvdkn28842ghsflhcmcn156zw3fxmbdnz7xs29qs1f"; depends=[KernSmooth]; };
 BHC = derive { name="BHC"; version="1.21.0"; sha256="0f8qqid4qxw52zjvvm024wcmn0afr7avkr4hr2jfyvs0ga49khx8"; depends=[]; };
 BRAIN = derive { name="BRAIN"; version="1.15.0"; sha256="09yd3xf3h85wdf56p38mnspyqbswl2v8zb81yg0a008p0l5ax8xr"; depends=[Biostrings lattice PolynomF]; };
-BSgenome = derive { name="BSgenome"; version="1.37.3"; sha256="1a0qk3lh2qhynsink8ysc16d4pmam2midakh26adn1hqrf6n22gb"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
+BSgenome = derive { name="BSgenome"; version="1.37.4"; sha256="09vwkl517nnq9krxwyaf70xaqnk3r3ddxdd834pwrhyij7r49sqr"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
 BUS = derive { name="BUS"; version="1.25.0"; sha256="1n3s0pw4ijgh927mahwqybks8i6ysybp7xn4a86nrbpr2kqhznrd"; depends=[infotheo minet]; };
 BaseSpaceR = derive { name="BaseSpaceR"; version="1.13.2"; sha256="17g87vfx6yy4cdqxchl9ig6s2vhnpfbarssw80ha6kbqw81jh55h"; depends=[RCurl RJSONIO]; };
 Basic4Cseq = derive { name="Basic4Cseq"; version="1.5.1"; sha256="0a4b11rv5ilv84qqpvf320c3knaajg4hlby5km0zzms3vbisr4hi"; depends=[Biostrings caTools GenomicAlignments GenomicRanges RCircos]; };
 BayesPeak = derive { name="BayesPeak"; version="1.21.0"; sha256="0mz00mk6gmc5g79iifn5hzfwf7s568n6s6wy46vrnnnnr3sk9w49"; depends=[IRanges]; };
 BeadDataPackR = derive { name="BeadDataPackR"; version="1.21.1"; sha256="16dh7byvigd6161qznd1k9cz9hp0r50nbrd8nqlsh28zr60pvrj3"; depends=[]; };
 BiGGR = derive { name="BiGGR"; version="1.5.0"; sha256="1q9m870pyhxd1627n94c259094k8jyrg22ni26qpnxkapj18lr0b"; depends=[hyperdraw hypergraph LIM rsbml stringr]; };
-BiRewire = derive { name="BiRewire"; version="2.1.2"; sha256="08innw83yr3imrgklva9djjx3a5sd7mqfnb70ggi6hia729kar01"; depends=[igraph slam]; };
+BiRewire = derive { name="BiRewire"; version="2.3.6"; sha256="1i2fn3lfc93gxy3llc6wwviq7pn3d3na556i2fl538ia66asm2ax"; depends=[igraph slam tsne]; };
 BiSeq = derive { name="BiSeq"; version="1.9.2"; sha256="1z401p2y9sa2cs1zwnkvf3968nyv5c7wcbxvldjyl5dg04qw88wn"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
 BicARE = derive { name="BicARE"; version="1.27.0"; sha256="19hslc78nijcs6gyxzzcd8856wa1gf5dsrvm4x6r9lprfrk7d7fb"; depends=[Biobase GSEABase multtest]; };
 BioMVCClass = derive { name="BioMVCClass"; version="1.37.0"; sha256="1k4ba98cjaqhy33vsmflnwasi0vxr30dvj6861pz625m87fyp2g6"; depends=[Biobase graph MVCClass Rgraphviz]; };
@@ -57,10 +57,10 @@ BioSeqClass = derive { name="BioSeqClass"; version="1.27.0"; sha256="1pv7zibcrgb
 Biobase = derive { name="Biobase"; version="2.29.1"; sha256="12cckssh7x4dd8vaapp5nfc5bfcqls8k3rblcfi17z5cpi0jply6"; depends=[BiocGenerics]; };
 BiocCaseStudies = derive { name="BiocCaseStudies"; version="1.31.0"; sha256="05nj9i9y8clf406bjcflj8lsrp9x9iw6my1bdqnxg3nv2krp37xn"; depends=[Biobase]; };
 BiocCheck = derive { name="BiocCheck"; version="1.5.6"; sha256="0gpmrqvj31n73bqljf23wbsw3hp44hl3z1jhc2q86s3mw6hlcfip"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; };
-BiocGenerics = derive { name="BiocGenerics"; version="0.15.3"; sha256="1wk7mr3jmjr2ljqqlmnpvb3x2cflkkhsyjl2cd4ns0gld4rmmm8x"; depends=[]; };
-BiocInstaller = derive { name="BiocInstaller"; version="1.19.8"; sha256="1jmzvs3sv324n9j6j8mrjpc648650k0sv23xni09x55zq41nm672"; depends=[]; };
-BiocParallel = derive { name="BiocParallel"; version="1.3.31"; sha256="0s47gbrj8cs8wpsac14nj2blqwwr2fkg8fsr61fz5v0j21wrk3kd"; depends=[futile_logger snow]; };
-BiocStyle = derive { name="BiocStyle"; version="1.7.4"; sha256="0wlydy1a3pspnyjg5vl0657z620n5vlhx99hxisskbrsr026mhmg"; depends=[]; };
+BiocGenerics = derive { name="BiocGenerics"; version="0.15.5"; sha256="0l8gqzqqnxx99ziamclsf4krmlyrq6fjzifh19xg7wqiyp59h41x"; depends=[]; };
+BiocInstaller = derive { name="BiocInstaller"; version="1.19.9"; sha256="14z4wgvry2mbbv847mlns6ff0irwfpyk1yfcxbr27wmlisk14wxz"; depends=[]; };
+BiocParallel = derive { name="BiocParallel"; version="1.3.47"; sha256="0y3nv2ff8r2mijhljrgkky6b1vyb22iywbq38rv1ac6kbbpf680p"; depends=[futile_logger snow]; };
+BiocStyle = derive { name="BiocStyle"; version="1.7.6"; sha256="1bdsz8s74wfgbq6afihi40ra1kljf8w8vxrgna34aks49908rxnd"; depends=[]; };
 Biostrings = derive { name="Biostrings"; version="2.37.2"; sha256="0j6701qgrnphsy9p34sf3s6d91j1zbd824zwv9rsfdmdffbkqq3b"; depends=[BiocGenerics IRanges S4Vectors XVector zlibbioc]; };
 BitSeq = derive { name="BitSeq"; version="1.13.0"; sha256="1d397bcdyi3d35l1q1661spm3xhr7hqlsrjr5a2ybsjs3wqkf4fj"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
 BrainStars = derive { name="BrainStars"; version="1.13.0"; sha256="07wygi0fw0ilg404gx1ifswr61w6qlg8j0vkmnsr0migm70rgzzg"; depends=[Biobase RCurl RJSONIO]; };
@@ -73,7 +73,7 @@ BufferedMatrixMethods = derive { name="BufferedMatrixMethods"; version="1.33.0";
 CAFE = derive { name="CAFE"; version="1.5.0"; sha256="1kzy0g0kwvzvlls316cpvwrvnv5m9vklzjjsiiykvfq1wd21s96f"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
 CAGEr = derive { name="CAGEr"; version="1.11.0"; sha256="1rz1r55aji1av70c661d7czwipxah9507h5i9hcngy84ic1m72f1"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; };
 CALIB = derive { name="CALIB"; version="1.35.0"; sha256="08fgzq80ws4i6i1ppbqxdq3ba9qfdv4h0dyi08f9k91kfh1y31x4"; depends=[limma]; };
-CAMERA = derive { name="CAMERA"; version="1.25.0"; sha256="1nl5va3f436vwpcirhcpcph13s2vbh8965v8iizi29vk83gbyfza"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
+CAMERA = derive { name="CAMERA"; version="1.25.1"; sha256="0g8w5g6kr1s039cyvxk3pkw1mbskrij2vlc657bbxvs6pb3h2mrm"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
 CAnD = derive { name="CAnD"; version="1.1.1"; sha256="1zyp4z86fda83wdhjfdh1ck9ynvdvrrxcvdlgld7h4x295r35r3s"; depends=[ggplot2 reshape]; };
 CFAssay = derive { name="CFAssay"; version="1.3.0"; sha256="04zgyvm0rrs780z1vn4zzrh3w01lnhaywyn5ar6dvxcyxnr2y3qs"; depends=[]; };
 CGEN = derive { name="CGEN"; version="3.3.0"; sha256="03sdyw6z5xw9ndwkwdli7bz6v0ki8w2slx30v5lgm31lqgl4lpf6"; depends=[mvtnorm survival]; };
@@ -97,7 +97,7 @@ COHCAP = derive { name="COHCAP"; version="1.7.0"; sha256="0clr1jh4jnq54phsnl90zf
 COMPASS = derive { name="COMPASS"; version="1.7.2"; sha256="0c83fsrmi7d2888pa3lnln42mlbnjgvpxw337vdh3dar1185a5b0"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; };
 CORREP = derive { name="CORREP"; version="1.35.0"; sha256="0hlij2ch8r3lv130hvyshb82lfqz2c7kr56bka1ghmg6jp0xf1n6"; depends=[e1071]; };
 COSNet = derive { name="COSNet"; version="1.3.3"; sha256="0l9sn0cki0mxacxv0bwp3cczcl8rscx8g3lnr0r448f13j8198f4"; depends=[]; };
-CRISPRseek = derive { name="CRISPRseek"; version="1.9.2"; sha256="1h004gznxrm2k3l4xdr6iyn97rkkh8n85phskiink815ysm2l9z4"; depends=[BiocGenerics Biostrings BSgenome seqinr]; };
+CRISPRseek = derive { name="CRISPRseek"; version="1.9.7"; sha256="164f12s8arg1460fcsaa9l3igav4vjn4niwwpxaj19i4iar1f3pw"; depends=[BiocGenerics Biostrings BSgenome seqinr]; };
 CRImage = derive { name="CRImage"; version="1.17.0"; sha256="1sab95gngwi7c333n9hnbd9fdvdy9i69pjpx5ic5799s7qr03llw"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
 CSAR = derive { name="CSAR"; version="1.21.0"; sha256="1wn7zxmy5ssj2jkk2624j42yv67wdcigp5ksb6fc2kzpgnvqmxl1"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
 CSSP = derive { name="CSSP"; version="1.7.0"; sha256="1ydxj358sfaygzjvh0b042p7gymjyl7nr5cnxrh8c7x2mv2hdh4d"; depends=[]; };
@@ -111,7 +111,7 @@ ChAMP = derive { name="ChAMP"; version="1.7.0"; sha256="0ll50qyq9k8x4bv30dap6g6l
 ChIPQC = derive { name="ChIPQC"; version="1.5.2"; sha256="0g630lpzwfbg5hgicg0s906a3a6gidswmidszx0hmn3479fah74m"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors]; };
 ChIPXpress = derive { name="ChIPXpress"; version="1.11.0"; sha256="11aifr69ss1hakrhba985bwz6k1sqkpzvv7gnzn8cgqnzxyr2i6b"; depends=[affy biganalytics bigmemory Biobase frma GEOquery]; };
 ChIPpeakAnno = derive { name="ChIPpeakAnno"; version="3.3.2"; sha256="0ww3ddnvdc561lhz27h8n3ywi1xpx1cbsqk2i8m5rkpykkkkr2dh"; depends=[AnnotationDbi BiocGenerics BiocInstaller biomaRt Biostrings BSgenome GenomicFeatures GenomicRanges graph IRanges limma multtest RBGL VennDiagram]; };
-ChIPseeker = derive { name="ChIPseeker"; version="1.5.6"; sha256="0ppv51hd44h15mkw15samdq1awsh1kdfy5p87pj60nmvbl0qj39h"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors]; };
+ChIPseeker = derive { name="ChIPseeker"; version="1.5.8"; sha256="14prgyzrhh5r6mmrf88my8a0r3n6m45rx2ik0ajlz76avjpzdawr"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors UpSetR]; };
 ChIPseqR = derive { name="ChIPseqR"; version="1.23.2"; sha256="1k1vbck7kjyzzgm0hg8hxpq6zfg71rca76q3998fcnnlzsmgvcf4"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
 ChIPsim = derive { name="ChIPsim"; version="1.23.1"; sha256="13kniwvwa49n1kc9114ljn1fmzaiyb2nh33if596llql60p7nd23"; depends=[Biostrings IRanges ShortRead XVector]; };
 ChemmineOB = derive { name="ChemmineOB"; version="1.7.1"; sha256="04agfsdzccsvvvis6vy1gg83gfs4nrph950v6bbzgk15ki32rsjz"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
@@ -124,13 +124,13 @@ CoCiteStats = derive { name="CoCiteStats"; version="1.41.0"; sha256="0shp06qy8cv
 CoGAPS = derive { name="CoGAPS"; version="2.3.2"; sha256="0jh5ij66x3isz67mj0jwypyshplk1l1p47n2hvwgq87xmjzv6c8p"; depends=[BH gplots RColorBrewer Rcpp]; };
 CoRegNet = derive { name="CoRegNet"; version="1.5.0"; sha256="14yq1f005fcfmfp88h2fy05gdgbskjws11qbdh0ndx3sf93nzxm2"; depends=[arules igraph shiny]; };
 CompGO = derive { name="CompGO"; version="1.5.0"; sha256="128ib7w0jxba0p32s796i864b73zjfxac56znd0v4wv4vxv3jiv6"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer]; };
-ComplexHeatmap = derive { name="ComplexHeatmap"; version="1.2.2"; sha256="0v1mj0n5gjdarwdrl9ir9gms0f3v0gplx4n34zvyszxivh4ph4jj"; depends=[circlize colorspace dendextend GetoptLong RColorBrewer]; };
+ComplexHeatmap = derive { name="ComplexHeatmap"; version="1.2.6"; sha256="0n0bn69ms6ny42i0rvajhvrwivxd21spgk9s9xzqbln7758fvnw2"; depends=[circlize colorspace dendextend GetoptLong RColorBrewer]; };
 ConsensusClusterPlus = derive { name="ConsensusClusterPlus"; version="1.23.0"; sha256="13iikfh234d2z4k487lb3shmnrfijygrf6gz3x481gba2psnbjyw"; depends=[Biobase cluster]; };
 CopyNumber450k = derive { name="CopyNumber450k"; version="1.5.0"; sha256="0mjhmh4shgckv43zvg4yqr17jfi9p9xnc40fwy9fw9c4vjcfsvsj"; depends=[Biobase BiocGenerics DNAcopy minfi preprocessCore]; };
-CopywriteR = derive { name="CopywriteR"; version="2.1.2"; sha256="0lja77qdfbsl9cc1nv4jbrjwiq8bb93ja6na8hqksrrm9g1qs4q4"; depends=[BiocParallel chipseq data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
+CopywriteR = derive { name="CopywriteR"; version="2.1.3"; sha256="0qhl3lbdf9fsm6hx45sk2nihikbzh08lbnwaz1as3wf5cx7zm08c"; depends=[BiocParallel chipseq data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
 CorMut = derive { name="CorMut"; version="1.11.0"; sha256="0s92bh3610frxbm0gqvlznay70dy7x61hvc0qgh6xmcyz0llx27g"; depends=[igraph seqinr]; };
 Cormotif = derive { name="Cormotif"; version="1.15.0"; sha256="1v36ylwkxr6yqasckmmj2dkr7s72f39srhwvm93rs1rl7kw4dc4p"; depends=[affy limma]; };
-CoverageView = derive { name="CoverageView"; version="1.5.1"; sha256="0qi8r6vw5c6kmlw12j81jmgn555wd51w80m80gm5n7hqnggpwkh4"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
+CoverageView = derive { name="CoverageView"; version="1.5.2"; sha256="1bxx35h9d7gwm5m16i4hkf54zghij95jfxxc46x83glccsirah2f"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
 DART = derive { name="DART"; version="1.17.1"; sha256="1z7lf4d9yjcyikq9j3348z5sxjqaly46c0ls7f9cl8nnqdpw7w42"; depends=[igraph]; };
 DASiR = derive { name="DASiR"; version="1.9.0"; sha256="0b3b7kmhsd6bb1s57c89h495j1ax6779wfca112fq6ba3z4dih3n"; depends=[Biostrings GenomicRanges IRanges XML]; };
 DAVIDQuery = derive { name="DAVIDQuery"; version="1.29.0"; sha256="0gvm6qjx8y61nbnbz66md74pfc4awj4900pjr8q1m5sip5yzbxj2"; depends=[RCurl]; };
@@ -138,20 +138,21 @@ DBChIP = derive { name="DBChIP"; version="1.13.0"; sha256="0gk9kgmyp9540sq5gpbn7
 DECIPHER = derive { name="DECIPHER"; version="1.15.0"; sha256="1kbdsqvkznzsk4ljy91r5ipndwxb8hhkm46qqkakgr24mia3yvl1"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
 DEDS = derive { name="DEDS"; version="1.43.0"; sha256="1z049ppkrbyp0xjpiygz5i6rbxbv3vvnvspwz2vv77495v7ykj6z"; depends=[]; };
 DEGraph = derive { name="DEGraph"; version="1.21.0"; sha256="17f04qngcx8y4glr5wiryi8fifbla8fxh8nb6wagnrai5x6vhzis"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
-DEGreport = derive { name="DEGreport"; version="1.4.0"; sha256="06l803iy18kkv05b4h46vmzws20c0735m6csfkn2vp3bik8xh4lp"; depends=[coda edgeR ggplot2 Nozzle_R1 plyr quantreg]; };
+DEGreport = derive { name="DEGreport"; version="1.5.0"; sha256="14mrfnmkik74yf5vml03x96brq7qlja2hpvndbffxr5a8ddb7117"; depends=[coda edgeR ggplot2 Nozzle_R1 plyr quantreg]; };
 DEGseq = derive { name="DEGseq"; version="1.23.0"; sha256="0993f140wwv9z9l53f9g74x7l28bflxq7wdcbilfz7ijhh7isr7p"; depends=[qvalue samr]; };
 DESeq = derive { name="DESeq"; version="1.21.0"; sha256="13f6phdf9g325dlpn38l7zrq3mzldhldil134acxi9p3l50bx23y"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
-DESeq2 = derive { name="DESeq2"; version="1.9.21"; sha256="0ywhakri35cz37zlwv760zgmk1z9ldivl0i24mawavccc0hcvrhk"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
-DEXSeq = derive { name="DEXSeq"; version="1.15.9"; sha256="0ml4ibzhw38w0mfp0vdbbkisz40rw65yyd71q3ppj7jg4r4ch39a"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; };
+DESeq2 = derive { name="DESeq2"; version="1.9.26"; sha256="0b7w0csg7q5nqbrmc83rviiwhahq88zlqmxwlkz5g01w9zzkgc80"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
+DEXSeq = derive { name="DEXSeq"; version="1.15.10"; sha256="1sddciia2zxn5jxpzyrg3mxcrl28kcvxfbc6nk5dwrnqd9mj53jj"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; };
 DFP = derive { name="DFP"; version="1.27.0"; sha256="0xcipbhfzvrpbm6dh2y3lbvfbwpn4wly32sssfm702zik5wm9dy1"; depends=[Biobase]; };
 DMRcaller = derive { name="DMRcaller"; version="1.1.1"; sha256="1g7q7cwivvb0m2y4fixvbxp51zfag1jv66bdlai3gawr94pcx56y"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
-DMRcate = derive { name="DMRcate"; version="1.5.0"; sha256="12q6if9lljia37zwhcc9fpcp9vhkp1qhzchpypwwyn2j4344bmp3"; depends=[limma minfi]; };
+DMRcate = derive { name="DMRcate"; version="1.5.61"; sha256="0ss8zk2b1y83q49pv9fdm2rqw5hlnd189knfg1y8y0psfjhc9knp"; depends=[limma minfi]; };
 DMRforPairs = derive { name="DMRforPairs"; version="1.5.0"; sha256="0d14qgx07xq7wa687a2znpfw0zcg8ccvxjawkjdbi6ayjwpb6zd7"; depends=[GenomicRanges Gviz R2HTML]; };
 DNAcopy = derive { name="DNAcopy"; version="1.43.0"; sha256="1v1i4bfkblimdmazv29csqr46jaiv8lncihgywvq5wfn8ccr7xl9"; depends=[]; };
 DOQTL = derive { name="DOQTL"; version="1.3.0"; sha256="0g3nyamqdhjg8105kcq6nsgjgqzcxkp04194j82v1xb31baj53bg"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt corpcor GenomicRanges hwriter IRanges mclust QTLRel Rsamtools RUnit S4Vectors XML]; };
-DOSE = derive { name="DOSE"; version="2.7.9"; sha256="0l0rkd7siz251pxgmfv4ijq1l68w3lkjlc83zmhf4ddjf3db07ig"; depends=[AnnotationDbi ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; };
-DSS = derive { name="DSS"; version="2.7.2"; sha256="01czzgkx6rqpps93vfn8dg2n2hm2nkd887mc955z67845jkrgi2j"; depends=[Biobase bsseq]; };
+DOSE = derive { name="DOSE"; version="2.7.10"; sha256="093gyplk5ylwndynlcvm8s44ra8b6i6xrkqswc7zprndkawc4bgp"; depends=[AnnotationDbi ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; };
+DSS = derive { name="DSS"; version="2.8.1"; sha256="0nhrq05b5rsfdcxc96pdsppnfwz106k7xdxccgr0xjypbhm01hsk"; depends=[Biobase bsseq]; };
 DTA = derive { name="DTA"; version="2.15.0"; sha256="0amibwj5mnm2plkf3ys8sgy4lpwr60fnvika0psdrahgb4blmkzp"; depends=[LSD scatterplot3d]; };
+DeMAND = derive { name="DeMAND"; version="0.99.9"; sha256="013zwa4flbsf9rwlnbzhg1sgfqwvrr01v9bhgpk73kx312zg30sg"; depends=[KernSmooth]; };
 DeconRNASeq = derive { name="DeconRNASeq"; version="1.11.0"; sha256="0665chwpbs2pw753nb2x65cs9r9ghb5123bsrzrv6pz2p3ni8yz7"; depends=[ggplot2 limSolve pcaMethods]; };
 DiffBind = derive { name="DiffBind"; version="1.15.3"; sha256="1akx65vi8razwpfxnvilh4x1vb8qbsfr2q8lygsb3imfrrb83q44"; depends=[amap edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rsamtools SummarizedExperiment systemPipeR zlibbioc]; };
 DirichletMultinomial = derive { name="DirichletMultinomial"; version="1.11.2"; sha256="01wmvs7alq7gy1nmb5gdbglfs51qdhwysbmmjvh7yyhb8dqbvrj4"; depends=[IRanges S4Vectors]; };
@@ -159,8 +160,8 @@ DriverNet = derive { name="DriverNet"; version="1.9.0"; sha256="0visiafw9m7i0yy7
 DrugVsDisease = derive { name="DrugVsDisease"; version="2.9.0"; sha256="1wmw1r0x7kkmp47743aq0pp71wamnf5gsk6bhz6rdvswzb12iyqk"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt GEOquery limma qvalue RUnit xtable]; };
 DupChecker = derive { name="DupChecker"; version="1.7.0"; sha256="02wwwnx3w8rxiassd62xr295paw8py9pqsk1396qb5k773l6bfxv"; depends=[R_utils RCurl]; };
 DynDoc = derive { name="DynDoc"; version="1.47.0"; sha256="0gpmhqav4dx8p86pkh18fpmlki60zqaz00m2zhziiawigbrz41ph"; depends=[]; };
-EBImage = derive { name="EBImage"; version="4.11.5"; sha256="15npg7r76avlxq036yis85b91bgl10y4wjjcdnrcn39dbvb50zav"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
-EBSeq = derive { name="EBSeq"; version="1.9.2"; sha256="0n3y9ikamcfm786fvqp5b2b4g2fx8hvnicsx1sh4rvrpyab9f5jm"; depends=[blockmodeling gplots]; };
+EBImage = derive { name="EBImage"; version="4.11.7"; sha256="1zddydckv3zy8wf0wh34g5yg8s1p255h66ym6lnw3l5id7v32wz8"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
+EBSeq = derive { name="EBSeq"; version="1.9.4"; sha256="01pzjhqx61005jbw3l3m24h10225fkml9889aqvxdxzv5n4rvc03"; depends=[blockmodeling gplots testthat]; };
 EBSeqHMM = derive { name="EBSeqHMM"; version="1.3.1"; sha256="0lyf363f1wfgacrj5cyq8n3f3ssl5q400mn2q94cpai6k0qmvgs1"; depends=[EBSeq]; };
 EBarrays = derive { name="EBarrays"; version="2.33.0"; sha256="1zvfqf49chiks5vmj5ki89pvy14bm1cman47n3ybba1gg8z8mw94"; depends=[Biobase cluster lattice]; };
 EBcoexpress = derive { name="EBcoexpress"; version="1.13.0"; sha256="0fl0a7xasqcwvjlgf3h51akyhwpras2865m2idz1nmacm42q1w79"; depends=[EBarrays mclust minqa]; };
@@ -168,12 +169,12 @@ EDASeq = derive { name="EDASeq"; version="2.3.2"; sha256="0l1mmpy71pqqmqnx4xxn1v
 EDDA = derive { name="EDDA"; version="1.7.0"; sha256="0dyyhnc9v232njqnrcaq78g2m1qws30qcf6bsswq2di235ymk2g0"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
 ELBOW = derive { name="ELBOW"; version="1.5.0"; sha256="0lnc5hw2x4p9yd561w9dwplf7q2slcaghxsh5796bmyxjxhxanpy"; depends=[]; };
 ELMER = derive { name="ELMER"; version="1.00.0"; sha256="1kb7rixq02cc0cwm52acji69p89jq07zsagg7a8qva6gshs94k86"; depends=[GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges minfi reshape S4Vectors]; };
-EMDomics = derive { name="EMDomics"; version="1.1.0"; sha256="1i2dy2vqig0lkd13xy4yfwq58zyjiqavpmcvg6pvkh2l48ap1jds"; depends=[BiocParallel emdist ggplot2 matrixStats]; };
+EMDomics = derive { name="EMDomics"; version="1.1.2"; sha256="14gh59gq0wjhkmrclpmlixn3mbabwwq01bwq6hilf9s2s0i8qkpv"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; };
 ENCODExplorer = derive { name="ENCODExplorer"; version="1.1.3"; sha256="054cm1ldas26gv4xn16w3i25kykwnikj4s83g7sxxdij93m5rmlb"; depends=[jsonlite RSQLite]; };
 ENVISIONQuery = derive { name="ENVISIONQuery"; version="1.17.0"; sha256="1dnlw62hwysij63yc856c2sncgfwdq0rpmcds6i6wigdcfd21w8q"; depends=[rJava XML]; };
-ENmix = derive { name="ENmix"; version="1.1.6"; sha256="069dniqyg0pljbwnl24bv5kfdh5v2j9vbvyxc127ag1isggh9m7b"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; };
+ENmix = derive { name="ENmix"; version="1.1.7"; sha256="0p5ywjnm0xknr6k7bnkhcn69870f5wwlq70yfqiah7syqmyim67d"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; };
 EasyqpcR = derive { name="EasyqpcR"; version="1.11.1"; sha256="0s2jyg6b14wbyl0c1n89c7bi7p88g7s1rz8d830p9hh2x75ly6zj"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
-EnrichmentBrowser = derive { name="EnrichmentBrowser"; version="1.3.0"; sha256="1a6w3drh5x20wvxpx1cb5q2h9k6jh65v9hh81924lcp4baplpx31"; depends=[Biobase graph KEGGgraph KEGGREST limma MASS mixtools neaGUI qvalue RColorBrewer Rgraphviz safe SPIA stringr]; };
+EnrichmentBrowser = derive { name="EnrichmentBrowser"; version="1.99.6"; sha256="17xchpf0ddxihz6p0lm0nhhyrbaahcar1phl842b30ccv877ibrs"; depends=[AnnotationDbi Biobase biocGraph biomaRt ComplexHeatmap DESeq2 EDASeq edgeR geneplotter graph GSEABase hwriter KEGGgraph KEGGREST limma MASS mixtools neaGUI npGSEA PathNet pathview ReportingTools Rgraphviz S4Vectors safe SPIA stringr SummarizedExperiment topGO]; };
 ExiMiR = derive { name="ExiMiR"; version="2.11.0"; sha256="1gmfrn3jq4pz5wmijywhxr0kx79534fhrfnqyhjmqq3s9sjn2cbh"; depends=[affy affyio Biobase limma preprocessCore]; };
 ExpressionView = derive { name="ExpressionView"; version="1.21.0"; sha256="026w9f119j26c1078nwg4rhfc54wlb3i56iy8bi0cjpvbm4p698f"; depends=[AnnotationDbi bitops caTools eisa isa2]; };
 FEM = derive { name="FEM"; version="2.3.0"; sha256="112mmah33ar36cpqjwanrfyhdwjfympnvmxwirxbbnk0nfp9cvpr"; depends=[AnnotationDbi corrplot igraph impute limma marray Matrix]; };
@@ -182,12 +183,12 @@ FISHalyseR = derive { name="FISHalyseR"; version="1.3.0"; sha256="0xnmww7ldyxghq
 FRGEpistasis = derive { name="FRGEpistasis"; version="1.5.0"; sha256="1vvcphgirvghzjvic5yq6nl229ryc0y4kp5qd25kgspbcgblg01q"; depends=[fda MASS]; };
 FlowRepositoryR = derive { name="FlowRepositoryR"; version="1.1.1"; sha256="1xxljbdbvxg1dbm82r86frw2bskmfrl6rv98xz0z4jfc0w4ag3pd"; depends=[RCurl XML]; };
 FlowSOM = derive { name="FlowSOM"; version="1.1.0"; sha256="0k5pw46dbhm6nssr5szj251v3479xgky2iipihrdvp5lr5lhxilq"; depends=[BiocGenerics ConsensusClusterPlus flowCore igraph tsne]; };
-FourCSeq = derive { name="FourCSeq"; version="1.3.4"; sha256="1csxfr23b3g1k54h4ksnhg7c7d6aw28v32lrrqyq7x7xls9cx2lg"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
+FourCSeq = derive { name="FourCSeq"; version="1.3.5"; sha256="1mjvgi1cbfi5brl7l0v8026hjjksh81kpslm6w6i6b1llcn1sf65"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
 FunciSNP = derive { name="FunciSNP"; version="1.11.0"; sha256="19kl14yzqr59ngrd5ygr858zbvx23rihlr4vw5bfdy9cgwlvlzab"; depends=[AnnotationDbi ChIPpeakAnno GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer scales snpStats VariantAnnotation]; };
 GENE_E = derive { name="GENE.E"; version="1.9.0"; sha256="10c9mw9f619z2ai43qvagj7p1lsqpv90z8vzsyyxym614lvlqfzm"; depends=[RCurl rhdf5]; };
 GENESIS = derive { name="GENESIS"; version="1.1.0"; sha256="01d3yc5rc4y22znr7zf980m458qvnmjxpml353k7bkwyz6xyn0fj"; depends=[GWASTools]; };
 GEOmetadb = derive { name="GEOmetadb"; version="1.29.0"; sha256="1s9x3dbh61xisk5hwzqv3991savygdcwv5cww447w4bfgwffzplg"; depends=[GEOquery RSQLite]; };
-GEOquery = derive { name="GEOquery"; version="2.35.4"; sha256="1ny592c1s36a1hkgaqqyss65c190bw5612l23qc9y9qhf4sarq38"; depends=[Biobase RCurl XML]; };
+GEOquery = derive { name="GEOquery"; version="2.35.5"; sha256="0c1jyvl5sm0yjlk4ji8qjwxm4rqakmjz04aq6m8biyf04cdd2crk"; depends=[Biobase RCurl XML]; };
 GEOsubmission = derive { name="GEOsubmission"; version="1.21.0"; sha256="1rr8k4myw7jibibclphj63hp4byk3v0cg37vnyc5b0iacdp8s9gn"; depends=[affy Biobase]; };
 GEWIST = derive { name="GEWIST"; version="1.13.0"; sha256="1mlzyjggv0rh9xk9pifshhdri3vapvzk2h47g75wx57yfapamcwn"; depends=[car]; };
 GGBase = derive { name="GGBase"; version="3.31.2"; sha256="0xbkj7dr7xaq3pj4jph5ii78c4ax5b0p6jqmvkv2hr3j70qk3mh2"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
@@ -201,14 +202,14 @@ GOexpress = derive { name="GOexpress"; version="1.3.2"; sha256="151hqhyjaq3ggigi
 GOstats = derive { name="GOstats"; version="2.35.1"; sha256="1almz6gc2xm3njz8pjvynpnniz7xdd8z5293cfvx91v11lz70v7f"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category graph RBGL]; };
 GOsummaries = derive { name="GOsummaries"; version="2.3.0"; sha256="09c4grz9ljwrz37yv9k6gna9zxk708vxfz2190xz7za0mrql1k3k"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; };
 GRENITS = derive { name="GRENITS"; version="1.21.0"; sha256="1lm0074dw0248vyj9wl99if489dx38ia8wscx61842jyi4qz7r2q"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
-GSAR = derive { name="GSAR"; version="1.3.2"; sha256="0fqv6lwi94ibwjjv6g0qmc8plc0ghszvjpd73m88080jiaw44yfl"; depends=[igraph]; };
+GSAR = derive { name="GSAR"; version="1.3.4"; sha256="1hgakyl4ply01m77ffy2vjflwzn5iqnfbsp4a4smi762innm5f3z"; depends=[igraph]; };
 GSCA = derive { name="GSCA"; version="1.7.0"; sha256="1hv9r59fx1hbjnga26shb8crxji1bzmzjmwfbk1wrlm8dsikjnyg"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
 GSEABase = derive { name="GSEABase"; version="1.31.3"; sha256="1jq3s3pha624gns7d7yf8qqgzq0fm3qgjrkwdkxgbpc7b09baiz0"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
 GSEAlm = derive { name="GSEAlm"; version="1.29.0"; sha256="13ixp6vq9g9ag5rndc40gw64vny70zcj6lll7r7vz06p5i9b6kyk"; depends=[Biobase]; };
 GSRI = derive { name="GSRI"; version="2.17.0"; sha256="158dipqi9mh79d42pv5qsa1gwxz660kl474rdnkd59rnxh7ziyf3"; depends=[Biobase fdrtool genefilter GSEABase les]; };
 GSReg = derive { name="GSReg"; version="1.3.0"; sha256="07s60j68i1r64y8x8r1r9s6w020n41137cf2aj9hrsw6gn4ajh15"; depends=[]; };
 GSVA = derive { name="GSVA"; version="1.17.0"; sha256="0rk1srk95qia5ap69c2lysgv7r8qh50f50v9b569d2v2vjb0hpq5"; depends=[Biobase BiocGenerics GSEABase]; };
-GWASTools = derive { name="GWASTools"; version="1.15.12"; sha256="04k5grfbrcpwnxxpirzb7x9488q8sq19lg00yn4mhpr7y1znrmpc"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf quantsmooth RSQLite sandwich survival]; };
+GWASTools = derive { name="GWASTools"; version="1.15.14"; sha256="1ir5czbs3z9myq8659xc15i61bk0yifwcdycbgzmfd9frf9mw8ji"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf quantsmooth RSQLite sandwich survival]; };
 GeneAnswers = derive { name="GeneAnswers"; version="2.11.1"; sha256="15rf8syxhj3332d7f4jkvyby05r3iia7p1ryz1zv629waz6mr4nh"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
 GeneExpressionSignature = derive { name="GeneExpressionSignature"; version="1.15.0"; sha256="0wni584412af8a2wzk5r8nf63grw86d6fk74cmwksirw2734mmqs"; depends=[Biobase PGSEA]; };
 GeneGA = derive { name="GeneGA"; version="1.19.0"; sha256="0irfr4q55rda8acchgcqsksh6ija87fryj822nb3d4zklv9raqfv"; depends=[hash seqinr]; };
@@ -222,23 +223,23 @@ GeneticsDesign = derive { name="GeneticsDesign"; version="1.37.0"; sha256="08awf
 GeneticsPed = derive { name="GeneticsPed"; version="1.31.0"; sha256="17fs4gvirji3qp9ik480jpz6qrbq209sjhn57ipkaafvx7rw5j4i"; depends=[gdata genetics MASS]; };
 GenoView = derive { name="GenoView"; version="1.3.0"; sha256="09k9xjmx3qmsfr3a4vrfgs73r0xsymf5m4gl0zjjk4cnfk7bs41v"; depends=[biovizBase GenomicRanges ggbio ggplot2 gridExtra]; };
 GenomeGraphs = derive { name="GenomeGraphs"; version="1.29.0"; sha256="0kl2gapg7hnl4zfsamb3vwmj7z0vag7vd8viwh0pwqj0pd45dswa"; depends=[biomaRt]; };
-GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.5.8"; sha256="0kdz1mkn3ljwxcz6v0np7gbb7b7sqxfj80sxrah3bnck2bzg1yra"; depends=[BiocGenerics IRanges S4Vectors]; };
-GenomicAlignments = derive { name="GenomicAlignments"; version="1.5.11"; sha256="1w4wmxcyj0ja9nkn35n5qhhax0b7sh4pjxk2hib71323y80mxlld"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
-GenomicFeatures = derive { name="GenomicFeatures"; version="1.21.13"; sha256="1swk94rqpvfysr3x1r61ypq9vlw1ryc0iw0x6dazfjjchaln0h07"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors]; };
+GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.5.9"; sha256="1mnskpj4qb6fyg7a6qkzs6cmxzn0bjff0zzgnp17bm94vx0334zh"; depends=[BiocGenerics IRanges S4Vectors]; };
+GenomicAlignments = derive { name="GenomicAlignments"; version="1.5.12"; sha256="0p1vnkh5h8w69is254zkzpj5y2a9c2yc2s7lvqhkf861x6fgkz1l"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+GenomicFeatures = derive { name="GenomicFeatures"; version="1.21.14"; sha256="0lnkidki4pl40878nd6bzswkdxgkz75nn052693glcvzw3qm6wg5"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors]; };
 GenomicFiles = derive { name="GenomicFiles"; version="1.5.4"; sha256="13lglgxkqsxgi453dk56ry7amnv6lyddy74fnhhsqinj5ip9k3vw"; depends=[BiocGenerics BiocParallel GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-GenomicInteractions = derive { name="GenomicInteractions"; version="1.3.4"; sha256="1dh9l0abwfc9dkznvpnzsxlggifvh8zfcmb22mc36lnkq42r033d"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra igraph IRanges plotrix Rsamtools rtracklayer S4Vectors stringr]; };
-GenomicRanges = derive { name="GenomicRanges"; version="1.21.16"; sha256="11s14ikk2pj3hycanyjv6s1pild3987gfvf4vnzm6a6ilmqsyqzy"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
+GenomicInteractions = derive { name="GenomicInteractions"; version="1.3.6"; sha256="0003hd22c3nfdb5h84pvd754gcpj3b6flzg8nhf7d0s99nzddr6a"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph IRanges Rsamtools rtracklayer S4Vectors stringr]; };
+GenomicRanges = derive { name="GenomicRanges"; version="1.21.17"; sha256="1hp2knf1qnph62480hzmn68lxp193x4zv3b0yx2a7khj4sgy7566"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
 GenomicTuples = derive { name="GenomicTuples"; version="1.3.1"; sha256="0i91qs1c84lyh0irhgnbnnvag0j3f48gfxxndk5x0yjf9kpa0hca"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
 Genominator = derive { name="Genominator"; version="1.23.0"; sha256="03pacbd3d5q7ykrflg258zcf8yfzm8kc976aw3d38q7agkia69h2"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
 GlobalAncova = derive { name="GlobalAncova"; version="3.37.0"; sha256="1j35r39plsxlkla2bv7wvg0if5gs2mfy71g6zb65g6ml5cqws45r"; depends=[annotate AnnotationDbi corpcor globaltest]; };
-GoogleGenomics = derive { name="GoogleGenomics"; version="1.1.1"; sha256="06mcg36x41k9s9ick6y3vrg5r4fnkz5qb77a7dh7kk2skinvzips"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
+GoogleGenomics = derive { name="GoogleGenomics"; version="1.1.3"; sha256="1y5jkxhrfi5gkckfmilqsshv5l5ql25iwpmqbr5slch1h4myskbl"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
 GraphAT = derive { name="GraphAT"; version="1.41.0"; sha256="1mjd54zy4l7ivy347zn5rv6gn65sjhxn2cxm417fm83hm542327l"; depends=[graph MCMCpack]; };
 GraphAlignment = derive { name="GraphAlignment"; version="1.33.0"; sha256="14zxbw8cj12wr6c2a0a6mfskr9sqf6cdfyz0ccbzy91d1lnrxzdf"; depends=[]; };
 GraphPAC = derive { name="GraphPAC"; version="1.11.0"; sha256="1p0rkc1qz0yf0lxyjfvrpd7nqky855kmhb1pdwxg3ckifnypw5mc"; depends=[igraph iPAC RMallow TSP]; };
 GreyListChIP = derive { name="GreyListChIP"; version="1.1.1"; sha256="0kbl9m37aiyv6yrqg4z352k7dpdpxm7yywymjfa9gdd0rv1cy401"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer]; };
 Gviz = derive { name="Gviz"; version="1.13.3"; sha256="0qbad4r0k7j1z4gg785iv57azp9ljlxv5jngnk9kfif05rd3k7v3"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
 HCsnip = derive { name="HCsnip"; version="1.9.0"; sha256="14f881v776xn8lw4lvjc26s72laxs9zph902875f76ykbzygayd9"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; };
-HDTD = derive { name="HDTD"; version="1.3.2"; sha256="19kzd1sjl0riwisdbrsy9j2pd39lpxwmizrnnj65hrfv6dwaqsgq"; depends=[]; };
+HDTD = derive { name="HDTD"; version="1.3.3"; sha256="0b9z2bkfislxn9w5bjcd5jcpby2yq5bhn6zxvylngjwqz98v30hl"; depends=[]; };
 HELP = derive { name="HELP"; version="1.27.0"; sha256="1n2fj316ha2l941biyr9d56pry6n39drwa820rgyrwd116rzx79d"; depends=[Biobase]; };
 HEM = derive { name="HEM"; version="1.41.0"; sha256="0qi6q305p0vdhyah3860dpd3z0lyyn6wn5x0m3mj3p739pk288ik"; depends=[Biobase]; };
 HIBAG = derive { name="HIBAG"; version="1.5.0"; sha256="0rrpz4brij408szfmzv7gpk0hrhikjyx061gkamb02ry1my722j1"; depends=[]; };
@@ -250,22 +251,23 @@ HTqPCR = derive { name="HTqPCR"; version="1.23.0"; sha256="0zp7jbnh5zbrqaq84q114
 Harshlight = derive { name="Harshlight"; version="1.41.0"; sha256="12wpfg785dfn5gwp014dfzk9x8zqvr9qrrs0pq32by576knida5z"; depends=[affy altcdfenvs Biobase]; };
 Heatplus = derive { name="Heatplus"; version="2.15.1"; sha256="1jcrajxvll0hhrsq8qvvyc1sj1nd3dm06n8q25qi9nacnfi865y7"; depends=[]; };
 HiTC = derive { name="HiTC"; version="1.13.2"; sha256="1bkd680n81cd7sdji6gjjljxhlbsrdgn5hwpmi37i83hnryfgf5x"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
+HilbertCurve = derive { name="HilbertCurve"; version="0.99.1"; sha256="0nws4y2nc726z6igj3fdkrpv9l4i694g17nz3z1r006ss78gzzf2"; depends=[GenomicRanges HilbertVis IRanges png]; };
 HilbertVis = derive { name="HilbertVis"; version="1.27.0"; sha256="1qcyzn86v0xhb9zc1vcia1n53i33sgncbb7lpink5llmjpalacq6"; depends=[lattice]; };
 HilbertVisGUI = derive { name="HilbertVisGUI"; version="1.27.0"; sha256="03jxn398xv97mmvbpl0qymmydhm4i4c36qnw4s22ch7wy3h9x6h8"; depends=[HilbertVis]; };
 HybridMTest = derive { name="HybridMTest"; version="1.13.0"; sha256="0r4j8yllxzwn5r2rvpkqx6w23836lmly8wlshib6p917ky0djw4s"; depends=[Biobase fdrtool MASS survival]; };
 IMPCdata = derive { name="IMPCdata"; version="1.3.0"; sha256="003qvf47bcfcwxkw7zpzdvpnw7xhd2y12n9by2b1ns5i5jka754b"; depends=[rjson]; };
 INPower = derive { name="INPower"; version="1.5.0"; sha256="0msz24bixp7b5a83n40675xq8fglrhbg8972a93x2k8jgb5gdh38"; depends=[mvtnorm]; };
 INSPEcT = derive { name="INSPEcT"; version="0.99.8"; sha256="0pzh0xkh4py6rwnjqz4wqfnk2h08dp5q9gc4cgxls6gl3574i9ny"; depends=[Biobase BiocParallel deSolve GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve]; };
-IONiseR = derive { name="IONiseR"; version="0.99.6"; sha256="1fzp7ncznqw7pmb4sh1qphrk0ham1158q71kiylggbm88wlisky3"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; };
+IONiseR = derive { name="IONiseR"; version="0.99.7"; sha256="0b4lxdhajd4mhdnfa8c3zm8n5s398arrxjig2bv6il933lhxi6ps"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; };
 IPPD = derive { name="IPPD"; version="1.17.0"; sha256="0afhz5ishr1my9gnksa4dl92lfnb2fnvdpsh3n7kj4j2s8xx0crc"; depends=[bitops digest MASS Matrix XML]; };
-IRanges = derive { name="IRanges"; version="2.3.14"; sha256="0pg6zbdhhpk7h64nma9zrdjxvfk2nwad9b9x8y1qnkki8917a1xd"; depends=[BiocGenerics S4Vectors]; };
+IRanges = derive { name="IRanges"; version="2.3.17"; sha256="1fjz4whvw68xw6w0anzcrympk6xfsa7rgx0mxbzlwkpj96j2805k"; depends=[BiocGenerics S4Vectors]; };
 ITALICS = derive { name="ITALICS"; version="2.29.0"; sha256="16l0wq7bxi3nz8f5hggnzddhg07vrcca480ygvmi03cxajxbjr9h"; depends=[affxparser DBI GLAD oligo oligoClasses]; };
 IVAS = derive { name="IVAS"; version="1.1.0"; sha256="15jnmi40bsnyf5yw86gvqppv0g8250lsi74gsjzhm7gijhlxfnrm"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; };
 Icens = derive { name="Icens"; version="1.41.0"; sha256="1vi2hnzs8z5prggswa6wzr2y53jczkgg09f4vw0pjzkzi7p8bphy"; depends=[survival]; };
 IdMappingAnalysis = derive { name="IdMappingAnalysis"; version="1.13.0"; sha256="1kwalcvb7cxkg89kz5hpk0cvsfzxz5g2cbiflrs2dyaxx96pm5gm"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; };
 IdMappingRetrieval = derive { name="IdMappingRetrieval"; version="1.17.0"; sha256="0fclrkv53q9aq3xw95k25rw52sjzy40r37kajnrk0kc41cyzf2vv"; depends=[AffyCompatible biomaRt DAVIDQuery ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; };
 IdeoViz = derive { name="IdeoViz"; version="1.3.0"; sha256="1ynqg2a0jq23mlqzgf7k05jc2nkby8hkbc6h0p76ms33fwqj2qxz"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; };
-InPAS = derive { name="InPAS"; version="1.1.3"; sha256="1fyhrf1n7hb34l742d3jrjyyznhjvf6z8bdmjawsqr10dvk1j2mv"; depends=[AnnotationDbi BiocParallel BSgenome cleanUpdTSeq GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma S4Vectors seqinr]; };
+InPAS = derive { name="InPAS"; version="1.1.5"; sha256="1s9jx90r7g9v9ipnnld2kdrbhyjl0vdwbgism6ab2hbpdxc33w7k"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; };
 IsoGeneGUI = derive { name="IsoGeneGUI"; version="2.5.0"; sha256="05k6qdnsr2aywdmhdlimx5axrk07mf14rvia10afhf56380sdf3s"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; };
 KCsmart = derive { name="KCsmart"; version="2.27.0"; sha256="1igsmg1l39yladz4dlc9j01nxkwfaciy575d7k6764jhrs6pv39m"; depends=[BiocGenerics KernSmooth multtest siggenes]; };
 KEGGREST = derive { name="KEGGREST"; version="1.9.0"; sha256="0ms60slsf7lpw0yidpy47hyxi7cm9r0gyb0q6ajxv52vn9diz29v"; depends=[Biostrings httr png]; };
@@ -277,6 +279,7 @@ LMGene = derive { name="LMGene"; version="2.25.0"; sha256="17djx1fkjxpmmp56vphcb
 LPE = derive { name="LPE"; version="1.43.0"; sha256="13z3h3mabbwhb5p40a7hil0aq10mya1zqgb8qj2qwnc50sbmgjx2"; depends=[]; };
 LPEadj = derive { name="LPEadj"; version="1.29.0"; sha256="1734ihzvid5bz2wyh7yskk7agd82xmw7dibzb7aivhcfyxs8g8p4"; depends=[LPE]; };
 LVSmiRNA = derive { name="LVSmiRNA"; version="1.19.0"; sha256="1z74y8zbg5amsmslb309gi630v8qa1qqgj37214bv5g9ab8xajmj"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
+LedPred = derive { name="LedPred"; version="1.0.0"; sha256="1wglgnl5y61g4jcqfgnf3gqvmfpdvcb6h43n44cv46icybdk0bzs"; depends=[akima e1071 GenomicRanges irr jsonlite plot3D plyr RCurl ROCR testthat]; };
 LiquidAssociation = derive { name="LiquidAssociation"; version="1.23.0"; sha256="178gx8n0ga1ppjk368xacidms1rc2kn301fmdc8rwbcknwvxrwck"; depends=[Biobase geepack]; };
 LowMACA = derive { name="LowMACA"; version="1.1.0"; sha256="0i0pka0jf1yq7vjw1kb9sd2p21gpy4pw855ap815k02i0n7jyny4"; depends=[Biostrings cgdsr data_table motifStack RColorBrewer reshape2 stringr]; };
 M3D = derive { name="M3D"; version="1.3.5"; sha256="1pjfl0kdhzw9l59qzgxjkf60w0rjdswm8wc12cyk39190hnalh49"; depends=[BiSeq GenomicRanges IRanges]; };
@@ -291,7 +294,7 @@ MEDME = derive { name="MEDME"; version="1.29.0"; sha256="1fpi4ri134ii28nfiq2p875
 MEIGOR = derive { name="MEIGOR"; version="1.3.0"; sha256="1kif7m78w0w0qv4fqfby3rknqk56zk83dds3cm4pgv2cii61i9jy"; depends=[CNORode deSolve Rsolnp snowfall]; };
 MGFM = derive { name="MGFM"; version="1.3.0"; sha256="1h2bi2cchfxl0z31pgj6q6pb1jnmqvjy7jv2khp80h7sdr65356i"; depends=[annotate AnnotationDbi]; };
 MIMOSA = derive { name="MIMOSA"; version="1.7.1"; sha256="1gzm90ii18vvpfd2nnl34mcvbvi49ck4hd7c5yziac8m3gx2f9f2"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
-MLInterfaces = derive { name="MLInterfaces"; version="1.49.3"; sha256="1c7l9xwyx72hmv4rs24xm4bzj3lzaaj0ax71yw1p008rkgj8ifxz"; depends=[annotate Biobase BiocGenerics cluster fpc gdata genefilter ggvis htmltools MASS pls rda rpart sfsmisc shiny]; };
+MLInterfaces = derive { name="MLInterfaces"; version="1.49.8"; sha256="0asl6mibg1r2i9kmgax2qmsnj80spkn4n2pg237wxs9pm70qgpnv"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS pls RColorBrewer rda rgl rpart sfsmisc shiny]; };
 MLP = derive { name="MLP"; version="1.17.0"; sha256="1wb6bzxn1paba2fxh62ldsfr4kr0nq2sy21v0pp0qwhfxndyzpdn"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
 MLSeq = derive { name="MLSeq"; version="1.7.0"; sha256="0vc5rz4l574hmzwn3q7c4giib0lzs720j0j3alvarb3lmfzx9mhq"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
 MMDiff = derive { name="MMDiff"; version="1.9.0"; sha256="0xvnv024cv540m0jv9lrb4s5rvc0mq4gwp6wvdgpnsnqnwi9j556"; depends=[Biobase DiffBind GenomicRanges GMD IRanges Rsamtools]; };
@@ -299,7 +302,7 @@ MPFE = derive { name="MPFE"; version="1.5.0"; sha256="123a6qg761j46bs1ckd6yyr2ig
 MSGFgui = derive { name="MSGFgui"; version="1.3.0"; sha256="0r7izs3wpd7l9agrm3mrr3kmm00s9fzljsjxhk4pzxkjg1ran4hp"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
 MSGFplus = derive { name="MSGFplus"; version="1.3.0"; sha256="0q75mygrd56kr9hrrxlmckkgvhcrgvpgvbjdxjmz6jaqp5wfbkf5"; depends=[mzID]; };
 MSnID = derive { name="MSnID"; version="1.3.1"; sha256="0a0r2ikyb0spm110xzn3zzhl8g6xsvmh781d65f10l1iqnd2cqza"; depends=[Biobase data_table doParallel foreach iterators MSnbase mzID ProtGenerics R_cache Rcpp reshape2]; };
-MSnbase = derive { name="MSnbase"; version="1.17.11"; sha256="1yrzmanv87rpahpqg40vqx23baahq41w3j7zag8chygr2xhxkjxy"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
+MSnbase = derive { name="MSnbase"; version="1.17.13"; sha256="0ijh800jbdjw4nlcx69f3dp9q5zhghvfprgpjvx407a32i47dz3k"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
 MSstats = derive { name="MSstats"; version="2.7.0"; sha256="0zhv2c769biv6avb4csi7alabk76bfn0ykzwp0lc6ymzggbj9pil"; depends=[ggplot2 gplots limma lme4 marray MSnbase preprocessCore Rcpp reshape]; };
 MVCClass = derive { name="MVCClass"; version="1.43.0"; sha256="1mbhfkvdkxw9xd76dd2pxk947w9wahwdsk9x1wcryrmwcdvaqqcz"; depends=[]; };
 MantelCorr = derive { name="MantelCorr"; version="1.39.0"; sha256="0l255m63q9idv56svs5m5bc4izwqnm3jy2z3kka7sw4xcx13l39g"; depends=[]; };
@@ -332,25 +335,27 @@ NCIgraph = derive { name="NCIgraph"; version="1.17.0"; sha256="103p0i4y9frkvdpzh
 NGScopy = derive { name="NGScopy"; version="1.3.0"; sha256="09b323rx0v5dnck2dgq9rzzjk7dbpry74q6c4dkgvjvxkf7khh8m"; depends=[changepoint rbamtools Xmisc]; };
 NOISeq = derive { name="NOISeq"; version="2.11.1"; sha256="13q3v2jphridbjk1059c475xgw9ywkdyqf0b6pbl3pk9l3ag9dr9"; depends=[Biobase Matrix]; };
 NTW = derive { name="NTW"; version="1.19.0"; sha256="027rdvy8xpsa70g6x33v4fmzk8gyvd8p3lgf65ac36wcy120gyhl"; depends=[mvtnorm]; };
-NanoStringQCPro = derive { name="NanoStringQCPro"; version="1.1.1"; sha256="0mmbbxhxd7nh7mqzckw0as68ac0nv005liif0laadbz49y6p4rwm"; depends=[AnnotationDbi Biobase knitr NMF png RColorBrewer]; };
+NanoStringQCPro = derive { name="NanoStringQCPro"; version="1.1.2"; sha256="1xk7rzaschgb39982jkb25xaz1l547dl020nl4wn0fdmy8kalp86"; depends=[AnnotationDbi Biobase knitr NMF png RColorBrewer]; };
 NarrowPeaks = derive { name="NarrowPeaks"; version="1.13.2"; sha256="0cryjprj8y1fgn5xxzsyyv4zdzv5qy8405qkj47kvjbrk0kbr97s"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
 NetPathMiner = derive { name="NetPathMiner"; version="1.5.2"; sha256="0k3vq5l95hapw8hbc00m4pchxwzylp97y20w21g0g1yaf1cf9br0"; depends=[igraph]; };
 NetSAM = derive { name="NetSAM"; version="1.9.0"; sha256="1bdch37kk1clb8cyffrlcr6d5qykk5a5ql3dfi94bw1l0w6v4fjq"; depends=[graph igraph seriation]; };
 NormqPCR = derive { name="NormqPCR"; version="1.15.0"; sha256="0nfjnx5id04nbkda9v66418yzpp88mq2ijsfn8jyg0sfika405nl"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
 NuPoP = derive { name="NuPoP"; version="1.19.0"; sha256="1dpqmhbwr1l95vgjxlw3xayjxksa909xj05jbf4x3gafnlkkdvbk"; depends=[]; };
 OCplus = derive { name="OCplus"; version="1.43.0"; sha256="1x7yqb6hkbglvr0kkq5s7caxambdvzc0f38gahq68wfsfwln7b49"; depends=[akima multtest]; };
+OGSA = derive { name="OGSA"; version="0.99.7"; sha256="03iqpsp1864605yjc7ji064dkiia8y7m66jyi1mskha7hk5mqk5x"; depends=[Biobase gplots limma]; };
 OLIN = derive { name="OLIN"; version="1.47.0"; sha256="19wjz96104rn88pdflixb790qhj24ff4s3hc09ldcii1pfzm0sdw"; depends=[limma locfit marray]; };
 OLINgui = derive { name="OLINgui"; version="1.43.0"; sha256="0714bzbsmd7bsdm5zk05g83yy48z3rlazpv17xbn38ljpykawzjb"; depends=[marray OLIN tkWidgets widgetTools]; };
 OSAT = derive { name="OSAT"; version="1.17.0"; sha256="1ky9xb5ls3xnzinsrxrgggb4r0fmm1q33vxb3ajav7nygyxijq0d"; depends=[]; };
 OTUbase = derive { name="OTUbase"; version="1.19.0"; sha256="0xmp446v57z875lmjkg47f9hx961af9nda658v8qlbjxf1wjw9zb"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
 OmicCircos = derive { name="OmicCircos"; version="1.7.0"; sha256="1xil5043hgpypaww1a1wvcxw9im9jmzgdp83p3z71giqiq36dvh4"; depends=[GenomicRanges]; };
-OmicsMarkeR = derive { name="OmicsMarkeR"; version="1.1.0"; sha256="1fw6zfp5jrkvxjb6j48q3n1fqkm1qmmjjvmr70v93hi5jg0an8gy"; depends=[assertive caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
+OmicsMarkeR = derive { name="OmicsMarkeR"; version="1.1.2"; sha256="09mdsvcp7n5qh845lpa1zsjk7jmbi0ni0601jlr1jija0hmkv1zx"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
 OncoSimulR = derive { name="OncoSimulR"; version="1.99.5"; sha256="0pjn2kirf1b72fvqxjawxcbrsn42brhz09kjnywm611kap329dq2"; depends=[data_table graph gtools igraph Rcpp Rgraphviz]; };
 OperaMate = derive { name="OperaMate"; version="0.99.6"; sha256="0xh57d82rmfcs1a6gj0qcjf585drhzns5k69bwxb7x1xw63wp4kp"; depends=[ggplot2 MASS pheatmap RDAVIDWebService]; };
 OrderedList = derive { name="OrderedList"; version="1.41.0"; sha256="1cw8y5f5h15z0qwg8n4dq7g3ixx2wa332rdsb4w2qqmcqlz79bfp"; depends=[Biobase twilight]; };
 OrganismDbi = derive { name="OrganismDbi"; version="1.11.42"; sha256="0y0v5ngall7iyvx2bqhfkxdnw9alkyab5f6qgpq8dpvr6pvyamyl"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; };
+Oscope = derive { name="Oscope"; version="0.99.1"; sha256="0kv586yv17cf61jnvglsr08175dq0qz5zif8xflnliac9whj7yvf"; depends=[BiocParallel cluster EBSeq testthat]; };
 OutlierD = derive { name="OutlierD"; version="1.33.0"; sha256="0bljxmrnlqcngzzv6yxjsim7gd4icyi384vimn5gs869mq9gyrj3"; depends=[Biobase quantreg]; };
-PAA = derive { name="PAA"; version="1.3.2"; sha256="1p9900wiy5mmcmwb4l5n8kvsjs3ay6k0k551mpjbwijhk2si7wja"; depends=[e1071 limma MASS mRMRe randomForest Rcpp ROCR sva]; };
+PAA = derive { name="PAA"; version="1.3.3"; sha256="1v5gw9f2glzsz05kqyvvhwzfdfj4ypwbfgy5q16lr1y64slabzq2"; depends=[e1071 limma MASS mRMRe randomForest Rcpp ROCR sva]; };
 PADOG = derive { name="PADOG"; version="1.11.0"; sha256="0x84k32fmd1zrwjc4f71mq4jslh9bxr4gjbl48k1f5kl5j6hlxj3"; depends=[AnnotationDbi Biobase doRNG foreach GSA limma nlme]; };
 PANR = derive { name="PANR"; version="1.15.0"; sha256="0nc2a10z7i16dz41yhz3zw9h51myxzxbxd1vpc2d8gczks07n6ch"; depends=[igraph MASS pvclust RedeR]; };
 PAPi = derive { name="PAPi"; version="1.9.0"; sha256="1553fxm3ma3p5j10acyk5m2wx4dafp346x0pyxj9aah856h4zkw5"; depends=[KEGGREST svDialogs]; };
@@ -378,7 +383,7 @@ ProCoNA = derive { name="ProCoNA"; version="1.7.0"; sha256="1x2wmlhlizd09v4d7q98
 ProtGenerics = derive { name="ProtGenerics"; version="1.1.0"; sha256="1l77j3zl78v86jbxpwnyc0a5q66yds79nirlcvan789hxbggr0i4"; depends=[BiocGenerics]; };
 Pviz = derive { name="Pviz"; version="1.3.0"; sha256="0pvmpxw4dpxxs9lrn9nn44rn36r3l09rwlkh5ph054h56nm80xs1"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
 QDNAseq = derive { name="QDNAseq"; version="1.5.1"; sha256="1gykm8r410s9aw75km0f8wnhd0p8gqirszp70g5x97n83r4k6rnq"; depends=[Biobase CGHbase CGHcall DNAcopy matrixStats R_utils Rsamtools]; };
-QUALIFIER = derive { name="QUALIFIER"; version="1.13.0"; sha256="0vk3xx0dmxadxk1wmcnf9cxv7rr4z8624npkmdbqlzb6mxix7p6d"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
+QUALIFIER = derive { name="QUALIFIER"; version="1.13.1"; sha256="0b25cgjafs3k2kwbmbla713gxy9xbjclsx6k4pxydz5flz8w8grg"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
 QuartPAC = derive { name="QuartPAC"; version="1.1.0"; sha256="0w92hggwihp2nia9dzg8yjbfsyrcgwq4kpxh96jb8kkmq6kl2l8p"; depends=[data_table GraphPAC iPAC SpacePAC]; };
 QuasR = derive { name="QuasR"; version="1.9.9"; sha256="13md1pq0bg9xdlhvwsys3f7ibqll80viica03h2l4cnhgw26zj52"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
 R3CPET = derive { name="R3CPET"; version="1.1.0"; sha256="0vwyrqsihnabzqh5r329v3f5zcg2ik51aakvscpp482z0dm2naqh"; depends=[clues clValid data_table DAVIDQuery GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp reshape2 S4Vectors]; };
@@ -386,8 +391,8 @@ R453Plus1Toolbox = derive { name="R453Plus1Toolbox"; version="1.19.1"; sha256="0
 RBGL = derive { name="RBGL"; version="1.45.1"; sha256="0y90pvl3i8pyzxwssciygcd1c1lb8a0rqhpiqgif56075amm71rl"; depends=[graph]; };
 RBM = derive { name="RBM"; version="1.1.0"; sha256="03q7prkrj8y3k8jrnnbjrkmlyv72cxfa8l042df4wajhcbpa4g4l"; depends=[limma marray]; };
 RBioinf = derive { name="RBioinf"; version="1.29.0"; sha256="1cyd18lz3h9b20g6s9azzv9rv9bachh3qsczz84y8lj4kay3qssx"; depends=[graph]; };
-RCASPAR = derive { name="RCASPAR"; version="1.15.1"; sha256="125vrkz5gicizf0acpv0f0ijiky5my7rpfyim25vihcsz5fkb0w1"; depends=[]; };
-RCyjs = derive { name="RCyjs"; version="1.1.12"; sha256="1gv31yj0ms7llsg2rca96rh77h1qw3hkjbiskzc3zmpycx5m9m8b"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
+RCASPAR = derive { name="RCASPAR"; version="1.15.2"; sha256="151mil4v8iz5lrn7827imvvnjh171qdgjg927fic3fwyfx0kkyqs"; depends=[]; };
+RCyjs = derive { name="RCyjs"; version="1.1.18"; sha256="0d6zh2ryy9583i2cxahi4gl5ldp1r0yyyz8mjzklp47rkm2cxmkx"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
 RCytoscape = derive { name="RCytoscape"; version="1.19.0"; sha256="0yfmlksi7sz0p9nbgjz2cpqwbwyzzxij3zaqmkp3wqfdk89mxgi7"; depends=[BiocGenerics graph]; };
 RDAVIDWebService = derive { name="RDAVIDWebService"; version="1.7.0"; sha256="07hnj7flfacg9j8c6155nw23zjxcb1v4wj4rkfi8xz5clp80v6xh"; depends=[Category ggplot2 GOstats graph RBGL rJava]; };
 RDRToolbox = derive { name="RDRToolbox"; version="1.19.0"; sha256="186cj6xri4prv7y9jvspyql8mkqy3aqs2kd6m5fliqicqbfia2z8"; depends=[MASS rgl]; };
@@ -399,8 +404,8 @@ RLMM = derive { name="RLMM"; version="1.31.0"; sha256="01plzmxz5dzvvxzx4wxsqhhyp
 RMassBank = derive { name="RMassBank"; version="1.11.0"; sha256="1df5kfm4gb5kz1z5sq38wddi4njq3y8nzy7fr2dxk1z2j4b1977z"; depends=[mzR rcdk Rcpp RCurl rjson XML yaml]; };
 RNASeqPower = derive { name="RNASeqPower"; version="1.9.0"; sha256="0nn5wq81cm81wjwc43ky597fyq1l4ya36k64bp6k80ri94qx2vzg"; depends=[]; };
 RNAinteract = derive { name="RNAinteract"; version="1.17.0"; sha256="03rz6xyy9f48ns0r9xcxrghikxlna8cx62rwswq2i1xkh7c5lfiy"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
-RNAither = derive { name="RNAither"; version="2.17.0"; sha256="028qf3sj2cms9h6wh4bynxaky8mvlr0axci8yw9bjp4bdlrjland"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
-RNAprobR = derive { name="RNAprobR"; version="1.1.1"; sha256="1n0ra0jb6y01nbdx9qbmkh5w4zy381nzkwcawvdg2bfzva1734mp"; depends=[BiocGenerics Biostrings GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; };
+RNAither = derive { name="RNAither"; version="2.17.2"; sha256="01h9l5inafhzpych76rpkrml442ld6jaxrd31ambspn9hsv8js6z"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
+RNAprobR = derive { name="RNAprobR"; version="1.1.2"; sha256="0cjxf53q9g5g2092grbwp2z9q0sgw4bj5fism0a34w5r1varr9nb"; depends=[BiocGenerics Biostrings GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; };
 ROC = derive { name="ROC"; version="1.45.0"; sha256="1vcv5q7ylr2b1fb4vmrc8j4j7s3v5szzpkwblnfkcp2y8d03i9a1"; depends=[]; };
 ROntoTools = derive { name="ROntoTools"; version="1.9.0"; sha256="07l9j4d26hn8d5ma3z19ipy4rrw29k66zb2ib8n3ba24pjm0h8w3"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
 RPA = derive { name="RPA"; version="1.25.0"; sha256="1bzjb0064xdn5zk9y9dpxjdw79i8kkfb29f13balx78nq5xznxh4"; depends=[affy]; };
@@ -416,7 +421,7 @@ RUVnormalize = derive { name="RUVnormalize"; version="1.3.0"; sha256="1fqk68rpzn
 RWebServices = derive { name="RWebServices"; version="1.33.1"; sha256="1bxp4zj7r1lrxb7r7l32h6b8hdxb1ryf7dxxj0qhwimh7pmxln31"; depends=[RCurl SJava TypeInfo]; };
 RamiGO = derive { name="RamiGO"; version="1.15.0"; sha256="1q9f2ii5b1xway407gzfpzz6vm6an8p13vmgkw7vb9rldxn85hab"; depends=[graph gsubfn igraph png RCurl RCytoscape]; };
 RankProd = derive { name="RankProd"; version="2.41.0"; sha256="05r8mrgnpfkd7yhcch7nrn9jbapfhvi67h0z9a9nlxlp44mz0qq7"; depends=[]; };
-RareVariantVis = derive { name="RareVariantVis"; version="1.0.0"; sha256="09hww69169c225dmi3rmjhv5j2bxq1c773s1q7048rysgv0har5y"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
+RareVariantVis = derive { name="RareVariantVis"; version="1.0.3"; sha256="1wc2rb80xvwbnsc93fl04cf6y74qpwhhi4172whxb6affq2682cq"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors VariantAnnotation]; };
 Rariant = derive { name="Rariant"; version="1.5.0"; sha256="1xwy2xrdk1m1mscnql8cp3az1jx639a9w4mb8bz7jf62z4z4npsi"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
 RbcBook1 = derive { name="RbcBook1"; version="1.37.0"; sha256="03q82zjd725w585rgdn9mbx7ddsv1kdxylsndh26csz573j2myhh"; depends=[Biobase graph rpart]; };
 Rbowtie = derive { name="Rbowtie"; version="1.9.0"; sha256="02wc0pzw9vm1mc7y84ic79jjdi1mh77v8h4gk2pl117pdkgg7nl7"; depends=[]; };
@@ -436,27 +441,27 @@ ReportingTools = derive { name="ReportingTools"; version="2.9.1"; sha256="05p005
 Rgraphviz = derive { name="Rgraphviz"; version="2.13.0"; sha256="08apr3v2h5jwah96c2596ggz7xaz41k5zywcqsjm6g8xhd3hs522"; depends=[graph]; };
 Rhtslib = derive { name="Rhtslib"; version="1.1.8"; sha256="1n6mimlkyaxcfwfr4hclmch3h14qaffakkd899p9fwlf1d60j9xw"; depends=[zlibbioc]; };
 Ringo = derive { name="Ringo"; version="1.33.0"; sha256="12qh3aayy317pzb137ds9vqrrwn93c4l4fdcl6yyp8p4fqpki03j"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
-Risa = derive { name="Risa"; version="1.11.0"; sha256="1rgyh3yv4ii0xw6ycm0g9b0y6c9nqdq4k8lidmifk0gx835lw7vf"; depends=[affy Biobase biocViews Rcpp xcms]; };
+Risa = derive { name="Risa"; version="1.11.1"; sha256="1bx7n7fjsaig5zq6xgwva2fvy0dlg9f1niwl9m6bi1h04spybp2c"; depends=[affy Biobase biocViews Rcpp xcms]; };
 Rmagpie = derive { name="Rmagpie"; version="1.25.0"; sha256="13mb9aaqmwx1ad4mk0fhxqfql8pjpyaiibip7jawiyji7ghp9iw7"; depends=[Biobase e1071 kernlab pamr]; };
 RmiR = derive { name="RmiR"; version="1.25.0"; sha256="1xc19w8la239ia793qpnpx2h0aavwhidrjf4i87jry2j29npjfzz"; depends=[DBI RSVGTipsDevice]; };
-RnBeads = derive { name="RnBeads"; version="1.1.3"; sha256="1yd5gmi2vvkqrv384ndsn7qgp8rzjj6d0i4zsgr33avxnah757m2"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; };
+RnBeads = derive { name="RnBeads"; version="1.1.4"; sha256="1v4cgfrarybansrxk2r77g79xkwhkh28qaffk93mfwf163rq3391"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; };
 RnaSeqSampleSize = derive { name="RnaSeqSampleSize"; version="1.1.0"; sha256="0q2w1yd5p9k3pls6ki8yci3r2v4rxi3iy4zk5mafmr7ip0q1rwpp"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp]; };
 Rnits = derive { name="Rnits"; version="1.3.0"; sha256="0hxll8hlv5nc6vijznhzmvbjh1hxmfy9shm2g8al291yi0gfdmk3"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
 Roleswitch = derive { name="Roleswitch"; version="1.7.0"; sha256="01b21yyg0d2v10abcbw08zhswh9nb7wj7s3x5kcaaas7671f06ha"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
 Rolexa = derive { name="Rolexa"; version="1.25.0"; sha256="1qrf7byimw9s5jp15zmwqk95x34r3yx2npr46gwf1zih06n7kc05"; depends=[Biostrings IRanges mclust ShortRead]; };
 RpsiXML = derive { name="RpsiXML"; version="2.11.0"; sha256="0rvma7vynfh5sjhqnbpagilq54dh0wrvvb3jzykwmrak0dbyk7zh"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
 Rqc = derive { name="Rqc"; version="1.3.1"; sha256="02kc0ki021m4hxhzlmxfrb9p7p2ibdqan5hr9h67vd2dcnp9yaij"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings ggplot2 IRanges knitr markdown plyr reshape2 S4Vectors ShortRead]; };
-Rsamtools = derive { name="Rsamtools"; version="1.21.13"; sha256="0fv0a5f1jb8mj3b2qn6bf9vzzpvn8fgrlhxz492rd3ndvvgnabxc"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
-Rsubread = derive { name="Rsubread"; version="1.19.2"; sha256="1xcj13mzw7a8q93kimr61kcl2xvr0mdzvrrqi4j3psbcyf5zn86k"; depends=[]; };
+Rsamtools = derive { name="Rsamtools"; version="1.21.14"; sha256="1s2xwz0njbml9x0yw08kk8ykbr5zgzfy5glhzkdhcdfdz7m19ma9"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
+Rsubread = derive { name="Rsubread"; version="1.19.3"; sha256="1qb43g5868m3590p1kzb1g5dcl1dkpggk8qq2lnmbw5v761ryamp"; depends=[]; };
 Rtreemix = derive { name="Rtreemix"; version="1.31.0"; sha256="1z08y8qhc3sv4pwvji4pks46hxpcpwb9yx8y0927bc96a8mqgax4"; depends=[Biobase graph Hmisc]; };
-S4Vectors = derive { name="S4Vectors"; version="0.7.10"; sha256="15hyi728raya0x0fl0pp58kk6w4chvx7xv2f7kmp1432pkgvif9p"; depends=[BiocGenerics]; };
+S4Vectors = derive { name="S4Vectors"; version="0.7.12"; sha256="1ym0kph98ab7rdm8b2h3g8zhx92dax7c2nbdmkrahfnldiq60sgn"; depends=[BiocGenerics]; };
 SAGx = derive { name="SAGx"; version="1.43.0"; sha256="111pgl7rzmscgadkbivwa736gpyw1z7zkcj648zq3jhqix569dvd"; depends=[Biobase multtest]; };
-SANTA = derive { name="SANTA"; version="2.5.2"; sha256="0y49ly3ll8qhbnd5yv5nfzc0bq2xcp2nwdg26338qmif4xklzs43"; depends=[igraph Matrix snow]; };
+SANTA = derive { name="SANTA"; version="2.6.0"; sha256="0zx9azk7j82bzq424rf42nsaw05qyfgzdsy38h6r352mfbmip2dl"; depends=[igraph Matrix snow]; };
 SBMLR = derive { name="SBMLR"; version="1.65.0"; sha256="1nmw5c32ka6l12cid54mc4diahjhmyg6fngsd646v70rbzgffn7q"; depends=[deSolve XML]; };
 SCAN_UPC = derive { name="SCAN.UPC"; version="2.11.0"; sha256="1gwjd78qfaqv6xh4ys6rr29b82wc8qxk7ysfjcl06j6n0qk1v4s6"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
 SELEX = derive { name="SELEX"; version="1.1.0"; sha256="13v2aqphpblwslbnm9yk9lfg31vrc3lz9ds4m8j7584iszmlgnar"; depends=[Biostrings rJava]; };
 SEPA = derive { name="SEPA"; version="0.99.0"; sha256="1mc44amd39x1dvl0kamhbsn2cplg7h5j5v5y2lv1gminfl4xs0sw"; depends=[ggplot2 reshape2 segmented shiny topGO]; };
-SGSeq = derive { name="SGSeq"; version="1.3.12"; sha256="19i39vv0ds79hgjjkp37j49apr1jr5n93zc2dmn1llglyp9qqwyl"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+SGSeq = derive { name="SGSeq"; version="1.3.14"; sha256="0m4dsjyww001bqm3ra01jajl0ys9kx605kjb3fjl4dk6adfkn8h8"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
 SIM = derive { name="SIM"; version="1.39.0"; sha256="1r08h5hkciycv4lh998vm742flim07plysgjvrq9dp4c5q4qrzr5"; depends=[globaltest quantreg quantsmooth]; };
 SIMAT = derive { name="SIMAT"; version="1.1.5"; sha256="074r9fyrgkay1xr0i3ps1sn7n24y26w595nssy7bryrvhhd8izbr"; depends=[ggplot2 mzR Rcpp reshape2]; };
 SJava = derive { name="SJava"; version="0.95.1"; sha256="1cl0qybi71srf1ggawxdy128kz8crn8if4yi8c2m6w9ppah9m763"; depends=[]; };
@@ -464,12 +469,12 @@ SLGI = derive { name="SLGI"; version="1.29.0"; sha256="0jhi3nmgnqf8qix90kpz8gqib
 SLqPCR = derive { name="SLqPCR"; version="1.35.0"; sha256="1p35xgwf3i8ksznz1gi3bddj0816hdljamcb7smdrq0md5fqmpzb"; depends=[]; };
 SMAP = derive { name="SMAP"; version="1.33.0"; sha256="0znl289fclws2vnqgpjnrl8b0s5q4cna3ps3il5783vr64ir88cg"; depends=[]; };
 SNAGEE = derive { name="SNAGEE"; version="1.9.0"; sha256="0sn5b8ah9idbz63y1rjx8brz3h58zvh2sk59l4i48nvrm38g169r"; depends=[]; };
-SNPRelate = derive { name="SNPRelate"; version="1.3.5"; sha256="0xr839g6a2m5p7fd2dzaz0c263b2cfdpakq5ydk0k1c3xppzly9y"; depends=[gdsfmt]; };
+SNPRelate = derive { name="SNPRelate"; version="1.3.8"; sha256="0rmqx5s4748jpcbqjjpkm4snkvbs8c0xpdm5qfg18cgkx3jbpxpr"; depends=[gdsfmt]; };
 SNPchip = derive { name="SNPchip"; version="2.15.2"; sha256="1px5ifdsly1z8iwd22vj2xb4pk5jhsa3h2z31scw37b0v4daks50"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses SummarizedExperiment]; };
 SPEM = derive { name="SPEM"; version="1.9.0"; sha256="09klaxlz1ff77jhjsr95g3s4b5m285zf3fl9w4mv5pc8r1viqplf"; depends=[Biobase Rsolnp]; };
 SPIA = derive { name="SPIA"; version="2.21.0"; sha256="0v8m9wfl2kqzzl3k0v7lr7g33ymdnmqi9r2fqyb42mggpq5pwxlm"; depends=[KEGGgraph]; };
 SQUADD = derive { name="SQUADD"; version="1.19.0"; sha256="0xss3vhn6471z44gd44i8j5bni8471nb1sq3cx99f2gyk817nxp8"; depends=[RColorBrewer]; };
-SRAdb = derive { name="SRAdb"; version="1.23.0"; sha256="042y06ds1jdj26jzi51wxb6mlmlr751jyf7ggjaq7zrz267dmj76"; depends=[GEOquery graph RCurl RSQLite]; };
+SRAdb = derive { name="SRAdb"; version="1.25.0"; sha256="1gkg3qyk98zc8gjlmgg34xgjmh92iy2bl9larhdv5inqv2jn3yj3"; depends=[GEOquery graph RCurl RSQLite]; };
 SSPA = derive { name="SSPA"; version="2.9.0"; sha256="1kkvj3s2l6zzvv6pybx38qrnm3i5dxckx2fpc4snlx7km2w175xz"; depends=[lattice limma qvalue]; };
 STAN = derive { name="STAN"; version="1.3.0"; sha256="02qg79aa0j2ns1xswdirgbpwb0dlghd0lbdxgnpmy225wgb7nak6"; depends=[Rsolnp]; };
 STATegRa = derive { name="STATegRa"; version="1.3.1"; sha256="0kfwi5qimg4myx5x0gjwrkhz8cxh2hz1mvxla8yn8v8fkb3ryshj"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
@@ -478,7 +483,7 @@ SVM2CRM = derive { name="SVM2CRM"; version="1.1.0"; sha256="0k3mg9b8i406ssvkzacz
 SamSPECTRAL = derive { name="SamSPECTRAL"; version="1.23.4"; sha256="0fqnqffw6q5sja3jkw6ddrachs075s5s7rnpg9fli9lgax5r4rbp"; depends=[]; };
 ScISI = derive { name="ScISI"; version="1.41.0"; sha256="05snqj8qphcmnkrmv42p6zs92dmi09sd06abn5ll5234my5d0vvn"; depends=[annotate AnnotationDbi apComplex RpsiXML]; };
 SemDist = derive { name="SemDist"; version="1.3.0"; sha256="0dvnp3d2s7bc4jv2vm8jikyac2cd23hx7r480g2lkcaic99wbl0s"; depends=[annotate AnnotationDbi]; };
-SeqArray = derive { name="SeqArray"; version="1.9.7"; sha256="0gpn5dispfd8scqhgxw8pfgrwkz479ly5q8431mifmbkq8zh34pd"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors VariantAnnotation]; };
+SeqArray = derive { name="SeqArray"; version="1.9.10"; sha256="0r4308fich1wwdrqfw6d6c88cq8xsyg2p8wvfnhn1ah4lng9s6z3"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors VariantAnnotation]; };
 SeqGSEA = derive { name="SeqGSEA"; version="1.9.0"; sha256="0znabm84qgzf9m4dk64jppn3s5vzz1sjvrdlr7s6jls8jwi8kqqi"; depends=[Biobase biomaRt DESeq doParallel]; };
 SeqVarTools = derive { name="SeqVarTools"; version="1.7.1"; sha256="04xfph2iphpmlqws5xmibq1jdkclbal2nrf18w7sblqcv67cff7x"; depends=[gdsfmt GenomicRanges GWASExactHW IRanges S4Vectors SeqArray VariantAnnotation]; };
 ShortRead = derive { name="ShortRead"; version="1.27.5"; sha256="0r9gmbg9fd3n6v8c0l1mjkk9x1v6qrisamm5a1nasqbg3wmhmz5k"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
@@ -486,7 +491,7 @@ SigCheck = derive { name="SigCheck"; version="2.1.0"; sha256="012n75gmsifvymbk20
 SigFuge = derive { name="SigFuge"; version="1.7.0"; sha256="1b966n3rl4xs3q1vjgkxxfravqr02rdgwyzvr469y757qdqi1day"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
 SimBindProfiles = derive { name="SimBindProfiles"; version="1.7.0"; sha256="04m7h5zil05sg9yfgjjzm1p65302fp50vxf8y1jafp1nwqialxwh"; depends=[Biobase limma mclust Ringo]; };
 SomatiCA = derive { name="SomatiCA"; version="1.13.0"; sha256="06b3mz199qm2ynal8iq4kp8rv40wbc5zipzwm22nccf97krxl9a4"; depends=[DNAcopy doParallel foreach GenomicRanges IRanges lars rebmix sn]; };
-SomaticSignatures = derive { name="SomaticSignatures"; version="2.5.4"; sha256="1kr4z1b9b5a8gb1m9vfk9bxhinh5ccba2mrwnq3cqhb7c3slbjs3"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
+SomaticSignatures = derive { name="SomaticSignatures"; version="2.5.6"; sha256="17w3dszcaxpkyk9chb7bfdii9zr1hppqhgsarzls4s4p4472f7d1"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
 SpacePAC = derive { name="SpacePAC"; version="1.7.0"; sha256="1ay5hlbm2x9g5mjrq5qksgrrr84vwfk49g9qb2sc9wyc46n5af6k"; depends=[iPAC]; };
 SpeCond = derive { name="SpeCond"; version="1.23.0"; sha256="0nbbqazxql9mc5idvrcycrm9fkrnm2vi9zrad3awhc378ippdk8k"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
 SplicingGraphs = derive { name="SplicingGraphs"; version="1.9.1"; sha256="1s3kvaxrrvfndp4imavj0r9zw0rg37cn9xwxhi5zpfd7a784z1xk"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
@@ -495,17 +500,18 @@ Streamer = derive { name="Streamer"; version="1.15.2"; sha256="0mah1sq797ihy82mv
 SummarizedExperiment = derive { name="SummarizedExperiment"; version="0.3.2"; sha256="0k7dmly8g1qhpqx4qv376ixkwvx073ydc5xqi29s81mwp5fq08zi"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
 Sushi = derive { name="Sushi"; version="1.6.1"; sha256="0g1fk0xrn584l49r73crj0bc5z2y6rdzyf54d221r7k119njp3dw"; depends=[biomaRt zoo]; };
 SwimR = derive { name="SwimR"; version="1.7.0"; sha256="07kh24m9d1q3swj3srjybj6lq68s89750fbvlg449px4aq23yrq0"; depends=[gplots heatmap_plus R2HTML signal]; };
-TCC = derive { name="TCC"; version="1.9.0"; sha256="1bihqfvrq3sjs38m2a60swxqcxmgabb1lmsnfrb669imiqc7ramj"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
+TCC = derive { name="TCC"; version="1.9.2"; sha256="1srlaiavii6sr0d3fiqngp1rchdfxgnmsf7h29szyy34aajqygbw"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
 TDARACNE = derive { name="TDARACNE"; version="1.19.0"; sha256="0nwg355n0qs781801pmmwfwp66sa2ci7g6gfdh4669067j4qbqhb"; depends=[Biobase GenKern Rgraphviz]; };
 TEQC = derive { name="TEQC"; version="3.9.0"; sha256="0dkmh901jkf529jcshvr79jmkvw0824r4dxgp6l6vgv9j5c6nf25"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
 TFBSTools = derive { name="TFBSTools"; version="1.7.0"; sha256="1c38n6xlm4cfrhh9qih0d8xh3d7r7w797fjcbmhsr2zhd7qssrqb"; depends=[BiocParallel Biostrings BSgenome caTools CNEr DirichletMultinomial GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XVector]; };
 TIN = derive { name="TIN"; version="1.1.0"; sha256="0npf3gwh2izvsa5j0zjy1gkm69nrxhcjlm2ha621fc1gz7lx1i2y"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
-TPP = derive { name="TPP"; version="1.1.0"; sha256="06xm73jx4f2pldi7yifvx7zh62zmigidnfd7klpp0jpfxx3xjw61"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr reshape2 VennDiagram VGAM]; };
+TPP = derive { name="TPP"; version="1.1.3"; sha256="152dpyn6ldw4b3ys0b1ylriq0l1hr9l0qjgfh19bvs2gflhbzyah"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr reshape2 VennDiagram VGAM]; };
 TRONCO = derive { name="TRONCO"; version="1.1.0"; sha256="18zmn1cxysar3a19n9i47r2gda5r5jvz0bk209wh6kqlhs001q9v"; depends=[graph lattice Rgraphviz]; };
 TSCAN = derive { name="TSCAN"; version="1.5.0"; sha256="1hkmfn9svbgpvxpszfdxjc23qq8x60prsbrgv7z5n3na4sl7y5z5"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
 TSSi = derive { name="TSSi"; version="1.15.0"; sha256="0475zw1s34ayiz0v9i770rmha4rx9i3zzkjvyskgvsdpgsq9wl4j"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; };
 TargetScore = derive { name="TargetScore"; version="1.7.0"; sha256="0lkkxzi3fi0dxika09fkbakq54c2sjw4g4y9bafcy3f225fac8x8"; depends=[Matrix pracma]; };
 TargetSearch = derive { name="TargetSearch"; version="1.25.0"; sha256="071p06gb1rn6sdhdpi7g05rflp6jgs0cdff13gj8hr5jykyw5ix7"; depends=[mzR]; };
+TimerQuant = derive { name="TimerQuant"; version="0.99.3"; sha256="03qa5k4xc8pv677azdc0ar66p23jdyqyblckdnrqlwnscln0y77g"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; };
 TitanCNA = derive { name="TitanCNA"; version="1.7.1"; sha256="0a64bqgyn18qdvgzmc6kqr6c16jlqyz0vah0fm2qwdjz3zmjd081"; depends=[foreach GenomeInfoDb IRanges Rsamtools]; };
 ToPASeq = derive { name="ToPASeq"; version="1.3.0"; sha256="1m6mh30fpf9mmgg2wsv08qvizw0cpa6dz5abspgbw3q0vaskm2db"; depends=[Biobase clipper DESeq DESeq2 edgeR fields GenomicRanges graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz TeachingDemos]; };
 TransView = derive { name="TransView"; version="1.13.0"; sha256="14fanxl8lqam3492c5sbvhsjwbayrx7dcp5wpsbqrcvbssmfa3cx"; depends=[GenomicRanges gplots IRanges Rsamtools zlibbioc]; };
@@ -514,12 +520,12 @@ TypeInfo = derive { name="TypeInfo"; version="1.35.0"; sha256="0rxwfaqg8sg70hiq8
 UNDO = derive { name="UNDO"; version="1.11.0"; sha256="173cdpp0gipwplxdf7ynxqnv8fqfkbyx7xmr5cx396zi8gpq3am4"; depends=[Biobase BiocGenerics boot MASS nnls]; };
 UniProt_ws = derive { name="UniProt.ws"; version="2.9.2"; sha256="0pby1c7y8fxkpdd2knbv8gbxs78ry1dz8q9zqw6bakp831v5kbgw"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; };
 VanillaICE = derive { name="VanillaICE"; version="1.31.3"; sha256="0niimjngjx8wq2fylzjdijb2za4w4ia53aqkdnjwjfl78rg2hwch"; depends=[Biobase BiocGenerics crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
-VariantAnnotation = derive { name="VariantAnnotation"; version="1.15.19"; sha256="1hqpjwrnyl5hp8vwl68v2cnf868vjf7k0vckjczdcc66wp3g9r70"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
-VariantFiltering = derive { name="VariantFiltering"; version="1.5.15"; sha256="1dawzsv358h3p5x7kcml17snpbypgwjl5b0aam2wrsb7qp80sqh7"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; };
+VariantAnnotation = derive { name="VariantAnnotation"; version="1.15.21"; sha256="0b5i9q2xnclkrziri6575irmm5y3r2g9x45dr5qnq91g9rxi4m7v"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
+VariantFiltering = derive { name="VariantFiltering"; version="1.5.16"; sha256="1fvzhxvirzxcrqw3bm86f5id29s993gpmbwjar5maj86881l1c2f"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; };
 VariantTools = derive { name="VariantTools"; version="1.11.0"; sha256="1yyx9l6q3v4igm2ppnrsj9c7p4p0zpkqwjyf9d7b7rqvrk9yjyrv"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
 Vega = derive { name="Vega"; version="1.17.0"; sha256="1c39112czlw9hgh9gmkwxhhz9kwki48k8lsfmy3hkzxqpxx61h01"; depends=[]; };
 VegaMC = derive { name="VegaMC"; version="3.7.0"; sha256="046wly5sn4vwk3h4bcick8q5dpjrfjq393rqjl8y4v24iqynlyqd"; depends=[Biobase biomaRt genoset]; };
-XBSeq = derive { name="XBSeq"; version="0.99.6"; sha256="1j8hwy2wi4vmc1nnc5xij578w445vqj0v6ngz06rlbdi5kb9k7ls"; depends=[Biobase BiocGenerics DESeq2 ggplot2 locfit matrixStats pracma]; };
+XBSeq = derive { name="XBSeq"; version="0.99.7"; sha256="01vi1p5h1lin0d62mm92y745crv21qqf24kwaj0nlhny93aq45gp"; depends=[Biobase BiocGenerics Delaporte DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma]; };
 XDE = derive { name="XDE"; version="2.15.0"; sha256="17i8zxb6q4wpsa8lymcnilmr39ip1a54h6rqyl3m7qa8xwb0gv50"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; };
 XVector = derive { name="XVector"; version="0.9.1"; sha256="0l5l45i7sx1j51s3wkab207qwbk77i8iazd26isf0yp3rsb84a4c"; depends=[BiocGenerics IRanges S4Vectors]; };
 a4 = derive { name="a4"; version="1.17.0"; sha256="0pn0gm4xkngz72i92h58d0xbpcx04938x4vm0mqsilrjapchripj"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
@@ -531,7 +537,7 @@ a4Reporting = derive { name="a4Reporting"; version="1.17.0"; sha256="1fpdkw048gv
 aCGH = derive { name="aCGH"; version="1.47.0"; sha256="095arlryay4gdr6kva7vf9lcby60pyx5bs4vcx586zgwskzpb2ln"; depends=[Biobase cluster multtest survival]; };
 acde = derive { name="acde"; version="0.99.5"; sha256="1bbsfr7a2sivb6dpn06hwj0i95wdlfxzba4a36pakx7nzn6nv76p"; depends=[boot]; };
 adSplit = derive { name="adSplit"; version="1.39.0"; sha256="1jprbqwhksyp9jf05r5dbfzgn30xm16shqsf8yi9b3nr7z2swvwm"; depends=[AnnotationDbi Biobase cluster multtest]; };
-affxparser = derive { name="affxparser"; version="1.41.5"; sha256="0naiv8z07zr1xjnmimx17awnsb9dryiz4w9jx17whrjwdpddx1p5"; depends=[]; };
+affxparser = derive { name="affxparser"; version="1.41.6"; sha256="1d1jnsx3dq52yfcchnagidlsw73dk7j5pagqfzba6pa6vv8l3sl0"; depends=[]; };
 affy = derive { name="affy"; version="1.47.1"; sha256="1c9ggyqhj65mj0nq9xsqfmzp4a5705qj67swjpk5bmqajxr390a3"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
 affyContam = derive { name="affyContam"; version="1.27.0"; sha256="1hd9kchhdjcnkxlf6kcc59jb5a9v67671shvzprraa1lg4800j5x"; depends=[affy Biobase]; };
 affyILM = derive { name="affyILM"; version="1.21.0"; sha256="1gvagg83p4vxp6q72s7camcg5lhxdfy7rmm3a2p2n29267xvcz5x"; depends=[affxparser affy Biobase gcrma]; };
@@ -540,8 +546,8 @@ affyPara = derive { name="affyPara"; version="1.29.0"; sha256="06382vyfjrng72hhm
 affyQCReport = derive { name="affyQCReport"; version="1.47.0"; sha256="09f3pbacsrjs5bv1bv3dz7jmd849rnix6pqlkszr507s6by5i47y"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
 affycomp = derive { name="affycomp"; version="1.45.0"; sha256="0wwgijr7h2hbv2l0w5p509f70yy873w8kahs7nnhrgl4kzbjiymc"; depends=[Biobase]; };
 affycoretools = derive { name="affycoretools"; version="1.41.9"; sha256="16zdm1idmssg9jp86kkfc2h2dhjz2rl6qnrbybfbkiiklj2gagq7"; depends=[affy AnnotationDbi Biobase gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools xtable]; };
-affyio = derive { name="affyio"; version="1.37.0"; sha256="0p6wgrl8xag85y5vadfxdvvr430d7sa4wh2fw3ijyi3hr83sdr4z"; depends=[zlibbioc]; };
-affylmGUI = derive { name="affylmGUI"; version="1.43.0"; sha256="04np48b2v04w77vhpacdx8790i8jb58rw7da76qvahiqja857vlq"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+affyio = derive { name="affyio"; version="1.39.0"; sha256="07m032wbfgi06yl79waskb2h1r4qi65pzr1j2ry60cr9jv50sizc"; depends=[zlibbioc]; };
+affylmGUI = derive { name="affylmGUI"; version="1.43.2"; sha256="1mkg2addri3x8vchgcdy4wih1pzagbp0i54w3nh9kf64r89m35br"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
 affypdnn = derive { name="affypdnn"; version="1.43.0"; sha256="01myf9dxzgc2jgdswphinz7ap7bdaqnw0gcfk32sxbykr4g4zyiy"; depends=[affy]; };
 agilp = derive { name="agilp"; version="3.1.0"; sha256="13jnq7v0qfyllbldx2abnia0rg40yxxgkq4i1whsy5qnk1fp0n77"; depends=[]; };
 alsace = derive { name="alsace"; version="1.5.0"; sha256="17ah7dl02w6qysfbs92h4c3wxfb6f1m6vz6yl07s0zd86k12g4nm"; depends=[ALS ptw]; };
@@ -549,7 +555,7 @@ altcdfenvs = derive { name="altcdfenvs"; version="2.31.0"; sha256="05gr6j1w1y289
 ampliQueso = derive { name="ampliQueso"; version="1.7.0"; sha256="1bk0svxg7n6b610d5czkk1mgkrgdsjlghbj38g4hxxw3vciaxhkk"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
 annaffy = derive { name="annaffy"; version="1.41.1"; sha256="1rqp0lrhahkimnhifpipf2vw0lhprdx9slz3s4bwylvn0k5balcm"; depends=[AnnotationDbi Biobase]; };
 annmap = derive { name="annmap"; version="1.11.0"; sha256="0s0ifbwra3zczw9h0nqcs88rb3h74ry1gap1bvqvcxqirdwq9nw4"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
-annotate = derive { name="annotate"; version="1.47.0"; sha256="06nrzkl9g26rrnqvakwkn2yinvgka02a5iivhi9kgjk4g5plcmkw"; depends=[AnnotationDbi Biobase BiocGenerics DBI XML xtable]; };
+annotate = derive { name="annotate"; version="1.47.4"; sha256="01imryfc18jg8hmxk82arkpvdxfh448fhiv5z0xmkbx03hrrin7b"; depends=[AnnotationDbi Biobase BiocGenerics DBI XML xtable]; };
 annotationTools = derive { name="annotationTools"; version="1.43.0"; sha256="1dqs8f4p1ks03q0lfwm3hs116ahks39hk17knkqs492zcqr83qay"; depends=[Biobase]; };
 anota = derive { name="anota"; version="1.17.0"; sha256="0grdmpdg03wqjs6rk558nvl8vvdi6my0jv06f3h364pk44hrijdn"; depends=[multtest qvalue]; };
 antiProfiles = derive { name="antiProfiles"; version="1.9.1"; sha256="07gzl7wsvv3x7in7n1fwq4cm8bqhlrxwq6ra1k2556z9z8ad7y33"; depends=[locfit matrixStats]; };
@@ -567,7 +573,7 @@ beadarraySNP = derive { name="beadarraySNP"; version="1.35.0"; sha256="0g6ba4iyn
 betr = derive { name="betr"; version="1.25.0"; sha256="0jd7r069jlfp5fj51xw8k6jpxq5kb364xi9331l06hwijp3msrk6"; depends=[Biobase limma mvtnorm]; };
 bgafun = derive { name="bgafun"; version="1.31.0"; sha256="18wk42h1i06j3swlsac9vnkc7riimk7qap59lygji1p3zvy1nkpx"; depends=[ade4 made4 seqinr]; };
 bgx = derive { name="bgx"; version="1.35.0"; sha256="1cawfanrxq82b24ny050hv4p607k2zhfxllgl8j1j9qm9n4yk4yk"; depends=[affy Biobase gcrma]; };
-bigmemoryExtras = derive { name="bigmemoryExtras"; version="1.13.2"; sha256="0qmrpm4bir0si5xd5v8ih6wnwfprwp4q9hcxbylf1721v9m9wpwv"; depends=[bigmemory Biobase]; };
+bigmemoryExtras = derive { name="bigmemoryExtras"; version="1.13.3"; sha256="0jniyz1b11yk00azqxswfdipri84a28ni30kxpazb57d5m6s53h2"; depends=[bigmemory Biobase]; };
 bioDist = derive { name="bioDist"; version="1.41.0"; sha256="14a18ky9x36fa8yx3kry23c0vfazxy0lg0j2zkdnr1irngc9wnw5"; depends=[Biobase KernSmooth]; };
 bioassayR = derive { name="bioassayR"; version="1.7.7"; sha256="1pflygamq0l0pdps4ay3rl4f8c1njrb55lnl0p2z7mgpj6dbgvf8"; depends=[BiocGenerics DBI Matrix rjson RSQLite XML]; };
 biocGraph = derive { name="biocGraph"; version="1.31.0"; sha256="069n4867pkygrsgfjp6arnnmcvlij03r1a2kbs9jgnpx4knck09i"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
@@ -577,13 +583,13 @@ biomvRCNS = derive { name="biomvRCNS"; version="1.9.1"; sha256="0ni7ncip0vx1ipyr
 biosvd = derive { name="biosvd"; version="2.5.0"; sha256="0xnc3vpbj5p14w2fwql8vpz9lyvivq3kjmwsr62abn418ampa941"; depends=[Biobase BiocGenerics NMF]; };
 biovizBase = derive { name="biovizBase"; version="1.17.1"; sha256="0fffqm8z7x849rd0k7vhpbzwyrx5s0w75iz78627rglczjff6ddp"; depends=[AnnotationDbi BiocGenerics Biostrings dichromat GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
 birta = derive { name="birta"; version="1.13.0"; sha256="01lrwg4naks85gcrlg3sk3pr328j40b1ji4m4bn3s74rqn6sb52h"; depends=[Biobase limma MASS]; };
-birte = derive { name="birte"; version="1.3.0"; sha256="0azkl9x2hk826sdpw96ls868jf83yf1v79inyjg7xsilal2slqgf"; depends=[Biobase limma MASS nem Rcpp RcppArmadillo ridge]; };
+birte = derive { name="birte"; version="1.4.0"; sha256="0fyz2chcgcp98lk6zj21lsixmkr06hd80dbg2j25a4rx2pv6qn5s"; depends=[Biobase limma MASS nem Rcpp RcppArmadillo ridge]; };
 blima = derive { name="blima"; version="1.3.0"; sha256="1i7njg1lw76717irmfbpy9pmv8hy7nzyini2wm6625cafizp5xq8"; depends=[beadarray Biobase BiocGenerics]; };
 bridge = derive { name="bridge"; version="1.33.0"; sha256="06iz67amv80az14s8yim25jfsgbxhxbfifbqazsc78ip9gd7lfyv"; depends=[rama]; };
-bsseq = derive { name="bsseq"; version="1.5.4"; sha256="1hr9h4h099506id4xvh6xm9x40dv5hsiyz8rzj4dxxkq7095h9d1"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats S4Vectors scales SummarizedExperiment]; };
+bsseq = derive { name="bsseq"; version="1.5.5"; sha256="1yhrysqrbv38p7k7g8sywp6ly6prll1kgjpkk7ff9gklpgmdygkq"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats R_utils S4Vectors scales SummarizedExperiment]; };
 bumphunter = derive { name="bumphunter"; version="1.9.1"; sha256="0phq9dhrj8fa253a64vwfp75j85vp9142g5gmfy1g1n861xy8r26"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
 caOmicsV = derive { name="caOmicsV"; version="0.99.2"; sha256="0y96f64m0liv53vbby866v1ga5nml1506pp6ff4ax7dbg0niiwwn"; depends=[bc3net igraph]; };
-canceR = derive { name="canceR"; version="1.1.2"; sha256="07wikalgmf3vw2dzmri1ia80hfman53mynsk40y549qn8hjija1k"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
+canceR = derive { name="canceR"; version="1.1.3"; sha256="1cagv58133w80acjzlyvx2752ap4dhkpvsfr34306gwbvs4gin3j"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
 cancerclass = derive { name="cancerclass"; version="1.13.0"; sha256="066v9dz49ap0db31jrdlx2zbv8l3bwd75sf9gqa1dw3g8m9zq7hg"; depends=[binom Biobase]; };
 casper = derive { name="casper"; version="2.3.1"; sha256="12nz9ypg685c1bly3fp9x76cilh6imlw4hqdmd7sbp2d0z89dcgf"; depends=[Biobase BiocGenerics EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; };
 categoryCompare = derive { name="categoryCompare"; version="1.13.0"; sha256="08r5payxn40xdpaph6zind8miqlqdhnmka9jcijj396rbbhvb480"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCytoscape]; };
@@ -603,21 +609,21 @@ cisPath = derive { name="cisPath"; version="1.9.0"; sha256="1jdq159ixiixh9ppfc5g
 cleanUpdTSeq = derive { name="cleanUpdTSeq"; version="1.7.1"; sha256="0inszzss1fqyhw18lx40iycvpzkm18djxmad1li8bd22hss759c2"; depends=[BiocGenerics BSgenome e1071 GenomicRanges seqinr]; };
 cleaver = derive { name="cleaver"; version="1.7.0"; sha256="14vbdagy61imql6z2qazzlqzp0r9ridydn7phvajc84lnwbf8xa3"; depends=[Biostrings IRanges]; };
 clippda = derive { name="clippda"; version="1.19.0"; sha256="1gd5b2n2qa9bv1n93vcdz8lg8kmn1lv923i3gzq8pcy7fbz7m5cs"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
-clipper = derive { name="clipper"; version="1.9.0"; sha256="0py5hdbf8wypw5r9r2d7b3239b83lyrybcvksrmiklv7snw9c2qx"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
+clipper = derive { name="clipper"; version="1.9.1"; sha256="1z0wjkzx9v0wlsx2wdjxch7j6m3hlkmg5zy8fddgbv3fdc750ppm"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
 clonotypeR = derive { name="clonotypeR"; version="1.7.0"; sha256="1pwwjgln7r7035fdqqfb69fgql91cxfablbwid2m5xkdrwzpb57s"; depends=[]; };
 clst = derive { name="clst"; version="1.17.1"; sha256="08gqxcjchzywvc67nfjmr2i1xxm71i1j00qxdq3zs6p9y4n65qa0"; depends=[lattice ROC]; };
 clstutils = derive { name="clstutils"; version="1.17.1"; sha256="04gwj8mlbqd5l2nas146vk0vzad0z1y4225g935h9baspcmdh3f8"; depends=[ape clst lattice rjson RSQLite]; };
 clusterProfiler = derive { name="clusterProfiler"; version="2.3.6"; sha256="1hfknmad6wix5ciwcfjn80s0y78966gfkifhxa6wxpkddmdhklqw"; depends=[AnnotationDbi DOSE ggplot2 GOSemSim KEGGREST magrittr plyr qvalue topGO]; };
 clusterStab = derive { name="clusterStab"; version="1.41.0"; sha256="0sgj2k70fc3r3s19vxcx95z8s3a42yshl78swxp0qp55kidbhvdp"; depends=[Biobase]; };
 cn_farms = derive { name="cn.farms"; version="1.17.0"; sha256="09xasmanimx3mzis786iwy2nvxqa5rzvrvrz1hpsiyh5y77yrbnb"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
-cn_mops = derive { name="cn.mops"; version="1.15.1"; sha256="03gr4i1vpyg6h3yyqrdjq1z1dzq9jzdazcrv9045v652qf4jbshr"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
+cn_mops = derive { name="cn.mops"; version="1.15.3"; sha256="0swin9qyzi2fcc0frq0xnzmj789vbjj0mi2wnmmy131blp7iy6x9"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
 cnvGSA = derive { name="cnvGSA"; version="1.13.0"; sha256="1sswh1xwimki8ys08l2h95ajpnm5gr0bscvwilhjw4g2a0y7nibr"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
 coGPS = derive { name="coGPS"; version="1.13.0"; sha256="160cf9ijn5crvhwbqldix1n36jrmn51085sr4whgm765si57wwb4"; depends=[]; };
 coMET = derive { name="coMET"; version="1.1.0"; sha256="01baf156p0ldqhczrin2lsf4jir7158b0db5732jddnl5ayghsi3"; depends=[biomaRt colortools GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; };
 coRNAi = derive { name="coRNAi"; version="1.19.0"; sha256="1vidwyq8rnkbi0pfbh3mk8m3qj8acwqn7q6jm35gahy4y3p0nq7x"; depends=[cellHTS2 gplots lattice limma locfit MASS]; };
 cobindR = derive { name="cobindR"; version="1.7.1"; sha256="0mya51pynfdxfap3paylinqg10fpir7flsz1bng0sk34y15jnxbz"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
-codelink = derive { name="codelink"; version="1.37.4"; sha256="0rn2cbjgb7f9yypdrvk5ahgpghd3pn45pb183rs9fdywivys9a0v"; depends=[annotate Biobase BiocGenerics limma]; };
-cogena = derive { name="cogena"; version="1.1.3"; sha256="074knrfvnhf4fp98dypwzjsp9z15lj7xlgm1wfmnijcwrwf5566p"; depends=[amap Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots igraph kohonen mclust reshape2 STRINGdb]; };
+codelink = derive { name="codelink"; version="1.37.5"; sha256="1nh7cfhamy5l8qsxixwl4bg8k524hlr4l8v5mqf4qis9f3zp3l3x"; depends=[annotate Biobase BiocGenerics limma]; };
+cogena = derive { name="cogena"; version="1.1.6"; sha256="0sf0513qhqpb8mm2ydchdnv20dj9s510nv4rcs5b89vnwm62j0i0"; depends=[amap Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots igraph jsonlite kohonen mclust reshape2 STRINGdb]; };
 compEpiTools = derive { name="compEpiTools"; version="1.3.4"; sha256="0y12sn2dh0x2y7nghkh6dm98b4ilg41694shw3m0fcgaz22c30kp"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; };
 compcodeR = derive { name="compcodeR"; version="1.5.3"; sha256="0208sxff40mjizr47zf6yf87irnnjm0gizdk9h5frbizdxl2i9nn"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
 conumee = derive { name="conumee"; version="1.1.0"; sha256="1sxl5m7yfqbzg76n06y1jcv0v75y7wf3ad66zw8v004nz84diaix"; depends=[DNAcopy GenomeInfoDb GenomicRanges IRanges minfi rtracklayer]; };
@@ -628,7 +634,7 @@ cosmiq = derive { name="cosmiq"; version="1.3.0"; sha256="1868sxwlmaqas3w3nrw4bv
 cpvSNP = derive { name="cpvSNP"; version="1.1.0"; sha256="066y409zfz0bway990ygck5lf0vzl6whh212v4rpis1l9bzfv434"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
 cqn = derive { name="cqn"; version="1.15.1"; sha256="1g1ip7lxs82qq0qbhnx90hxmjiypc76p1sgx7yvj5nmp6wp1m5xy"; depends=[mclust nor1mix preprocessCore quantreg]; };
 crlmm = derive { name="crlmm"; version="1.27.0"; sha256="16i3ijqhwp6c2dshk8r7idrjwga3sm1qcafqz9gl4q6b04s5jvym"; depends=[affyio Biobase BiocGenerics ellipse ff foreach illuminaio lattice matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
-csaw = derive { name="csaw"; version="1.3.9"; sha256="10ad0nflzy5ygq7rcn5swpdhxd4rr4y65759pvhji17scsinhswp"; depends=[AnnotationDbi edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges limma Rsamtools S4Vectors SummarizedExperiment]; };
+csaw = derive { name="csaw"; version="1.3.10"; sha256="01vap3h0j9pklmdh5i90p6j9mppvyld000cbhhyj7rmx7z8bsswy"; depends=[AnnotationDbi edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges limma Rsamtools S4Vectors SummarizedExperiment]; };
 ctc = derive { name="ctc"; version="1.43.0"; sha256="139rxdvyvv3wvlc5q3581y5hkjkd5smxvb606mlxjb8lww4qmcj8"; depends=[amap]; };
 cummeRbund = derive { name="cummeRbund"; version="2.11.1"; sha256="0nd1a9wi2qvvdhfvkb18ql82bfzhz6fivc7wdfv90mibrd7ypb2a"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer]; };
 customProDB = derive { name="customProDB"; version="1.9.4"; sha256="0ws620i6s9p477zfns0m6qpzzhrsivjziv2gv3gmy19dhfh0ln08"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer stringr VariantAnnotation]; };
@@ -643,32 +649,33 @@ deltaGseg = derive { name="deltaGseg"; version="1.9.0"; sha256="0y8fw4gxmhsr5xrb
 derfinder = derive { name="derfinder"; version="1.3.3"; sha256="11npavkr27f3c48bp40vgn9klgmpqs2w17gl96qn5g1y2gyvrhk5"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
 derfinderHelper = derive { name="derfinderHelper"; version="1.3.1"; sha256="03kijh42x1v4ix4gxs1729rifwckaz9npcrd9b3j6xsizx97b4cr"; depends=[IRanges Matrix S4Vectors]; };
 derfinderPlot = derive { name="derfinderPlot"; version="1.3.4"; sha256="1f7x609sknmbn8gsxq75073vfr0qd0k9j7gfi0fxvgnm5f4lkizx"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 scales]; };
+destiny = derive { name="destiny"; version="0.99.14"; sha256="1k44mwmvrh3fyjdslk8vh2kw075nijzsviy7i0glsbj9q1lhfnzk"; depends=[Biobase BiocGenerics FNN igraph Matrix proxy Rcpp RcppEigen scatterplot3d VIM]; };
 dexus = derive { name="dexus"; version="1.9.0"; sha256="1xnjs6gmzkdj1snwakq73bz8ypnxzzxh8ki9wv0ljfbfwv1j7z53"; depends=[BiocGenerics]; };
 diffGeneAnalysis = derive { name="diffGeneAnalysis"; version="1.51.0"; sha256="1k5as63cd87nnigc0yzaxvhskpnbr7l1ym2bqc57zsm3bwh8xxwb"; depends=[minpack_lm]; };
-diffHic = derive { name="diffHic"; version="1.1.9"; sha256="0azagkb87v2lxmb5bvjqc9bz8pqnn1a9j3p5r4v8izpqwq23hf75"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
+diffHic = derive { name="diffHic"; version="1.1.12"; sha256="1ywa1c9g4v19w3xmgxvk202h2dd9ax3h99d4rff9xjp2ywkxy2qz"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
 diggit = derive { name="diggit"; version="1.1.1"; sha256="0c3zy1d9bzb6asa4clgq738h7dj6md55gclwa244qyx857b58rqv"; depends=[Biobase ks viper]; };
 dks = derive { name="dks"; version="1.15.0"; sha256="1d66jfca6q8ni5vz5zh7fmxwh3y0yvl2p7gal7w55py6wvyssnl3"; depends=[cubature]; };
 domainsignatures = derive { name="domainsignatures"; version="1.29.0"; sha256="1wkypbm5ldwx8y2n16fajf450pwv6zipjdk0176a5rqihaflz80l"; depends=[AnnotationDbi biomaRt prada]; };
 dualKS = derive { name="dualKS"; version="1.29.0"; sha256="1a2wb137x98nmdm8dvnl4msl89mlyvm8f1kqzr6jhdj4wjv2hrg1"; depends=[affy Biobase]; };
 dyebias = derive { name="dyebias"; version="1.27.0"; sha256="095qcnri2g19m363ipdi31xgn20b51mbfv5mgkk21m6fww1npc92"; depends=[Biobase marray]; };
-easyRNASeq = derive { name="easyRNASeq"; version="2.5.5"; sha256="0g2n3ayl06bn8khf5pail119i1611nq71vvqfkdh0v30nj9rsbw2"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
+easyRNASeq = derive { name="easyRNASeq"; version="2.5.6"; sha256="0b93i80fjvljjm4il1ad9g3apznj23hcyhpq3z10zsw81clfya1j"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
 ecolitk = derive { name="ecolitk"; version="1.41.0"; sha256="0jga35q98bidqjlqynq0cack4gwsm3hw34vgns67v37krjs4hn9f"; depends=[Biobase]; };
 edge = derive { name="edge"; version="2.1.0"; sha256="1xxz8qyagrfr92ldaxlgb8dfpm6nx3lyk6fa4dl0m8yvlr6lw2fa"; depends=[Biobase MASS qvalue snm sva]; };
 edgeR = derive { name="edgeR"; version="3.11.2"; sha256="0df181xjga322phjinlffl0j2mg61pq4p8h3sxx3xz100c6xrahr"; depends=[limma]; };
 eiR = derive { name="eiR"; version="1.9.1"; sha256="01wkz9lc6gi1a98q02c6zyzfsnkk52px60xg3lawp2419dvj2ww3"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; };
 eisa = derive { name="eisa"; version="1.21.0"; sha256="03366q5qj4wdfm4d9lwysmgz3bgwc53zynw2cmsj7w3yg6dj63km"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
 ensemblVEP = derive { name="ensemblVEP"; version="1.9.2"; sha256="10xjxafm97jnk7dfi0j1ahyd6hp45r5rpfr206fbiipcq3ha2p9h"; depends=[BiocGenerics Biostrings GenomicRanges VariantAnnotation]; };
-ensembldb = derive { name="ensembldb"; version="1.1.5"; sha256="1q32pcg07lgzzavcgx5843ljchklgbscw0qgifrs6d1hidbldjvq"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
+ensembldb = derive { name="ensembldb"; version="1.1.6"; sha256="1kr0yfdfhmd8g5pqazpbmaqcjw6ydv5whxf4c29d77x83alfncyh"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
 epigenomix = derive { name="epigenomix"; version="1.9.2"; sha256="0l7pa2nyllf7imapbxqavyg3h0ba3wc1bhrhz7a7bc8rr8qyq0w1"; depends=[beadarray Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
 epivizr = derive { name="epivizr"; version="1.7.8"; sha256="01z80dbahjbf60d71hiqai5h5i546hvl2j737b4xjca9017g2wsg"; depends=[Biobase GenomeInfoDb GenomicFeatures GenomicRanges httpuv mime OrganismDbi R6 rjson rtracklayer S4Vectors SummarizedExperiment]; };
-erccdashboard = derive { name="erccdashboard"; version="1.3.1"; sha256="10ya8gzd9z3b7kwm9yf7v1cbxpqi1r7ghxwy1sg6b646gf3g580v"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
+erccdashboard = derive { name="erccdashboard"; version="1.3.2"; sha256="0vsjk6ba739c2hvx87gz0n3sn2cwfm1nhwk2jcb8ynv7gxww3p4l"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
 erma = derive { name="erma"; version="0.1.2"; sha256="046m88bjfkv8xkmz8il6l0zbp0wcr7n6wvsv2lavcyl09qnjghs0"; depends=[BiocGenerics GenomicFiles GenomicRanges ggplot2 rtracklayer S4Vectors]; };
 exomeCopy = derive { name="exomeCopy"; version="1.15.0"; sha256="1047k3whc8pjcrvb10dmykbc3c7ah4fgzsiqxw7asp4ksiqpj5ii"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
 exomePeak = derive { name="exomePeak"; version="1.9.1"; sha256="1lvzr8zsa61vj5qhd4yh9n8vmfw759b8gbpp6q9yxz1py1ky16y6"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; };
 explorase = derive { name="explorase"; version="1.33.0"; sha256="0405q21ivvchmb37jksv46kwxgbmyiavznizn39asv6wrsvw62az"; depends=[limma rggobi RGtk2]; };
 fCI = derive { name="fCI"; version="0.99.10"; sha256="1gknc8pqznxkgdgc403s59xl6x9s8cdb5iql0q88kk8jcqc2fgyl"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
 fabia = derive { name="fabia"; version="2.15.0"; sha256="1631f6q30cxzaw7vqjacr44hwzrjbvk0sw3v41zagpbqbbr11swx"; depends=[Biobase]; };
-facopy = derive { name="facopy"; version="1.3.0"; sha256="0nm7jds5c4p471qyzv61byl61frwnf71kkvcdrc876168bd6s9y3"; depends=[annotate cgdsr coin data_table DOSE FactoMineR ggplot2 GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz scales]; };
+facopy = derive { name="facopy"; version="1.3.1"; sha256="091pgih7daxhz1lhynq98d5yfxv851dv64vl18dafsg3bp4k5ig5"; depends=[annotate cgdsr coin data_table DOSE FactoMineR ggplot2 GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz scales]; };
 factDesign = derive { name="factDesign"; version="1.45.0"; sha256="08d7ma718s8rdbmk00jdbwn9d1g431iaff7hc4ra421drl95yql1"; depends=[Biobase]; };
 farms = derive { name="farms"; version="1.21.0"; sha256="1c0k2ffjqfrhkw0d7h6a6sffh50qvbc7jqd3glgrvbwjnmsys34v"; depends=[affy Biobase MASS]; };
 fastLiquidAssociation = derive { name="fastLiquidAssociation"; version="1.5.0"; sha256="0477z4inv374bv5qs6wr5lcndk0d4if4hf1qbwlvv070sh5001gi"; depends=[Hmisc LiquidAssociation WGCNA]; };
@@ -683,7 +690,7 @@ flowCHIC = derive { name="flowCHIC"; version="1.3.0"; sha256="1g6kkmcja3am6dawdk
 flowCL = derive { name="flowCL"; version="1.7.0"; sha256="0n7gsvsfvfcn1ysc2kzv564hnn963rg6zwzx70vzp8lzvg55z8db"; depends=[Rgraphviz SPARQL]; };
 flowClean = derive { name="flowClean"; version="1.5.0"; sha256="1ggzsm1zrvg7x0x9jvjiqm5172cm6lvkmzkk5v38pjvhplqgx4hi"; depends=[bit changepoint flowCore sfsmisc]; };
 flowClust = derive { name="flowClust"; version="3.7.01"; sha256="06y8sg5mdjzn3d18m5b3753q2g4s4yxm1v8vb6pkdszq88255w6k"; depends=[Biobase BiocGenerics clue corpcor ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
-flowCore = derive { name="flowCore"; version="1.35.5"; sha256="1w9x5ynbfglj620i4ffg3p18q16ig553rfd52j7r0adlx8w1hm9d"; depends=[BH Biobase BiocGenerics corpcor graph Rcpp rrcov]; };
+flowCore = derive { name="flowCore"; version="1.35.7"; sha256="1j7819bwyrphwwh6hkcjyc7f7yy5bv2sy1qfc66519wswjr90qzn"; depends=[BH Biobase BiocGenerics corpcor graph Rcpp rrcov]; };
 flowCyBar = derive { name="flowCyBar"; version="1.5.0"; sha256="160vyp9pglsrv23m0118506bikwzi2mm9b1qgsrxjnzls2lqvjfa"; depends=[gplots vegan]; };
 flowDensity = derive { name="flowDensity"; version="1.3.0"; sha256="1z8s1d4qwavi5z8zmvac9yqyd19sma18z1jl129w6sl5964spi86"; depends=[car flowCore GEOmap gplots RFOC]; };
 flowFP = derive { name="flowFP"; version="1.27.0"; sha256="15n57slfn0z4vzqhk38mfqzb22r6krafqyp11hv1xsllp8my2a5g"; depends=[Biobase BiocGenerics flowCore flowViz]; };
@@ -702,41 +709,42 @@ flowType = derive { name="flowType"; version="2.7.0"; sha256="0zrwf7h62jd5xgs0kq
 flowUtils = derive { name="flowUtils"; version="1.33.0"; sha256="0r7l8fbi3p1y7ql60czlqhxx4l0fzxv50phwkr5w85jxxldk2pjm"; depends=[Biobase corpcor flowCore flowViz graph RUnit XML]; };
 flowVS = derive { name="flowVS"; version="1.1.0"; sha256="0g1zmcr1wd3xccx2z1akwk177innzrngmxc5r4hjanl37l0skrpq"; depends=[flowCore flowStats flowViz]; };
 flowViz = derive { name="flowViz"; version="1.33.2"; sha256="11qbpf0yw1gjzgw3pb7mnqfvwd60nms4cwrwag8h36a5whfd158c"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
-flowWorkspace = derive { name="flowWorkspace"; version="3.15.12"; sha256="1fw5xg93x92acg2vimp6ks9sxqkqc4vbkghvj4shagnck2zjs0dw"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow plyr RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; };
-flowcatchR = derive { name="flowcatchR"; version="1.3.0"; sha256="0zgbnfh3sq6s8y81al379lrif67w5xffc6n3fd5y8bp2wmdqmx8b"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
+flowWorkspace = derive { name="flowWorkspace"; version="3.15.15"; sha256="1chjfhij0d4li1q2nz5yqwgmmd4vlf5rcg81z1zfs2kc3c19is18"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; };
+flowcatchR = derive { name="flowcatchR"; version="1.3.2"; sha256="1l1m709jfx6k13d9ayv9v355lhws6xnmz2bsklrzrkls25pfm04v"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
 fmcsR = derive { name="fmcsR"; version="1.11.4"; sha256="1ah1gyrhcyv4kqxi4n8yj14mgjh6v9l820k5hzb7fwbw74kh2pa5"; depends=[BiocGenerics ChemmineR RUnit]; };
 focalCall = derive { name="focalCall"; version="1.3.0"; sha256="1g3vk72xnzy2vsjjq7dnmmxiy29qg2bqij1iim9psb2zd6w387r5"; depends=[CGHcall]; };
 frma = derive { name="frma"; version="1.21.0"; sha256="0glsdwzlfba9j850s393jm6ada4j04nz4lilym81qvs9y9jccscp"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
-frmaTools = derive { name="frmaTools"; version="1.21.0"; sha256="1k5ghz0ddcypisw2l64cg3r9lhvvmdiv1gpbb9b56rw0sk27w0cr"; depends=[affy Biobase DBI preprocessCore]; };
+frmaTools = derive { name="frmaTools"; version="1.21.1"; sha256="13x1k763gdkh9mab1nvsa45z7b0v2q4ilvhv47fvwagi5r11jf5w"; depends=[affy Biobase DBI preprocessCore]; };
 gCMAP = derive { name="gCMAP"; version="1.13.0"; sha256="06qb51rxxjqanh92g0cj6kwnrcbgkc2f0slav2bxkh2rkrjpyvcn"; depends=[annotate AnnotationDbi Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
 gCMAPWeb = derive { name="gCMAPWeb"; version="1.9.0"; sha256="0xn1iyvrw3idhwszvipf3y69i1w1azr5hhgklg57v9wibnq02q9g"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
 gQTLBase = derive { name="gQTLBase"; version="1.1.1"; sha256="033lfnn0zkkkzay25fkj7wizyd63jxr2nkgga22iwm8ffjgpyac0"; depends=[BatchJobs BBmisc BiocGenerics doParallel ff ffbase foreach GenomicRanges S4Vectors]; };
-gQTLstats = derive { name="gQTLstats"; version="1.1.0"; sha256="1hc2lwvq5bzxjl7xap8ykr7ja9jxpp6ydalc582v2jz6r8yp0wx8"; depends=[AnnotationDbi BatchJobs Biobase BiocGenerics doParallel dplyr foreach gam GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gQTLBase IRanges limma reshape2 S4Vectors snpStats VariantAnnotation]; };
+gQTLstats = derive { name="gQTLstats"; version="1.1.1"; sha256="0sav44fxh5m9402gip2qaql4rm81ymw7339732nw2lrjk2vm7l7l"; depends=[AnnotationDbi BatchJobs Biobase BiocGenerics doParallel dplyr foreach gam GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gQTLBase IRanges limma reshape2 S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
 gaga = derive { name="gaga"; version="2.15.1"; sha256="17ccfnvrqq6p9dynlacxw4797n1h9773ilmsh53mzs52w1k2cybm"; depends=[Biobase coda EBarrays mgcv]; };
 gage = derive { name="gage"; version="2.19.0"; sha256="1g8i3w715s10azw7xyzq6gjmz5ilxll4qcf367jn6dwz8xnf15dr"; depends=[AnnotationDbi graph KEGGREST]; };
 gaggle = derive { name="gaggle"; version="1.37.0"; sha256="1429xffj08m3dgfp6z34ngwzaq0wyjm3wv3cwfxzl5pzzy200k41"; depends=[graph rJava RUnit]; };
 gaia = derive { name="gaia"; version="2.13.0"; sha256="10vpz16plzi651aj1f5h3iwz6nzrrdnl9sgx3sgv5wmks2haqij4"; depends=[]; };
 gaucho = derive { name="gaucho"; version="1.5.0"; sha256="0kl8fw1n6dkqmrjp0xri3w2fhx25llrjag7j50m2xh371zfw9chc"; depends=[GA graph heatmap_plus png Rgraphviz]; };
 gcrma = derive { name="gcrma"; version="2.41.0"; sha256="03ncgd26hmj4l0mnnif1cf5qg99ir66d0mafx7wamrr930m17v8x"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
-gdsfmt = derive { name="gdsfmt"; version="1.5.6"; sha256="0xncblhsfzwzxmki0mir6khpjb4d5sjc452br8jq0hp9khl9j937"; depends=[]; };
-geNetClassifier = derive { name="geNetClassifier"; version="1.9.2"; sha256="04k1j2hqbs75k250i8b17bb8b84mij0hyb3yk1jl1368mpn5vmhc"; depends=[Biobase e1071 EBarrays minet]; };
+gdsfmt = derive { name="gdsfmt"; version="1.5.9"; sha256="1j849lizdsyqqp8wyssk00jc0l3mqk0ya0p8ca005i11vz8rivv3"; depends=[]; };
+geNetClassifier = derive { name="geNetClassifier"; version="1.9.3"; sha256="1vcbh910g6hsgqian6kf4vd62bf16m3bbycg7rn69rd5nhyn9b8x"; depends=[Biobase e1071 EBarrays minet]; };
 geecc = derive { name="geecc"; version="1.3.0"; sha256="0s955yg31papyny42nnqq711hawk5nn3dqgsf24ldz93vjiif9dr"; depends=[gplots hypergea MASS]; };
 genArise = derive { name="genArise"; version="1.45.0"; sha256="07xyy6wa22sa0ziqvy1dvpmpq11j56aw70kvj834da003yvabmg1"; depends=[locfit tkrplot xtable]; };
 geneRecommender = derive { name="geneRecommender"; version="1.41.0"; sha256="0c06xg7jbcn4lnrkwgwwdjq383a7d34svf9cdqlaz5fc662nl5v0"; depends=[Biobase]; };
 geneRxCluster = derive { name="geneRxCluster"; version="1.5.0"; sha256="1m5jxv0qhm68iv6rwy91nkx2mz9b7zh9mdz98gva8mb6gm88iiig"; depends=[GenomicRanges IRanges]; };
 genefilter = derive { name="genefilter"; version="1.51.0"; sha256="0zrav2zw7v67i564v20y02cn2ycyk9ms8cnj2b2l7ajd1lq5cp9s"; depends=[annotate AnnotationDbi Biobase survival]; };
-genefu = derive { name="genefu"; version="1.19.0"; sha256="05rzq0dy4v7z57zqdg9v2csj3ncv2n76igbz2a9nvjpmqrgfcqlc"; depends=[amap biomaRt mclust survcomp]; };
+genefu = derive { name="genefu"; version="2.0.0"; sha256="0vrp2di9pz4xdy2shkl7ccc4ri19q2mv75xl9fkzkan4gnamlkbj"; depends=[amap biomaRt mclust survcomp]; };
 geneplotter = derive { name="geneplotter"; version="1.47.0"; sha256="03vl60rhhfh8imp0ihx83gq9r64gdnh2gjdm7pzi4yc03afqgaw8"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
 genoCN = derive { name="genoCN"; version="1.21.0"; sha256="10q16kch3gn6phx1zk3aii87f4liy5l6mp0kvjf29x6aam11l7c7"; depends=[]; };
-genomation = derive { name="genomation"; version="1.1.5"; sha256="0x4pgs7g46giv6z92hqa0fgq3fbw5p2jm5h8qzbwsvir3y7fnf79"; depends=[GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges plyr readr reshape2 Rsamtools rtracklayer]; };
-genomeIntervals = derive { name="genomeIntervals"; version="1.25.2"; sha256="145xg7pjihfg6qmjfmswf33hkxsnq8ml02x6s6y90giyxlmjqisk"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
+genomation = derive { name="genomation"; version="1.1.10"; sha256="1cxhap9h1g8a5q0jc7xpg00vcp9jrwqmn1v0vlh5ck54vnp672ks"; depends=[data_table GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr readr reshape2 Rsamtools rtracklayer]; };
+genomeIntervals = derive { name="genomeIntervals"; version="1.25.3"; sha256="14ql99gny196nl8ss3pb9m0277nczx6qj9sj2vhwfrr9q9c3ja9a"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
 genomes = derive { name="genomes"; version="2.15.0"; sha256="1a172fz97b6xg4w91dcjbdr9kx0grzf71qn2j7zlyz52dcqppybb"; depends=[Biostrings GenomicRanges IRanges RCurl XML]; };
-genoset = derive { name="genoset"; version="1.23.2"; sha256="0j23ym7v47fv2f2j25hfc4xh1113614ixdd1accx9gindbqf72cl"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
-gespeR = derive { name="gespeR"; version="1.1.0"; sha256="0hp2pw4z5kgj4av339v7r43is082c47ms422pwwa5f2pljijz2z6"; depends=[Biobase biomaRt cellHTS2 doParallel foreach ggplot2 glmnet Matrix reshape2]; };
-ggbio = derive { name="ggbio"; version="1.17.1"; sha256="1pc98v500l476sa1krxrj24lfsnbs13ws9hdix3vxfkbklvqjww7"; depends=[Biobase BiocGenerics Biostrings biovizBase BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-ggtree = derive { name="ggtree"; version="1.1.8"; sha256="1y9h93wn0zmmaz4hdn2xgz226y8pak0lnix5wvv1xax7myzhkbyl"; depends=[ape Biostrings colorspace EBImage ggplot2 gridExtra jsonlite magrittr reshape2]; };
+genoset = derive { name="genoset"; version="1.23.5"; sha256="1vs1yffrjmqz70qc9rbzrabv7271jrqyscb43g3dw5q1mjwifjvn"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+genotypeeval = derive { name="genotypeeval"; version="0.99.3"; sha256="1a0dxfdlcdxmsih8imhvd4mk40lzg9p8sryccqmycw360nwbxh1h"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; };
+gespeR = derive { name="gespeR"; version="1.1.2"; sha256="1mfsy2jca89qh22l95y8cd6bjgdss0p1zhprh87jq973w2saj1kf"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
+ggbio = derive { name="ggbio"; version="1.17.2"; sha256="09ffhppri2ibprpwps0zxsrpvbrymsnycriy4709x2ldp1ifjn9l"; depends=[Biobase BiocGenerics Biostrings biovizBase BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+ggtree = derive { name="ggtree"; version="1.1.13"; sha256="1vbv7qawd3zrppxlgy2gjf31q1v74ww8r2cn4w3q5dlv883pxcvm"; depends=[ape Biostrings colorspace EBImage ggplot2 gridExtra jsonlite magrittr reshape2]; };
 girafe = derive { name="girafe"; version="1.21.0"; sha256="11j9aiy6s5cdhwc9591vv344qnwlgn4hvwlp2rx47gccrnxxaqxi"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
-globaltest = derive { name="globaltest"; version="5.23.0"; sha256="1cwgqq5i3v6pp5kp4qi0jxqfh09zgaj719mk4kci3wxb18dc6ql7"; depends=[annotate AnnotationDbi Biobase multtest survival]; };
+globaltest = derive { name="globaltest"; version="5.23.1"; sha256="1zcyiixjia9lznaaksfb6mnwpsa4nsqzv92l86kgrvq9a5655pzd"; depends=[annotate AnnotationDbi Biobase survival]; };
 gmapR = derive { name="gmapR"; version="1.11.0"; sha256="0vn5iz44gcp4k0y5y4pjw6m60w75k82kv25hmnjshh8cpcwqkxkp"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
 goProfiles = derive { name="goProfiles"; version="1.31.0"; sha256="0nnc5idd3p969nhcsw2bjv7ws1qlb30sywhvpy8kcvk64wzz4jgw"; depends=[AnnotationDbi Biobase]; };
 goTools = derive { name="goTools"; version="1.43.0"; sha256="104xj0q1151ch0b4sswnky6shscx6fps25ycmig1s1ingd8dqnby"; depends=[AnnotationDbi]; };
@@ -745,7 +753,7 @@ gpls = derive { name="gpls"; version="1.41.0"; sha256="050db8ag8wpngfkw686r9vjvd
 gprege = derive { name="gprege"; version="1.13.0"; sha256="0z27521mjn5ipjq8wi3fbh2qw4k1q694l8268f8lypr9f357i1q4"; depends=[gptk]; };
 graph = derive { name="graph"; version="1.47.2"; sha256="0db15kd5qf993qdbr7dl2wbw6bgyg3kiqvd1iziqdq6d2vvbpzbj"; depends=[BiocGenerics]; };
 graphite = derive { name="graphite"; version="1.15.1"; sha256="1q3ybshd9yxivs1b5vj659c45qa8bf7r1dy3idg8g7glh9f2bgnl"; depends=[AnnotationDbi BiocGenerics graph]; };
-groHMM = derive { name="groHMM"; version="1.3.0"; sha256="0kx574xs0k51wwkvm6rbrrgr76ziwkkyqhiy076yzfsfkm3d1jvf"; depends=[GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
+groHMM = derive { name="groHMM"; version="1.3.1"; sha256="1bwa2dc2hmp34grl1ki8wzqn5v12afrmcw0igdiv4j8sfgybw3w7"; depends=[GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
 gtrellis = derive { name="gtrellis"; version="1.1.1"; sha256="17jflcq97a3a7k735klj6pphn6ixyshggwi0n7b45jgkqi9j5s08"; depends=[circlize GetoptLong]; };
 gwascat = derive { name="gwascat"; version="2.1.4"; sha256="13hvh6rvlh13n9dxx9g1q68qz4mxsvv4sh0kc1931b3vz2mfs0m0"; depends=[AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicRanges gQTLstats Gviz IRanges Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
 h5vc = derive { name="h5vc"; version="2.3.0"; sha256="1cl00k13x03sm60gfkxmaf6ba9kw4186cnik08zn446fipxqypla"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges reshape rhdf5 Rsamtools S4Vectors]; };
@@ -775,10 +783,10 @@ inSilicoDb = derive { name="inSilicoDb"; version="2.5.0"; sha256="1w5irx042z8if0
 inSilicoMerging = derive { name="inSilicoMerging"; version="1.13.0"; sha256="0zaqwachxn3anbjyn0akv0n2djg08475cdxz7c44ja635r1f6y1j"; depends=[Biobase]; };
 intansv = derive { name="intansv"; version="1.9.0"; sha256="0vb5hls1yyw0x0ff2xcjmxplg0gar9g9xvs1bqw96bf9akcr12r9"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
 interactiveDisplay = derive { name="interactiveDisplay"; version="1.7.2"; sha256="1ql4qr5m1xsn3z57p2ndfc4b0zmxgjj0d3gb937ikfljm43jkwyk"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
-interactiveDisplayBase = derive { name="interactiveDisplayBase"; version="1.7.0"; sha256="0032ljfx6pj0c11imfhxsxvrcn3gwyb6j29xl8xv48x8z44r0vas"; depends=[BiocGenerics shiny]; };
+interactiveDisplayBase = derive { name="interactiveDisplayBase"; version="1.7.1"; sha256="00b32z45xh0n1hrj166ax71p2aka3df9b2440wq0zribb9jf1s02"; depends=[BiocGenerics shiny]; };
 inveRsion = derive { name="inveRsion"; version="1.17.0"; sha256="1km1h75dh5q505x1ddlhvyqxy4c10wvlviiz2l8sv3g3m9mbd26h"; depends=[haplo_stats]; };
 iontree = derive { name="iontree"; version="1.15.0"; sha256="0frq4f357n5w08nwz3m7s0hv858kgcnlvxb4907yrg1b11zpfvmm"; depends=[rJava RSQLite XML]; };
-isobar = derive { name="isobar"; version="1.15.0"; sha256="0zkj2i1hhs9nwflnwidzpnqcs08vbv3vqwz244shs9i7h0c5fd16"; depends=[Biobase distr plyr]; };
+isobar = derive { name="isobar"; version="1.15.1"; sha256="1i4zlfxbx94yb70bvd3wzlald2fi9ix4bhdlyim490rcdhb0lhyr"; depends=[Biobase distr plyr]; };
 iterativeBMA = derive { name="iterativeBMA"; version="1.27.0"; sha256="18g04l2bksjc2563kd2fmjygpci6pdw9lxv4ax0kpbfvc7zwbz17"; depends=[Biobase BMA leaps]; };
 iterativeBMAsurv = derive { name="iterativeBMAsurv"; version="1.27.0"; sha256="1l36lmxlwq16kzh8i8nbi8bbrgqc7im1b5pcc170q89x6rfgvyf7"; depends=[BMA leaps survival]; };
 jmosaics = derive { name="jmosaics"; version="1.9.0"; sha256="00c84fh5798yyzmsy985b79fcf2yz8y8am13dj7xgnzxl5nj32v1"; depends=[mosaics]; };
@@ -787,15 +795,15 @@ kebabs = derive { name="kebabs"; version="1.3.3"; sha256="10pnr5fd2ni4w69qp30q81
 keggorthology = derive { name="keggorthology"; version="2.21.0"; sha256="1d3dz61llgmdnyqxqwv03pacfs97lzynzpjpmn7grf7bbpybjk2q"; depends=[AnnotationDbi DBI graph]; };
 lapmix = derive { name="lapmix"; version="1.35.0"; sha256="1sps41l210h782bry6n8h55ghnlqn7s5dx0bx2805y5izz01linm"; depends=[Biobase]; };
 les = derive { name="les"; version="1.19.0"; sha256="1b3zcvflwyybrh9pf33a0fn5qz6918sszjf0n666iqd3hh7zph8z"; depends=[boot fdrtool gplots RColorBrewer]; };
-limma = derive { name="limma"; version="3.25.12"; sha256="1gl13qnbj4w2bzdxf1ml603r1ccyq0wv1ynlrgb8j9sa7z228ri9"; depends=[]; };
-limmaGUI = derive { name="limmaGUI"; version="1.45.0"; sha256="05pqzb5nq3paddq2zw80gvdaf8rvynga8zs24rwzjpz3ylakqngr"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+limma = derive { name="limma"; version="3.25.14"; sha256="136pvfqqf9jwdir543wblrv6z4fpha5x2dbwldj980yhj4aqz76d"; depends=[]; };
+limmaGUI = derive { name="limmaGUI"; version="1.45.2"; sha256="1s1dn14d5yhmfqj4r3kaxavpxaxsjw2492fpijgq0v8dnwqhz190"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
 lmdme = derive { name="lmdme"; version="1.11.0"; sha256="0j41rfvbhz31vniax7njnslxd94lws4jjfv3hc2s1ihxnj41dcma"; depends=[limma pls]; };
 logicFS = derive { name="logicFS"; version="1.39.0"; sha256="1sz4bxsg76437j42i6cpbqvj5a35q7dwhya4yh1gmknqjrrcrv56"; depends=[LogicReg mcbiopi]; };
 logitT = derive { name="logitT"; version="1.27.0"; sha256="13gglwkvwrc5xr44ynz10qzyksry0wamk9mjlsfb18c2ncbnyypq"; depends=[affy]; };
 lol = derive { name="lol"; version="1.17.1"; sha256="0adj2bg8akb3z0w3wqj6bdlypf9c587k5c2npx0l21hgy4qv7p8k"; depends=[Matrix penalized]; };
 lpNet = derive { name="lpNet"; version="2.1.2"; sha256="0qy2ardh00gf3xkhqphvmdsnsxa4pjrdpcxpjs53nw68bcsbgy9g"; depends=[lpSolve nem]; };
 lumi = derive { name="lumi"; version="2.21.2"; sha256="0nfkzf11lnpvyqng8ns6nf23qkap04fir8cbqngnzm6yddfk33dq"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
-mAPKL = derive { name="mAPKL"; version="1.1.0"; sha256="1knjvwd0z4i70py0dqcngz56j78ylhcxsw8dyxj80ns5jzsdppbx"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene]; };
+mAPKL = derive { name="mAPKL"; version="1.1.1"; sha256="1wya7fhr6xbjdc61q0hk7k2y3iivashdksqj6b8459c9cr1mn5sl"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene]; };
 mBPCR = derive { name="mBPCR"; version="1.23.0"; sha256="0c0idj213l8gwxkh9sb03dr4jhlbwvkpghldccbjrqnk4jqs4zpp"; depends=[Biobase oligoClasses SNPchip]; };
 mQTL_NMR = derive { name="mQTL.NMR"; version="1.3.0"; sha256="05q3p6pxi5x89z3zyrvdv5p2lzwr3as3zwcg8k0zm70liyczqcbx"; depends=[GenABEL MASS outliers qtl]; };
 maCorrPlot = derive { name="maCorrPlot"; version="1.39.0"; sha256="14p6cliik2ar0x8q4x66p43lsdbz11sqa7szafqvk7aw3pbszgh4"; depends=[lattice]; };
@@ -823,27 +831,28 @@ metabomxtr = derive { name="metabomxtr"; version="1.3.2"; sha256="0wbpb79k9026ql
 metagene = derive { name="metagene"; version="2.1.0"; sha256="0fk7cgf96g1ax009g6f45jppb0w80akv5n3iwaaryy5b9pvsfk21"; depends=[BiocParallel biomaRt GenomicAlignments GenomicRanges ggplot2 gplots muStat R6 Rsamtools rtracklayer]; };
 metagenomeSeq = derive { name="metagenomeSeq"; version="1.11.10"; sha256="0b9vylijb6gzri61qn8wkj9si1zrgznzqhxzib1aw9y71v8y8k05"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
 metahdep = derive { name="metahdep"; version="1.27.0"; sha256="0kjd27brcvhfqbqk9r3fclbzf2np2zj88gi522y1c6vh3pc6fd22"; depends=[]; };
-metaseqR = derive { name="metaseqR"; version="1.9.0"; sha256="0p8bpnjm73jkng2xrypnz14rmrw1pppkrx1r88vnx33hzpkx83zx"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
+metaseqR = derive { name="metaseqR"; version="1.9.1"; sha256="1qaa28wnvafi7239lla8xfi8kxxwvi6ar684fg8f5a98s8vjk8i2"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
 methVisual = derive { name="methVisual"; version="1.21.0"; sha256="18kin1ibcc4ilfh59qgb0zilhvhvs0a1gmbg0lbvj2r0kbsk1ryy"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
 methyAnalysis = derive { name="methyAnalysis"; version="1.11.0"; sha256="0ka0svxvb76j0xkdx4pbwf2cyplihh45mb953csrapyh5r6hxwkn"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi rtracklayer S4Vectors VariantAnnotation]; };
 methylMnM = derive { name="methylMnM"; version="1.7.0"; sha256="08y13kkmafn2h55wwkgs1mpskb4i2wpxzzgjdr9gb3ns06qc9799"; depends=[edgeR statmod]; };
 methylPipe = derive { name="methylPipe"; version="1.3.4"; sha256="17y9xsvl6wgm7kn8g35h3zh7bcqhy7qp2lia6dzx609i04a9br9f"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
 methylumi = derive { name="methylumi"; version="2.15.2"; sha256="174hikk5flwylifv7n8n67aps4np06klw240bdzfr347r8yrvikp"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
 mgsa = derive { name="mgsa"; version="1.17.0"; sha256="1nic4bgk3g3j2l6vr3i3msmid2bz0n7bq8f8zq26n45sr37wb4wq"; depends=[gplots]; };
+miRLAB = derive { name="miRLAB"; version="0.99.2"; sha256="0q255w5myzv9hg27xz4k3ykxf6arpr3nf28ykf23szcw8p01dc80"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; };
 miRNApath = derive { name="miRNApath"; version="1.29.0"; sha256="07r37gzn0y5cp4awj2i638i2cn019rnp7b4hnaqi3gc71sdzb25c"; depends=[]; };
 miRNAtap = derive { name="miRNAtap"; version="1.3.0"; sha256="0hmnhbbai04wp8hxrpgq04czfx2c49aihq7iiz86x9hzlj6xhgn6"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
 microRNA = derive { name="microRNA"; version="1.27.0"; sha256="1akq1yxc03v7jmpypmr8a9lx5h2nfdjp1y0433lyffbd49wia2gm"; depends=[Biostrings]; };
 minet = derive { name="minet"; version="3.27.0"; sha256="1wnn3nlpa0ymk465ax2s65i3w9xplhwssvng9qs7p3v2z72p9nqp"; depends=[infotheo]; };
-minfi = derive { name="minfi"; version="1.15.9"; sha256="1q21b57iw8lbzbjq96qmlmccijz0apr9clasrz4nbmbgyn97gba2"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust mixOmics nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
+minfi = derive { name="minfi"; version="1.15.11"; sha256="14j5vw6vmfz2h85n4dmsnx7138mxwzfl961p8y5wh1brz4vr31iy"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust mixOmics nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
 mirIntegrator = derive { name="mirIntegrator"; version="0.99.5"; sha256="0r8l1lgf9rdxnr0dvc8r05ahjf3q0r4syy9mzx4p3f04s0c78q3h"; depends=[AnnotationDbi ggplot2 graph Rgraphviz ROntoTools]; };
 missMethyl = derive { name="missMethyl"; version="1.3.2"; sha256="05xk70z813jgwz9darqwh0f9ybycq9krig486b3751dd0xnjgmcq"; depends=[limma methylumi minfi ruv statmod stringr]; };
 mitoODE = derive { name="mitoODE"; version="1.7.0"; sha256="182ifqh1g1yz8rbsxdqgk4hzlz3dwy0d03iklbg39cxy6qhgxqg4"; depends=[KernSmooth MASS minpack_lm]; };
 mmnet = derive { name="mmnet"; version="1.7.0"; sha256="0za8a3j2fzyi15hd7l3ccw5qy3lyl7vihbcbixaw2kb81hmpphsa"; depends=[Biobase biom flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; };
-mogsa = derive { name="mogsa"; version="1.1.3"; sha256="0rzqlm0c4skjgic334nfd2s7p0xk86mv1zbwjk036nwf5lnmdd0i"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
+mogsa = derive { name="mogsa"; version="1.1.5"; sha256="1xn2rrp9s3d84i7ln37iblnxadl1dsi7qd98k5xz71kq0v1ljpy4"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
 monocle = derive { name="monocle"; version="1.3.0"; sha256="1ir0f80nsrvpl4i441irprd4pk1f53dxf1jnvnjg5zrkj7dz3wrw"; depends=[Biobase BiocGenerics cluster combinat fastICA ggplot2 igraph irlba limma matrixStats plyr reshape2 VGAM]; };
 mosaics = derive { name="mosaics"; version="2.3.0"; sha256="1jv5sv6xyh5i5m7kypgwc5g3sfsf0n5n683gijxcvrrwpvvfpnqy"; depends=[IRanges lattice MASS Rcpp]; };
 motifRG = derive { name="motifRG"; version="1.13.0"; sha256="01k47padfs393pprjyz9pp9z6vjqlxi6x10y51mhg0anqfb1sar2"; depends=[Biostrings BSgenome IRanges seqLogo XVector]; };
-motifStack = derive { name="motifStack"; version="1.13.3"; sha256="08ddwy3yyydxaxs6qfh99va3v7xx57kq1pizqknxaar0p79x278w"; depends=[ade4 Biostrings grImport MotIV scales XML]; };
+motifStack = derive { name="motifStack"; version="1.13.6"; sha256="0yp3k22i35hdmx5b5a9dk9mkdvglry6s8ck57gsl039ypf58kpja"; depends=[ade4 Biostrings grImport MotIV scales XML]; };
 msa = derive { name="msa"; version="1.1.1"; sha256="0nqgx1zb3n8kk2l3dgilsamwzadnddif39q5br7qs9xl38hag4nr"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
 msmsEDA = derive { name="msmsEDA"; version="1.7.0"; sha256="1hywj0vvrqq1zg62gr1rk4sblm201hgwz5kd78819apw5jf50fwd"; depends=[gplots MASS MSnbase RColorBrewer]; };
 msmsTests = derive { name="msmsTests"; version="1.7.0"; sha256="1qvi91shpy02irppq6g6lq43sp3rk2j7n1nfnm2p9767rdhbj13b"; depends=[edgeR msmsEDA MSnbase qvalue]; };
@@ -852,14 +861,14 @@ multiscan = derive { name="multiscan"; version="1.29.0"; sha256="0rp1nc8vjr8b0v9
 multtest = derive { name="multtest"; version="2.25.2"; sha256="1gby3am0rp62lsijhbr8yx8y457yhrv2ghdb41kl53r59mw8ba4z"; depends=[Biobase BiocGenerics MASS survival]; };
 muscle = derive { name="muscle"; version="3.11.0"; sha256="1s3apdcd0qj08bswn7smj7b93yv9qar7wrzyfkp5z3m16jgz979x"; depends=[Biostrings]; };
 mvGST = derive { name="mvGST"; version="1.3.0"; sha256="1chskyx9hgymxg57p6y98rw743lapssx18axvl0r9f2zsmmfz9bn"; depends=[annotate AnnotationDbi GOstats gProfileR graph Rgraphviz stringr topGO]; };
-mygene = derive { name="mygene"; version="1.5.1"; sha256="0f1ck375fqbz3ydjjg9qd9av8jbpc840nv3j83qic8g3r2pck8ij"; depends=[GenomicFeatures Hmisc httr jsonlite S4Vectors sqldf]; };
+mygene = derive { name="mygene"; version="1.5.2"; sha256="0x40bnll85v94dnfpqrs8d9kx0zmdjbvgnqhcin1k9bshxqkypd9"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; };
 mzID = derive { name="mzID"; version="1.7.1"; sha256="1pp0zfffz91g16y1kr81mbham64g00mm3q539ykj5az34g5q1fcm"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
-mzR = derive { name="mzR"; version="2.3.1"; sha256="19piyqgdxpi777nd4860d6mp0g4zzcf3wf7q7ilm99jqav9lfrn8"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
-ncdfFlow = derive { name="ncdfFlow"; version="2.15.2"; sha256="0s65c26r6q8di73iwpkrx4g3d9dy6v18vna7yy7di5vsgy0phr9l"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
+mzR = derive { name="mzR"; version="2.3.2"; sha256="0hl3g2fn90lpka5r96cfzcw3msw8wnvq6d52p5axhb1214v5zpr6"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
+ncdfFlow = derive { name="ncdfFlow"; version="2.15.3"; sha256="0xhqis5pj5m4ib4xpkgg1afxzjc1827jw5k569aijr11qmi6jjxw"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
 neaGUI = derive { name="neaGUI"; version="1.7.0"; sha256="198b0vrr5qp66z4sccwy6rh8sjxpw3qjkdryygg1baxq91ra76p1"; depends=[hwriter]; };
 nem = derive { name="nem"; version="2.43.0"; sha256="1d357gh8binh0fwg1z0mzjzq3nyhazg9dnnf7aqk6gjfgsjda9i8"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
 netbenchmark = derive { name="netbenchmark"; version="1.1.6"; sha256="07q5a9kxq5r0ch32q68vxb4gxl6r5zhw6d06b8c89h42cby2qdfp"; depends=[c3net GeneNet minet PCIT pracma randomForest Rcpp]; };
-netbiov = derive { name="netbiov"; version="1.3.0"; sha256="0d6xc74ivzvi0n9ndfgc0m9y79mwdbs344lxv9nps4igd7aaxh34"; depends=[igraph]; };
+netbiov = derive { name="netbiov"; version="1.3.1"; sha256="1v1iddwgz7nn0flgald0nrg96wm8pvdlwjnh8bql8y5x5sm58lmv"; depends=[igraph]; };
 nethet = derive { name="nethet"; version="1.1.0"; sha256="1xklqhwfmv1sk5h3x2g1jjbl5higrzhfj0mvap15vr2agax5hbg5"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
 netresponse = derive { name="netresponse"; version="1.19.0"; sha256="0blgcfbhwns4khnsd3m2yafmihr63kh3zsf7imphim0cdrx67xks"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape Rgraphviz]; };
 networkBMA = derive { name="networkBMA"; version="1.11.0"; sha256="09wf696s8n30nnadfds58flv8sv2gamgnw6pzz80isfc3178h1n6"; depends=[BMA Rcpp RcppArmadillo RcppEigen]; };
@@ -874,12 +883,12 @@ oligoClasses = derive { name="oligoClasses"; version="1.31.1"; sha256="0likyfm4x
 omicade4 = derive { name="omicade4"; version="1.9.3"; sha256="00dr419qd563d75srypc02j6m5v281995mrh0r6fylz5bmi9bbks"; depends=[ade4 made4]; };
 oneChannelGUI = derive { name="oneChannelGUI"; version="1.35.0"; sha256="1diclgl4zkzzyz705cyqx983bw4zqw03rx7fn9515w0ifl0bk1r4"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; };
 ontoCAT = derive { name="ontoCAT"; version="1.21.0"; sha256="10d0a0fxg2h9gf6d1jbilxxg8irbqb1k526689qkdn2zh0qjvv04"; depends=[rJava]; };
-openCyto = derive { name="openCyto"; version="1.7.2"; sha256="1x92yam7zdmsf6x0xqydwz70qmh3gzzi64mbiwrihr8abcjmhjhd"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
-oposSOM = derive { name="oposSOM"; version="1.5.2"; sha256="0zvclv05sfgk0mq169igaqhqmx2hqj3iwrxrjgryy276xjywhxcr"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
-pRoloc = derive { name="pRoloc"; version="1.9.3"; sha256="09pi362w1vfcx6fsr6bbsjqq9wq93dzhw0myavxsj11g3pnqh66n"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
-pRolocGUI = derive { name="pRolocGUI"; version="1.3.0"; sha256="1k7r8fhj4fqizk1w76mfcdd9sj3y7vxiq3kzfrkbk674gl1jsgmq"; depends=[MSnbase pRoloc shiny]; };
+openCyto = derive { name="openCyto"; version="1.7.4"; sha256="1q07s7rv19yahlpjpvsrhbvld6n2bf7jv7lfrgs6syfl3fwrs008"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
+oposSOM = derive { name="oposSOM"; version="1.5.4"; sha256="0f06wmy1n9gl41x4x7q1fcfxaw6y6qkrmb4ypg9j6v7xjhjpfj03"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
+pRoloc = derive { name="pRoloc"; version="1.9.6"; sha256="01gk4xnij5l4sk0c4km94i5b26vjfm8qhh3irb7xwfijank7mxd9"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
+pRolocGUI = derive { name="pRolocGUI"; version="1.3.2"; sha256="08q1cavlxryx9isn2wsw8r0bv795hgzkyfx95ycxxdwh6vdvnnyl"; depends=[DT MSnbase pRoloc scales shiny]; };
 paircompviz = derive { name="paircompviz"; version="1.7.0"; sha256="0sf80ji20q6kaqw2747an9b51xxwhl55yj5y7q6j68gif1ndkzl4"; depends=[Rgraphviz]; };
-pandaR = derive { name="pandaR"; version="1.1.0"; sha256="03aa0s1mifq5hyg4xshbjqz9javphgb11135zvfg8cqdq34dzg4m"; depends=[]; };
+pandaR = derive { name="pandaR"; version="1.1.1"; sha256="0rp8qk5cn5zj0nypkhmxjpja6lkjxd3hw2dkl4gaisayhiqlfk3g"; depends=[igraph matrixStats]; };
 panp = derive { name="panp"; version="1.39.0"; sha256="163yii12bhw0skzhwrjbavpsgsl2aygj8x9cilzj9pqsqakvinna"; depends=[affy Biobase]; };
 parglms = derive { name="parglms"; version="1.1.0"; sha256="1msk5ygl030rczm10rp9xnb461cbzcs7qqk6jqk8xhv5dycnwnbd"; depends=[BatchJobs BiocGenerics BiocParallel]; };
 parody = derive { name="parody"; version="1.27.0"; sha256="06lrzix8ydc41siy21fqkf3z6krj07p5v38pzan8jzzhqpwlq4iz"; depends=[]; };
@@ -890,7 +899,7 @@ paxtoolsr = derive { name="paxtoolsr"; version="1.3.1"; sha256="0pv4zcl12yxidiy3
 pcaGoPromoter = derive { name="pcaGoPromoter"; version="1.13.1"; sha256="0a1yfi16sadp5fj112mlq9har0yggp8amn8v4v18jzfrb8aiacsj"; depends=[AnnotationDbi Biostrings ellipse]; };
 pcaMethods = derive { name="pcaMethods"; version="1.59.0"; sha256="12b8qdd38xgpzisz0lm9xkwq22z5ciq7b8i11z3na1wynvim3nll"; depends=[Biobase BiocGenerics MASS Rcpp]; };
 pcot2 = derive { name="pcot2"; version="1.37.0"; sha256="023ly5jgq8zc7k73mfqvra13mask54l7f62dznjh1dcjpv6xgw4p"; depends=[amap Biobase]; };
-pdInfoBuilder = derive { name="pdInfoBuilder"; version="1.33.1"; sha256="1vyw3ggh247km4qag1gy3wz9v338na4hlxmqz57mv51gp7fw6v1l"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
+pdInfoBuilder = derive { name="pdInfoBuilder"; version="1.33.2"; sha256="026l6klpf93h42xgrbjyl022l0d0722gp7cqqgq4j8nb0wydg8l2"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
 pdmclass = derive { name="pdmclass"; version="1.41.0"; sha256="0361s7d6n9wn65pxks3alr8ycqjcgv9dvvb2n9xqiqawyki1nvpm"; depends=[Biobase mda]; };
 pepStat = derive { name="pepStat"; version="1.3.0"; sha256="003gqcs5m5b8mil9r1ydadhcc086nqmdk6i1xz4kkdpkcyxbyz7p"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
 pepXMLTab = derive { name="pepXMLTab"; version="1.3.0"; sha256="0rbcj59vsbq8zqxq4h1v077jgpz7l607zalc4lhw9yn8l5lij4j8"; depends=[XML]; };
@@ -934,8 +943,9 @@ qusage = derive { name="qusage"; version="1.9.0"; sha256="1dg8qchhqfvak5cqjs9v30
 qvalue = derive { name="qvalue"; version="2.1.0"; sha256="0qgsqjb90qnf5a77n3zf5dcb5agdbj4hlk3swh1hrjg9iqcs76g0"; depends=[ggplot2 reshape2]; };
 r3Cseq = derive { name="r3Cseq"; version="1.15.0"; sha256="0pi5aq3dbivk23x6axwbqa4danbsvn623icw6xvlh3i71v8m5rkw"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
 rBiopaxParser = derive { name="rBiopaxParser"; version="2.7.0"; sha256="1ni8kaivdxqxv8fj2qf5vnwzmmamfd073l1p4072pnfxpn7rn0p4"; depends=[data_table XML]; };
+rCGH = derive { name="rCGH"; version="0.99.7"; sha256="1bn8rwln7zh686hz87zz3ymv5lylk64xfmwjj357q7kx5r75n2hz"; depends=[aCGH affy AnnotationDbi BiocGenerics DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 lattice limma mclust plyr RUnit shiny]; };
 rGADEM = derive { name="rGADEM"; version="2.17.0"; sha256="1xwypnpf7sdaqszfmallgg2314g866xbi9q342yhds2fkiw9sp65"; depends=[Biostrings BSgenome IRanges seqLogo]; };
-rGREAT = derive { name="rGREAT"; version="1.1.0"; sha256="1rd4cjwh4rrqgfg15k32br0iv15j99797z7lx7789wc1zxkpzvg3"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
+rGREAT = derive { name="rGREAT"; version="1.1.2"; sha256="0wwwpbxp8263jgkja6szcwqvijig8cfxdb66hvjqq69h9lqg9bkx"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
 rHVDM = derive { name="rHVDM"; version="1.35.0"; sha256="0y2vm6xsdsz174xrs22p54z5f5rxqcx937yf02ilv0bnfa0r06hj"; depends=[affy Biobase minpack_lm R2HTML]; };
 rMAT = derive { name="rMAT"; version="3.19.0"; sha256="0nhmf1hbiqwzb9035405f8asnhh2ywj4bm9wdlgbafyhiw6qik98"; depends=[affxparser Biobase BiocGenerics IRanges]; };
 rRDP = derive { name="rRDP"; version="1.3.0"; sha256="0q373nfs4ynjnmq9rp0c0ficnnylwb2gf1j0bzlnxcd2cwz215zv"; depends=[Biostrings]; };
@@ -943,7 +953,7 @@ rSFFreader = derive { name="rSFFreader"; version="0.17.1"; sha256="105qlrjq4777k
 rTANDEM = derive { name="rTANDEM"; version="1.9.0"; sha256="08r73kv83w8rfglbqf2zvczj4yix7sfhvrz93wk22nry04jfgccr"; depends=[data_table Rcpp XML]; };
 rTRM = derive { name="rTRM"; version="1.7.1"; sha256="06p38i0hif1kjsy4xa88jhfl5giprq8gfa15zh1yv1qdqhaf1v1m"; depends=[AnnotationDbi DBI igraph RSQLite]; };
 rTRMui = derive { name="rTRMui"; version="1.7.0"; sha256="132cm40hxhb4apdidifbw90jyxhlz0dqxgqsr6awv8q6dy9jpfw4"; depends=[MotifDb rTRM shiny]; };
-rain = derive { name="rain"; version="1.3.0"; sha256="0ak8wbhsglnylzy1jzh9hb2yxqjzmspvj98x10vf3qmgbqc30i4y"; depends=[gmp multtest]; };
+rain = derive { name="rain"; version="1.3.1"; sha256="0hzfrab9b67wk9kkkx7bn1w2imhlq4j8mi3fch3ij42081g8plww"; depends=[gmp multtest]; };
 rama = derive { name="rama"; version="1.43.0"; sha256="1siqzb0b9j51b06aijz85xn6c9v4dqvcw7scmrlfpf18dihqaig1"; depends=[]; };
 randPack = derive { name="randPack"; version="1.15.0"; sha256="0m9729h3fia15rcgxznz4hmlz7abz8xkbn1ffc3l8qhqks5j50f7"; depends=[Biobase]; };
 rbsurv = derive { name="rbsurv"; version="2.27.0"; sha256="1v97vrralg445zn8s3km7vmhlxhkv8bdwcj90fyvd6kfk7gm4xc7"; depends=[Biobase survival]; };
@@ -953,16 +963,17 @@ regionReport = derive { name="regionReport"; version="1.3.8"; sha256="0gpifx0x2k
 regioneR = derive { name="regioneR"; version="1.1.1"; sha256="1wylrkqiv5lc9rw3mc1by88ckx437jwhlgyg5kasvpry003rm72c"; depends=[BSgenome GenomicRanges memoise rtracklayer]; };
 rfPred = derive { name="rfPred"; version="1.7.0"; sha256="0k1z7bqdjmm668kipz8c74kd9k1vw2pcjbirxdi88clrclz3i47y"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
 rgsepd = derive { name="rgsepd"; version="1.1.0"; sha256="1rvzlzh43j3sj2vrhmg13hl4wq3bg9hml3xq2dpx28lapynywm41"; depends=[AnnotationDbi biomaRt DESeq2 GenomicRanges goseq gplots hash]; };
-rhdf5 = derive { name="rhdf5"; version="2.13.4"; sha256="0vby0cpsc22jrq37p3sxj6f3q0l238d28lx0p558mh8nks9fkai1"; depends=[zlibbioc]; };
+rhdf5 = derive { name="rhdf5"; version="2.13.5"; sha256="1k2hjzzj2irs7jap7g4ys0gd3iymnnbbyvyv986y9pq68p4f1nr0"; depends=[zlibbioc]; };
 riboSeqR = derive { name="riboSeqR"; version="1.3.0"; sha256="0jlh5q1hkxkfvy496hlbwfkl17k36n304yiyz9f0azq5kv7jz1y2"; depends=[abind GenomicRanges]; };
 rnaSeqMap = derive { name="rnaSeqMap"; version="2.27.0"; sha256="1638vikgizcgg4bpfm61ak98smwy74dk5hyx73qjbisd49zvy5nk"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
-rnaseqcomp = derive { name="rnaseqcomp"; version="0.99.3"; sha256="0gyz91ayyr1834hr6jg1bnjiiiw4k75j3kn5pfmw9q8v9vg2fcsj"; depends=[RColorBrewer]; };
+rnaseqcomp = derive { name="rnaseqcomp"; version="0.99.4"; sha256="0m3xz7fnry89i7b4f51x90mwiqlv2z4d3p2r41mdm4xvwmqj4ghf"; depends=[RColorBrewer]; };
 roar = derive { name="roar"; version="1.5.2"; sha256="0g0ylr49dvnbyb1kwj20hrh3y3x49n4rbdvg7mpdg1byrygcli3c"; depends=[GenomicAlignments GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
 rols = derive { name="rols"; version="1.11.6"; sha256="0wgzvwfq677dkqzzcq071xbh6v47vkcrzw66ch1vg348pcj58z0f"; depends=[Biobase XML]; };
+ropls = derive { name="ropls"; version="1.1.2"; sha256="06z0ay0rdaawyvpy7dbdpxkwa8311rlb9plk4v52v830zibamhvs"; depends=[]; };
 rpx = derive { name="rpx"; version="1.5.1"; sha256="048qldpx4zsp55jkr8g8vljiyidm9kzv4p1vwh1983y38qbz882v"; depends=[RCurl XML]; };
 rqubic = derive { name="rqubic"; version="1.15.0"; sha256="19n613m7x48wkrfrhnd0ab9018m5dd7rf08qjbgphakwycssfgcw"; depends=[biclust Biobase BiocGenerics]; };
 rsbml = derive { name="rsbml"; version="2.27.0"; sha256="10qmv5gpgqffnr5wqh7zik0l2d1cg0c0m3xak4r4bqmsd1y4dw01"; depends=[BiocGenerics graph]; };
-rtracklayer = derive { name="rtracklayer"; version="1.29.12"; sha256="0gz3284d5cy3n0hr5w7x86lraryfi2jdg1yzj2jg6cq0hgga40c1"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
+rtracklayer = derive { name="rtracklayer"; version="1.29.13"; sha256="04f7fxl5k7yl4jr4la57k1z613m39zvrmrf8n5pmdy0j25lxk2z6"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
 sRAP = derive { name="sRAP"; version="1.9.0"; sha256="0rvnq41gns4ccr6gnfw0xbbi2c2wjl14qh0yr7wj7s4yrxzqr866"; depends=[gplots pls qvalue ROCR WriteXLS]; };
 sSeq = derive { name="sSeq"; version="1.7.0"; sha256="0wcw77cz47wklwsrwwimwryqmyc0lrd9mk2aawk0vx1zkqci1yca"; depends=[caTools RColorBrewer]; };
 safe = derive { name="safe"; version="3.9.0"; sha256="0x1gdzpgrm4m2m64h6y5rayp64j6ckxlr081d3w46zvfb935294a"; depends=[AnnotationDbi Biobase SparseM]; };
@@ -970,7 +981,7 @@ sagenhaft = derive { name="sagenhaft"; version="1.39.1"; sha256="15aimbx6wn4il0j
 sangerseqR = derive { name="sangerseqR"; version="1.5.0"; sha256="0wiqaqzn6n63k1389nqj35k5wn93bq7c99gayblwjrhks0y9fll0"; depends=[Biostrings shiny]; };
 sapFinder = derive { name="sapFinder"; version="1.7.0"; sha256="1xg3scw5ijm1z2l4ha4ik52s97vr10plr9ifs9rdk2l6vh8na6kh"; depends=[pheatmap Rcpp rTANDEM]; };
 saps = derive { name="saps"; version="2.1.0"; sha256="0r6525n8ksxaa5dcvs9419bca1v369251psvwphfsdnfa4xg2n14"; depends=[piano reshape2 survcomp survival]; };
-savR = derive { name="savR"; version="1.7.4"; sha256="1v0rzrh27yl0fx5gcwb04yq2vln3ngisg59614qmmdppc36qf5k6"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
+savR = derive { name="savR"; version="1.7.5"; sha256="0pdkf8rkqd3fl1p8h1adfixmi0fgj1hwfbn2qn5y326w6aq6cqrs"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
 scsR = derive { name="scsR"; version="1.5.0"; sha256="1n9clp1ldspxbrv4chihv1xhw2fmys13p884cmn037xhwv5b7j3r"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
 segmentSeq = derive { name="segmentSeq"; version="2.3.1"; sha256="005b9a7rhhhcpkac8xyvl9lbzgwjbfpqr49wyn0i9j99v9zw1lfv"; depends=[baySeq GenomicRanges IRanges S4Vectors ShortRead]; };
 seq2pathway = derive { name="seq2pathway"; version="1.1.2"; sha256="1ghanxmfs99h8w2fxn6im3ml7brhhx131k7djbvsm695lvxgqm7a"; depends=[biomaRt GenomicRanges GSA nnet WGCNA]; };
@@ -997,7 +1008,7 @@ snm = derive { name="snm"; version="1.17.0"; sha256="0ckn29nymlml8ldxqq5la1h3bwm
 snpStats = derive { name="snpStats"; version="1.19.1"; sha256="1i4v737mrjjp8b24mihiv53ifgjcs7gaf9c4h2ling6gpasf39z8"; depends=[BiocGenerics Matrix survival zlibbioc]; };
 soGGi = derive { name="soGGi"; version="1.1.2"; sha256="0vqsdlnbdimz1y2q37ycddc3ifykbr9d0hsg47kqh5wjzgsrl4h7"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
 spade = derive { name="spade"; version="1.17.0"; sha256="02ba8ybgcldjmfsxywb0q7drm5nyhg6i72brvbrcgsq2ni0b7cpf"; depends=[Biobase flowCore igraph Rclusterpp]; };
-specL = derive { name="specL"; version="1.3.3"; sha256="17067na171pn55w7znyhrn9bcibjpk7spvdw5l6gzrr5slh49qg8"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
+specL = derive { name="specL"; version="1.3.5"; sha256="0afaxclb4h797hm6rdybvp5dp85r1hmwgykj0q5h9ialqbjkmsv7"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
 spikeLI = derive { name="spikeLI"; version="2.29.0"; sha256="1f7in8zcbdz9i1cqdhvdcjl6g71vhz9hgd8whc0x9nf12qa87l7p"; depends=[]; };
 spkTools = derive { name="spkTools"; version="1.25.0"; sha256="1a260c41jxg0yi2li1159pdp8dqbrxgvda88047k5pjrpzwg0738"; depends=[Biobase gtools RColorBrewer]; };
 spliceR = derive { name="spliceR"; version="1.11.0"; sha256="0zfvbnlslpav4kz385sa5h1v73wrzirahxc6fx752zvn4kqbxdkj"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; };
@@ -1011,12 +1022,12 @@ ssviz = derive { name="ssviz"; version="1.3.0"; sha256="1sl181mq7qsibn6f51mp8srl
 staRank = derive { name="staRank"; version="1.11.0"; sha256="0hi3nzm0bdqrgjqjfvgz0qwymdrsd2c4csndw85hw9dj5ml1czqd"; depends=[cellHTS2]; };
 stepNorm = derive { name="stepNorm"; version="1.41.0"; sha256="05g9qgxwfahyfq97pz3xmg49y7ml93w8n5hs5fv6f60l1nz59va1"; depends=[marray MASS]; };
 stepwiseCM = derive { name="stepwiseCM"; version="1.15.0"; sha256="0r0ca29xpzki7lpr91rf99a1dvc5lmyls2v22pd1nxq4fb3g265l"; depends=[Biobase e1071 glmpath MAclinical pamr penalized randomForest snowfall tspair]; };
-supraHex = derive { name="supraHex"; version="1.7.1"; sha256="02jv0mb17d79031b6a8sam0710a0njm2akkcj4bji40bx0bkqsna"; depends=[ape hexbin MASS]; };
-survcomp = derive { name="survcomp"; version="1.19.0"; sha256="1czy90l49f0c31kh9p461wkdxb1iih64pvpbz31wv0mhyi2633i5"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
+supraHex = derive { name="supraHex"; version="1.7.2"; sha256="1ivi3lcck3ygxbask4v3kf8fkjni5ac9qz2pv55lnarws3s0xns7"; depends=[ape hexbin MASS]; };
+survcomp = derive { name="survcomp"; version="1.19.1"; sha256="0nl3i8pbjyvpbn7d9fck5l1z3ayav2s2d943h6jvqdzc24qhb21w"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
 sva = derive { name="sva"; version="3.15.0"; sha256="0bskn3famgz24kjaz4lrrm94vw07g5d2103h9gh5qzhajdsc2d03"; depends=[genefilter mgcv]; };
 switchBox = derive { name="switchBox"; version="1.3.0"; sha256="0bnb1wqxl3rv8w5rm0jw3x22yy8q27j11hpqnd792fvsz8ssr5h1"; depends=[]; };
 synapter = derive { name="synapter"; version="1.11.0"; sha256="05gv788mx1bzizr07cg5cw98i4xm3qdh8hpys4xvr06as7q65h2g"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; };
-systemPipeR = derive { name="systemPipeR"; version="1.3.11"; sha256="1ssxavb1dwfma6dvd6jp4vnh4xz1nns0d14ccrrslssnch8knn3g"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
+systemPipeR = derive { name="systemPipeR"; version="1.3.20"; sha256="164xjy8vsjr1ri196xhklisiqjj3frcm3nbpvixc6kd4zjgn0r0q"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
 tRanslatome = derive { name="tRanslatome"; version="1.7.0"; sha256="1pcr1ghwkmkpsbkqh85yninvgb2za2vdsnax5bjkdj60wfj0d5bc"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma plotrix RankProd samr sigPathway topGO]; };
 ternarynet = derive { name="ternarynet"; version="1.13.0"; sha256="13pnzzlfzgkvqn323xhjvbaqzrk2fjq440ff9hjf09a53g14q7li"; depends=[igraph]; };
 tigre = derive { name="tigre"; version="1.23.0"; sha256="177phidn72rcghb4mqfcr2wbfx5pz2vdw6jh7ahnki7s5q6fkldl"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
@@ -1026,6 +1037,7 @@ tkWidgets = derive { name="tkWidgets"; version="1.47.0"; sha256="08vhxl7bdhnx0vk
 topGO = derive { name="topGO"; version="2.21.0"; sha256="0hhglb4zqbjwqywn37h3klz7qgkypl2zmv1afibxjn70xc6wxq46"; depends=[AnnotationDbi Biobase BiocGenerics graph lattice SparseM]; };
 trackViewer = derive { name="trackViewer"; version="1.5.2"; sha256="0kr6mkim32khr5zqm7wzrv03g9fvn4imxr0b7h8jl7sl896hv5ks"; depends=[GenomicAlignments GenomicFeatures GenomicRanges Gviz gWidgetstcltk pbapply Rsamtools rtracklayer scales]; };
 tracktables = derive { name="tracktables"; version="1.3.0"; sha256="125z9b0rjvrrbg91bdzqrf3rrw0aajivpyxd1m9k1gcs6jmsaaj3"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
+traseR = derive { name="traseR"; version="0.99.7"; sha256="0rj4jcjgpkqyhclbpmz2ha0afj5jzr9qcc7kl1cw6dbf1syxcj8p"; depends=[GenomicRanges IRanges]; };
 triform = derive { name="triform"; version="1.11.3"; sha256="0j8arzd9zbd37kzz1ndr6ljzz21h7bi33p0iqzy83l5ifidd4kaj"; depends=[BiocGenerics IRanges yaml]; };
 trigger = derive { name="trigger"; version="1.15.0"; sha256="1gsvp2rvry8pg9wfl9rggjfjxd0dcq3lrfkygfsl4jqcwnankpvc"; depends=[corpcor qtl qvalue sva]; };
 trio = derive { name="trio"; version="3.7.1"; sha256="1g3q1pvqq2kp1vck9c7sj000inw5b7q0wvd14yr8096mm6ax8zka"; depends=[]; };
@@ -1034,8 +1046,9 @@ tspair = derive { name="tspair"; version="1.27.0"; sha256="0kx2iw2g0nji25qds5z6q
 tweeDEseq = derive { name="tweeDEseq"; version="1.15.0"; sha256="17mmkz0qpww2qwzk1vd5945wqpr59v091rlvn1s2013h248173vm"; depends=[cqn edgeR limma MASS]; };
 twilight = derive { name="twilight"; version="1.45.0"; sha256="0dzgapk34jzxhdadraq072fcj6rwqhkx2795rbn0dkk4vazqz4sn"; depends=[Biobase]; };
 unifiedWMWqPCR = derive { name="unifiedWMWqPCR"; version="1.5.0"; sha256="055yvgwqjh91cf8d2hsacnbzq2z9c911cy3qd206azqlr6qyjiip"; depends=[BiocGenerics HTqPCR]; };
+variancePartition = derive { name="variancePartition"; version="0.99.4"; sha256="1xy99saci2cihx95dy7yn92b09fan317iiacnyabsrd6z8l7ypp4"; depends=[Biobase dendextend doParallel foreach ggplot2 iterators limma lme4 reshape]; };
 vbmp = derive { name="vbmp"; version="1.37.0"; sha256="1i4akvqrwj1r0ahi4vjxl7q780sa5bryj3rd2c5wg0ifd5l95h6s"; depends=[]; };
-viper = derive { name="viper"; version="1.5.1"; sha256="0494601adg93i5gwam73x4x3m7vfg25xly6v2gj4aclaq9v6fpyf"; depends=[Biobase e1071 KernSmooth mixtools]; };
+viper = derive { name="viper"; version="1.5.2"; sha256="0zcb03c469nz5ka85m54n8if1188hprh4qgdwap5zc7xgyc0lhya"; depends=[Biobase e1071 KernSmooth mixtools]; };
 vsn = derive { name="vsn"; version="3.37.3"; sha256="09mzv7l5j20sx14m63q9ycpacrh2zayywiyckglfgndpc8v9wp08"; depends=[affy Biobase ggplot2 hexbin lattice limma]; };
 vtpnet = derive { name="vtpnet"; version="0.9.0"; sha256="0gbs4pdwy88pjwsn3r2yspnfscz127awhlwym6g1lk8sxkb4mjxc"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
 wateRmelon = derive { name="wateRmelon"; version="1.9.0"; sha256="1lgadzv28j5qqqqsrjzakxmyj1q9j0hps3waa2nn9r7dq4cvallh"; depends=[limma lumi matrixStats methylumi ROC]; };
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 2f62ede96cf..169ef5899d4 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -9,6 +9,7 @@ ABCanalysis = derive { name="ABCanalysis"; version="1.0.2"; sha256="1lgf9nhh5a8m
 ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; };
 ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
 ACD = derive { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
+ACDm = derive { name="ACDm"; version="1.0.2"; sha256="1xj706qm5lcq38pm287d78rvyg7pxd4avbbvm1h4086s4l2qikf9"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; };
 ACNE = derive { name="ACNE"; version="0.8.0"; sha256="0ps38lljzm2aszqf8fhh74zbdxh46kypmybkw5w7xaf9nv5kcq8g"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
 ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; };
 ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; };
@@ -25,7 +26,7 @@ AID = derive { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm
 AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
 ALDqr = derive { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; };
 ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp]; };
-ALS = derive { name="ALS"; version="0.0.5"; sha256="1ryviknpf7c0v20bmc40khhmx51b83hbh9q9iwz9d694by51xryc"; depends=[Iso nnls]; };
+ALS = derive { name="ALS"; version="0.0.6"; sha256="1swrn39vy50fazkpf97r7c542gkj6mlvy8gmcxllg7mf2mqx546a"; depends=[Iso nnls]; };
 ALSCPC = derive { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; };
 ALTopt = derive { name="ALTopt"; version="0.1.0"; sha256="0vdn535x199m95gs715i42p0cf9zlj74s7xgxly7aknr0l2ypl2c"; depends=[cubature lattice]; };
 AMAP_Seq = derive { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; };
@@ -33,7 +34,7 @@ AMGET = derive { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy4
 AMOEBA = derive { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
 AMORE = derive { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
 AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; };
-APSIM = derive { name="APSIM"; version="0.8.0"; sha256="0ph4wl6c9jy2w0w3yh8ba12nqbsldicpn2aii675vrvdrx36vwn7"; depends=[data_table lubridate plyr sirad stringr]; };
+APSIM = derive { name="APSIM"; version="0.8.1"; sha256="1d26f7h773938ag5s6zxydl4hx61gmwxxm47d3wy3xd9pmnhhx88"; depends=[data_table lubridate plyr sirad stringr]; };
 APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
 AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
 ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
@@ -76,7 +77,7 @@ AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5
 ArArRedux = derive { name="ArArRedux"; version="0.1"; sha256="1fgll399plraijbh1xrhf1nmc308daqhhsi5krq2lm7q2cn584pc"; depends=[]; };
 ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
 ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; };
-ArgumentCheck = derive { name="ArgumentCheck"; version="0.9.0"; sha256="1gyc6bx6sfp7k8cp43l6fic4rfn729h6kl5zqs3ypf4425s7jm3f"; depends=[]; };
+ArgumentCheck = derive { name="ArgumentCheck"; version="0.10.0"; sha256="0cq4yzayj3wc45pna59v55xfa6x98q5s62kxwmqs6q76d50z7mzp"; depends=[]; };
 ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
 AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; };
 AssocTests = derive { name="AssocTests"; version="0.0-2"; sha256="1sba4b3rrk3ki95z0xs8aj8pcikczn7c66m00ziivsdi8iy10gzg"; depends=[cluster combinat fExtremes mvtnorm]; };
@@ -119,7 +120,7 @@ BGPhazard = derive { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vs
 BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
 BH = derive { name="BH"; version="1.58.0-1"; sha256="17rnwyw9ib2pvm60iixzkbz7ff4fslpifp1nlx4czp42hy67kqpf"; depends=[]; };
 BHH2 = derive { name="BHH2"; version="2015.06.25"; sha256="19c8qjfvg4f3zlrqvrsdmc776f81ghv8w0l3bnbpdbyz7fivc1qw"; depends=[]; };
-BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.2-6"; sha256="1fin5dr1xxr617i4ysfx39gaw6ygbcm4h7j1l38kqnfz18hn6xsq"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
+BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.3-0"; sha256="1sp09aavzz8xibn3lgaxfb5z31wfbnv5gqgwvbd150pq6i7mg0aj"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
 BIGDAWG = derive { name="BIGDAWG"; version="1.1"; sha256="0rgk2w7d8qq2dahfmiv81v1ydm1by6nabjzjb6iabfk0b8bnwqy2"; depends=[haplo_stats XML]; };
 BIOM_utils = derive { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
 BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; };
@@ -134,8 +135,8 @@ BNPTSclust = derive { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1s
 BNPdensity = derive { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; };
 BNSP = derive { name="BNSP"; version="1.0.5"; sha256="0iyrmrpnx32akcfvd43jh74457l56n5n4pnlyqi9v3cjp4n95fds"; depends=[]; };
 BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
-BOIN = derive { name="BOIN"; version="1.1"; sha256="1ffr6w9ml0mkffgg1vds8fmf8ww7rs375pxk2dqv9nlb9061m97r"; depends=[]; };
-BRugs = derive { name="BRugs"; version="0.8-4"; sha256="0bd5m4nfj25bhjy0d96kna50h5a5a2mdxrl21c1kvxmiwxcx4wrs"; depends=[coda]; };
+BOIN = derive { name="BOIN"; version="1.2"; sha256="1vd1w3cd1l1hk63hdrn6c1hrpqwy6nkkxni1d37yj2iz7gz6wbsg"; depends=[]; };
+BRugs = derive { name="BRugs"; version="0.8-5"; sha256="13941d3x3l9jr4xdn7xyp3yixnlzmi5xmh42isni0fc1ji86p0jm"; depends=[coda]; };
 BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
 BSGS = derive { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
 BSGW = derive { name="BSGW"; version="0.9"; sha256="0df5d0d0kfvwavxbxra36jjs9044q1szq1xm37dvh4wfvvv6igmb"; depends=[survival]; };
@@ -158,6 +159,7 @@ BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdg
 BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
 BayesBridge = derive { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lhbrfvddjglrzs6px7bc89yvfzj776amm7myqd0l"; depends=[]; };
 BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mnormt mvtnorm Rlab rootSolve truncdist]; };
+BayesComm = derive { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; };
 BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
 BayesFactor = derive { name="BayesFactor"; version="0.9.11-1"; sha256="0vq656q38vlf0ba8g23psk8as1y48y6s8yrvqrppbjx5d9wlm9wv"; depends=[coda gtools Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
 BayesGESM = derive { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
@@ -182,26 +184,27 @@ BcDiag = derive { name="BcDiag"; version="1.0.8"; sha256="1x9rkr96dgxp88z9qaw72i
 Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[coda ellipse hdrcde inline MASS mclust]; };
 Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[hdrcde MASS mclust statmod]; };
 Benchmarking = derive { name="Benchmarking"; version="0.26"; sha256="00w7a16lhra6rjylyj26q67mvgbc3wa27a2wmiwjz5yh7wdnh193"; depends=[lpSolveAPI ucminf]; };
-BenfordTests = derive { name="BenfordTests"; version="1.1.1"; sha256="12xzc4gq4h7p18ypbkybrzjj2qh71rgd7nzznij36yv7n6h21mlw"; depends=[]; };
+BenfordTests = derive { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; };
 Bergm = derive { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[coda ergm mvtnorm network]; };
 BerlinData = derive { name="BerlinData"; version="1.0.1"; sha256="1shhx4pisi139sc0siawa7gp9psfgxm58qijg5m65nihv7spki75"; depends=[rjson stringr XML]; };
 Bessel = derive { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
 Bhat = derive { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
 BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
 BiSEp = derive { name="BiSEp"; version="2.0.1"; sha256="15sn9kxs0mb98kclfpif90c808a1365gdj2j332sxi07f64pb87q"; depends=[AnnotationDbi GOSemSim mclust]; };
+BiTrinA = derive { name="BiTrinA"; version="1.0"; sha256="04q3dkv5h8nrizgbw6qawwzh7v9jl0ykdxqxbp1z8cmv1r4n7z37"; depends=[diptest]; };
 BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; };
 BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; };
 BinNonNor = derive { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z9izp942ihffgq8dgh4fsnzllvdrpqcyc41"; depends=[BB corpcor Matrix mvtnorm]; };
 BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[corpcor Matrix mvtnorm psych]; };
 BinOrdNonNor = derive { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
-Binarize = derive { name="Binarize"; version="1.0"; sha256="1yfr87s1hgjhc8ah81sfrgr1hpp0vd5clqayrz1i698h1c34amkh"; depends=[diptest]; };
+Binarize = derive { name="Binarize"; version="1.1"; sha256="07r41n5123pk6nwdwajgw6m3w38kprf4ksinx4rjldd8h1yd6rik"; depends=[diptest]; };
 BinaryEPPM = derive { name="BinaryEPPM"; version="1.0"; sha256="088yg07966g09gv9hznhwfdka4yk0c9j0viy9x4ldmhxl9w9scv5"; depends=[expm Formula numDeriv]; };
 BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[ape cladoRcpp FD gdata optimx phylobase plotrix rexpokit xtable]; };
 BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[glmnet MASS pls st]; };
 BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; };
 BioStatR = derive { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
 Biodem = derive { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
-BiodiversityR = derive { name="BiodiversityR"; version="2.5-2"; sha256="0l23nlibv7wjmkv1jnssaab3iwm2i5wrkzjji2x9rr5131aj82gn"; depends=[Rcmdr vegan]; };
+BiodiversityR = derive { name="BiodiversityR"; version="2.5-3"; sha256="1j3al5rakpqlacijp3ryr5dlasghda3bli3pxvf3yqjn5wwyddgs"; depends=[Rcmdr vegan]; };
 Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; };
 BivarP = derive { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; };
 BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3ankn7v3gj0gwn9lww6jacz8flf5qpplhn4l"; depends=[]; };
@@ -247,7 +250,7 @@ CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27h
 CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
 CDM = derive { name="CDM"; version="4.4-1"; sha256="0m75h7q60bzn66hrv9w2s21w7yp1qphylrfv8323srnj2q4yqi93"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; };
 CDNmoney = derive { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
-CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[igraph MASS mvtnorm]; };
+CDVine = derive { name="CDVine"; version="1.3"; sha256="0z3n9zplrmqhclq6skfg13h7mqdifphlaa8bc67q4n9ff4x697rm"; depends=[igraph MASS mvtnorm]; };
 CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; };
 CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[DEoptim MASS]; };
 CEoptim = derive { name="CEoptim"; version="1.0"; sha256="1mrv2vhrwd7hvw67ys08nilbn3f1fp3bsvlbc8ggwyl3lw957fi9"; depends=[MASS msm]; };
@@ -262,7 +265,7 @@ CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84
 CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
 CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; };
 CITAN = derive { name="CITAN"; version="2014.12-1"; sha256="0hiccsg49zgcdm5iwj2vzyqhwyfw6h5fd2gasy6hlakjp102mvy2"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
-CLME = derive { name="CLME"; version="2.0-2"; sha256="11krgxn3fvbwknmiz2jyidpbb0svf4frvk99spd7i53m615sai91"; depends=[isotone lme4 MASS prettyR shiny stringr]; };
+CLME = derive { name="CLME"; version="2.0-4"; sha256="1ymaqvmq0ji82kb4c84a6fdz15ri797k9n218kawz21xvx8ilr7w"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
 CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
 CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
 CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; };
@@ -273,8 +276,9 @@ CNVassoc = derive { name="CNVassoc"; version="2.1"; sha256="0gwyhipkvvnivdahr9mk
 CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; };
 CNprep = derive { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; };
 COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
+COMBIA = derive { name="COMBIA"; version="1.0-4"; sha256="02yadw3zjkj0ljq2c5k5zfsn8qnlvr6gxgafzrqw9g95cawv8q4x"; depends=[gdata hash lattice latticeExtra oro_nifti]; };
 COMMUNAL = derive { name="COMMUNAL"; version="1.0"; sha256="0smza4q0gnhskyq3fxcrs2hq3lxkyp5xf3zd6zi92962lg6s3w3n"; depends=[cluster clValid fpc rgl]; };
-COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; };
+COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.5"; sha256="15w78h0kkqbisp34g4wj2mkq4c0pb2166f1m7s65iifnnd5plvb6"; depends=[]; };
 COPASutils = derive { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[dplyr ggplot2 kernlab knitr reshape2 stringr]; };
 CORE = derive { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
 CORElearn = derive { name="CORElearn"; version="0.9.46"; sha256="1jwc3sqkbhhmn67x44iyqzvpjsnbrwhgq6yam6h6gf086nv0lmic"; depends=[cluster rpart]; };
@@ -296,8 +300,8 @@ CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pw
 CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; };
 CVTuningCov = derive { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; };
 CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
-CaDENCE = derive { name="CaDENCE"; version="1.2.2"; sha256="1rbwm3s63dxd366bs7pdxl0zpv7svsfr3ayznach9bjjrnjk3z3g"; depends=[pso]; };
-Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; };
+CaDENCE = derive { name="CaDENCE"; version="1.2.3"; sha256="1810a785czaxwfvhjnmhzqg743mgcgrdp3j1irlfl9pbli0ppidx"; depends=[pso]; };
+Cairo = derive { name="Cairo"; version="1.5-8"; sha256="1paqyb95jikbwyp1x3c8fxwla1ihp003vn53l3z9mqywxyamvjdw"; depends=[]; };
 CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; };
 CatDyn = derive { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; };
 CateSelection = derive { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
@@ -309,10 +313,10 @@ CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256="
 CensRegMod = derive { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
 CerioliOutlierDetection = derive { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; };
 CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
-ChainLadder = derive { name="ChainLadder"; version="0.2.0"; sha256="03gwavmimh4isrc6gpn72m52sqx1aj0prshzsb0531g45qxmvw9x"; depends=[actuar Hmisc lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
+ChainLadder = derive { name="ChainLadder"; version="0.2.1"; sha256="0c7mjxn050nx3ldbvg55paj58mgkk8apsvwqyzhfc9f9py02q07r"; depends=[actuar lattice Matrix reshape2 statmod systemfit tweedie]; };
 ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
 CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
-ChemoSpec = derive { name="ChemoSpec"; version="4.0.6"; sha256="0zhqx6b1zp2vlp003rsaj7ayxa0zrk1kmm5xq3q10rkl6xnk0wid"; depends=[plyr rgl]; };
+ChemoSpec = derive { name="ChemoSpec"; version="4.1.15"; sha256="147ynbj8w4hiwfac3637s2skyjyyyv19axwv5bxlg73kvp40zp0h"; depends=[plyr rgl]; };
 ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.8"; sha256="084da2hx6agryw7bv6img10pqmsdz2mpihbrj6j081lammrik4fj"; depends=[ChemometricsWithRData MASS pls]; };
 ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; };
 ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
@@ -323,6 +327,7 @@ CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa8
 CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
 Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; };
 Claddis = derive { name="Claddis"; version="0.1"; sha256="1dxsz62x856lpapw5xpvvr2qpyj3j93m9dn07m0bjbpmx0y0bm9c"; depends=[ape gdata phytools strap]; };
+ClamR = derive { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; };
 ClickClust = derive { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; };
 ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; };
 ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; };
@@ -349,7 +354,7 @@ CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwid
 CompR = derive { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; };
 CompRandFld = derive { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
 CompareCausalNetworks = derive { name="CompareCausalNetworks"; version="0.1.1"; sha256="1j3yrgyv7vlgwi50w62q8dpk1zpvrwk9vn0ka0ry6524s9zs0r03"; depends=[Matrix]; };
-CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; };
+CompareTests = derive { name="CompareTests"; version="1.1"; sha256="1assdqwr5qhwfqhc8gpfa53kcmd4dy5fb449pm4ng0n674qvra6c"; depends=[]; };
 Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; };
 ComplexAnalysis = derive { name="ComplexAnalysis"; version="1.0"; sha256="1yk0r3iwxirjsksnpwpnrgq4yhni6in9kgxxrs7v51l35zn78kji"; depends=[]; };
 Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
@@ -359,6 +364,7 @@ Conake = derive { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwj
 CondReg = derive { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
 ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
 ConnMatTools = derive { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; };
+ConsRank = derive { name="ConsRank"; version="0.0.1"; sha256="04hqqc1d29yxfb53ccy1gr5qaw3jpm92zp0zvm5ps3jqw170kvxx"; depends=[gtools MASS proxy rgl]; };
 ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
 ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; };
 Copula_Markov = derive { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz9xr4r305lbcbb0y22jw1szmhw5iznv5zma507grbl3"; depends=[]; };
@@ -380,11 +386,12 @@ CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5
 CpGassoc = derive { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; };
 Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[geepack lattice lgtdl prodlim tpr]; };
 CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
-Crossover = derive { name="Crossover"; version="0.1-14"; sha256="0d35am446z1pj7iz2zk1fvmp3xn5nhz3pgj7rwhmj77ad8vy8p8b"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
+Crossover = derive { name="Crossover"; version="0.1-15"; sha256="1g9z4ssqyb3silaprcsjsdd1bk5rsih2hvqr6rm1qb8ayqjr1sp3"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
 CryptRndTest = derive { name="CryptRndTest"; version="1.0.5"; sha256="0ypqwzn9r9x7l4wzz6vqnirmjx7zrbx0jck4wpy83w1jvx02qcqv"; depends=[copula kSamples LambertW MissMech sfsmisc tseries]; };
 CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[car chopsticks ellipse rJPSGCS]; };
 Cubist = derive { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; };
 D2C = derive { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; };
+D3M = derive { name="D3M"; version="0.41"; sha256="12yny4a6rggaz5zfjpacsmxcj805nbkw19n26m9vr58a7zg1iwa1"; depends=[beanplot Rcpp]; };
 DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j28c9n0a1jww5lssacimn1d4x5"; depends=[lattice latticeExtra]; };
 DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[limma]; };
 DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
@@ -410,7 +417,7 @@ DEMEtics = derive { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxja
 DESP = derive { name="DESP"; version="0.1-3"; sha256="18dx1ljc8radxdm57n0xcnza3w9wjl1zi60azjrazzfpwyjldc9l"; depends=[graph MASS Matrix RBGL SparseM]; };
 DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; };
 DEoptim = derive { name="DEoptim"; version="2.2-3"; sha256="0pcs7kkhad139c3nhmg7bkac1av4siknfg59lpknwwrsxbz208dg"; depends=[]; };
-DEoptimR = derive { name="DEoptimR"; version="1.0-2"; sha256="00viy7x3br3094az635lmjydm826d48vv2f14rwmdhqmv03066kq"; depends=[]; };
+DEoptimR = derive { name="DEoptimR"; version="1.0-3"; sha256="0wvq78hk0fyx2wkskvnwkj3lrk93p80skqykfh9qnc4r94irl5aj"; depends=[]; };
 DFIT = derive { name="DFIT"; version="1.0-2"; sha256="1kn3av6pnkmf9703yp3cn0zbdzjzxrlm6nbbcg7lwv9550jw2c4n"; depends=[ggplot2 mvtnorm simex]; };
 DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso miscTools penalized]; };
 DIFtree = derive { name="DIFtree"; version="1.0.0"; sha256="08s6ba44517xq783fysksb1h53zkqsk7zakaibi1c2npq1gzny9p"; depends=[penalized plotrix]; };
@@ -438,7 +445,7 @@ DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2
 DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
 DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
 DTR = derive { name="DTR"; version="1.6"; sha256="186qgrx9alzmj1vdy2yvfqs5xgidmwddm0zgg041s5q992cih36g"; depends=[aod ggplot2 gridExtra proto survival]; };
-DVHmetrics = derive { name="DVHmetrics"; version="0.3"; sha256="1ndrzd5q12kabpk3yj95s24kn7ri61w1h4aa50zw9qb12f5dzc98"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
+DVHmetrics = derive { name="DVHmetrics"; version="0.3.1"; sha256="1njvxjbfdal73b5z4wdmdw76h1f8d5i037b4yga79bc6h4b3xfk5"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
 DYM = derive { name="DYM"; version="0.1.1"; sha256="0k6iqn1397by9pg31m3ypbnn85zv192ghsn4gpnsfhqfcp18q4d4"; depends=[]; };
 Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
 DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
@@ -477,10 +484,10 @@ DirichletReg = derive { name="DirichletReg"; version="0.6-2"; sha256="08qfykyahy
 Disake = derive { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
 DiscML = derive { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; };
 DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0.1"; sha256="0w0s2fixpcmcwids35xx91hll9rf9qbi7155sp90dxd3vr8c939v"; depends=[Rsolnp]; };
-DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.0"; sha256="1mwqvlhgswqp697zjl6yjzqbgazycwwz6dfdvx8s72hdmnlqqr9r"; depends=[]; };
+DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.1"; sha256="1pcq4kggy1z88a0car53d0f69rx2qg7q104cr0bxi6yllrb3q0nr"; depends=[Rsolnp]; };
 DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0.1"; sha256="09v34lwaahx0d30zxb4b3r84ryllz1fsmbp5wfr341b5flp20wvg"; depends=[Rsolnp]; };
 DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
-Distance = derive { name="Distance"; version="0.9.3"; sha256="054z9pi8m8gjpax3s2hajvaik4yvfpy8qc4gmpl9bqncrk594pbv"; depends=[mrds]; };
+Distance = derive { name="Distance"; version="0.9.4"; sha256="18iip9xny2vazpah96qziqwql4hnxg2m8hyjhh8b34w29jv0nsm5"; depends=[mrds]; };
 DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[car prettyGraphs]; };
 DistributionUtils = derive { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
 DivE = derive { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
@@ -503,8 +510,10 @@ EBEN = derive { name="EBEN"; version="4.1"; sha256="0xin08w8ay3m31a2alnjdgqzw7nw
 EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[abind ensembleBMA Hmisc plyr separationplot]; };
 EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; };
 EBglmnet = derive { name="EBglmnet"; version="3.6"; sha256="0qjwk5y9bghidha4i937nc0kl1jz4d8g2br6ij8651lf2byj9s1a"; depends=[]; };
+EDFIR = derive { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
 EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; };
 EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
+EEM = derive { name="EEM"; version="1.0.1"; sha256="05kmys1qq2v7zj4akpbs81ss74q1zp2v7n8m5mmgj4frivzgqbzn"; depends=[colorRamps R_utils readxl reshape2 sp]; };
 EFDR = derive { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
 EGRET = derive { name="EGRET"; version="2.3.0"; sha256="07b2wxdciybvm3l579vibdprcxvzl2ym25xba7wlxmrbx37ndx5z"; depends=[dataRetrieval fields lubridate survival]; };
 EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; };
@@ -521,13 +530,15 @@ EMMAgeo = derive { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6
 EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; };
 EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[KernSmooth lattice mvtnorm]; };
 EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; };
-EMMREML = derive { name="EMMREML"; version="3.0"; sha256="0y37ydssn6m2q78v2aympfjr6z2hcn5y3dlgv4pj5g414fikb825"; depends=[Matrix]; };
+EMMREML = derive { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; };
 EMP = derive { name="EMP"; version="2.0.1"; sha256="1zdy05jfhcgj6415pnm079v8xjg90n3akp1rwq65jbqdar38zj4y"; depends=[ROCR]; };
 EMT = derive { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
 EMVC = derive { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; };
+EMbC = derive { name="EMbC"; version="1.9.3"; sha256="189kgp6qv9dl4q1sirm3v9zqk11259il6ykb0008nnghv78rdcyd"; depends=[maptools mnormt move RColorBrewer sp]; };
 ENMeval = derive { name="ENMeval"; version="0.1.1"; sha256="0g1h8dklv6rv73wwpx3vhbpnwply5lpq8x9jvl7r018x9gcvvb9m"; depends=[dismo raster rJava]; };
 ENiRG = derive { name="ENiRG"; version="0.1"; sha256="1cnl1mjl5y1rc6fv7c9jw2lkm898l3flfrj3idx9v1brjzyx5xlf"; depends=[ade4 fgui gdata miniGUI R_utils raster sp spgrass6]; };
 ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; };
+EPGLM = derive { name="EPGLM"; version="1.0"; sha256="0cijk21dl7hkd0m8dzj2nx5yzm3q1l764fyv82dr3k31c7vq7xh1"; depends=[BH MASS Rcpp RcppArmadillo]; };
 EQL = derive { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; };
 ERP = derive { name="ERP"; version="1.0.1"; sha256="0wy1p7pp9dvc3krylskb627rmfqaj11qvia97m88x05ydqx1fwmr"; depends=[fdrtool mnormt]; };
 ES = derive { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
@@ -545,8 +556,8 @@ EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs1
 EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; };
 EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
 Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; };
-Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
-EcoGenetics = derive { name="EcoGenetics"; version="1.2.0-1"; sha256="08wa9w8ib0bp386bs6vlfzbdbcxjf8pz97mlfml3dl15092g13x3"; depends=[adegenet ggplot2 party raster rgdal rkt SoDA sp]; };
+Ecfun = derive { name="Ecfun"; version="0.1-6"; sha256="1mz2smbxyjzc6vf3vhycgvjwqq6hr22vxikrl0hx185qxgwbgrxn"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
+EcoGenetics = derive { name="EcoGenetics"; version="1.2.0-2"; sha256="1c2pz2a8f57fhq0sk4jgfi4v8jwznsjaqx4jnziz3lak7gmcrwql"; depends=[ggplot2 party raster reshape2 rgdal rkt SoDA sp]; };
 EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
 EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
 EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
@@ -575,9 +586,10 @@ EpiBayes = derive { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1ac
 EpiContactTrace = derive { name="EpiContactTrace"; version="0.9.1"; sha256="10yd24xcydn03rq9kcqcxj5gn25v54ljsm9mgc206g9wf1xx0wjf"; depends=[]; };
 EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve ggplot2 reshape2]; };
 EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
-EpiModel = derive { name="EpiModel"; version="1.2.0"; sha256="16vnsgar45y2gr93qzv3c33b11y5j0rys3q2k29mwb0i93f4cf9p"; depends=[deSolve doParallel ergm foreach network networkDynamic RColorBrewer tergm]; };
+EpiModel = derive { name="EpiModel"; version="1.2.1"; sha256="0wmhi9hgrpmp36kbyjgkhiigarbnlf05x3vx2pqajispvph7kn01"; depends=[deSolve doParallel ergm foreach network networkDynamic RColorBrewer tergm]; };
 Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
-EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
+EstCRM = derive { name="EstCRM"; version="1.4"; sha256="1p99hmmyiy3havj72jd4xksr1j9gfmy0i7z7f3vqs5sqp72alq1k"; depends=[Hmisc lattice]; };
+EstHer = derive { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
 EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
 EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
 EvalEst = derive { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
@@ -605,6 +617,7 @@ FAwR = derive { name="FAwR"; version="1.1.0"; sha256="0566h9fgnnk8xankqkpvcshf8a
 FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo]; };
 FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
 FCMapper = derive { name="FCMapper"; version="1.0"; sha256="1wp5byx68067fnc0sl5zwvw2wllaqdbcy4g2gbzmlqwli0jz2dsk"; depends=[igraph]; };
+FCNN4R = derive { name="FCNN4R"; version="0.3.4"; sha256="1qzfgspar54ki3n36zr322lxx249w4a5lzr9n18gwmzhkb61lgbf"; depends=[Rcpp]; };
 FD = derive { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; };
 FDGcopulas = derive { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; };
 FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; };
@@ -614,7 +627,7 @@ FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dw
 FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; };
 FGSG = derive { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
 FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
-FHtest = derive { name="FHtest"; version="1.2"; sha256="033p90zzlgx2galzp2iwwpg29hhhgscqmqkwpr69y2ck3nj3hz0v"; depends=[interval KMsurv MASS perm survival]; };
+FHtest = derive { name="FHtest"; version="1.3"; sha256="1cay1cl1x4lias55vxc14caznggdw6j8vgqgkxfmvldnvjfljsq1"; depends=[interval KMsurv MASS perm survival]; };
 FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
 FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; };
 FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; };
@@ -638,17 +651,18 @@ FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55s
 FWDselect = derive { name="FWDselect"; version="2.0"; sha256="12hhb2vysg3c9fzh56xy3kwhwbgcn1yx4afhlpydnavp3aclrqrg"; depends=[cvTools mgcv]; };
 FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
 FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
-FactoClass = derive { name="FactoClass"; version="1.1.1"; sha256="0m5108g2nhdwqqmkn04l1x0kx32ikkhcz6gki0hpj9hlzrkya5w6"; depends=[ade4 xtable]; };
+FactoClass = derive { name="FactoClass"; version="1.1.2"; sha256="0wg8n2vn586dj5g6js6c7rshsjibciyvg2j53mxgnn0f63xdb3ip"; depends=[ade4 xtable]; };
 FactoMineR = derive { name="FactoMineR"; version="1.31.3"; sha256="164pxgy9sn7irk4l31nfpmdmrw9qscwzdmvzr9nc9m36nhmajvkr"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
 Factoshiny = derive { name="Factoshiny"; version="1.0.2"; sha256="0wwsv0frn2d6a5l5lr9qzqglznaigc23bq7nhcbfy1wlvsmimnr3"; depends=[FactoMineR shiny]; };
 Fahrmeir = derive { name="Fahrmeir"; version="2015.6.25"; sha256="1ca4m3m4jip7n489yywdfvh6nlhxspg5awxi23spgfnvhrcs9k3y"; depends=[]; };
 Familias = derive { name="Familias"; version="2.2"; sha256="1nhjxn3f063gvi4jvwb8r4fap7f1zbcvb6qa30153yh31yprljls"; depends=[kinship2 paramlink]; };
+FastGP = derive { name="FastGP"; version="1.1"; sha256="01d2435ag4hgwljwp896gqzjih6510aqf05522q7q209r2dbl0km"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; };
 FastHCS = derive { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; };
 FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; };
 FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; };
 FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; };
 FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; };
-FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; };
+FastRWeb = derive { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; };
 FatTailsR = derive { name="FatTailsR"; version="1.2-3"; sha256="139hc8axzp0faib0lpj3f6kfwna29vsqjjwflcva8xsghakc1d4r"; depends=[minpack_lm timeSeries]; };
 FeaLect = derive { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
 FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[BH digest magrittr Matrix Rcpp]; };
@@ -684,7 +698,7 @@ Frames2 = derive { name="Frames2"; version="0.1.1"; sha256="004h3w5bfnbbxa8yczlc
 FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[ellipse smacof vegan]; };
 FunChisq = derive { name="FunChisq"; version="2.1.0"; sha256="0k5b0kl64yswl5d41yiav9xnqcsqx8n6qc5p2nz5vqjs6qb7mbvd"; depends=[BH Rcpp RcppClassic]; };
 FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
-FuncMap = derive { name="FuncMap"; version="1.0-3"; sha256="0bhx7y1n75r3jwf5mkx2i2bqfjgzxgsw58nwhfl48ldibgx7h1qs"; depends=[mvbutils]; };
+FuncMap = derive { name="FuncMap"; version="1.0.8"; sha256="04rfmdy1hzxqy16csj6cf3x2kj9lg1xxvvnn494xjdwjdkfkyl09"; depends=[mvbutils]; };
 Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
 FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase]; };
 FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
@@ -716,25 +730,25 @@ GENLIB = derive { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47l
 GEOmap = derive { name="GEOmap"; version="2.3-5"; sha256="11sxlijfcswxmry6p9pb4g6prrql0qnqcqc21f72a0jp3k3670nc"; depends=[fields RPMG splancs]; };
 GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; };
 GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fExtremes fGarch Rsolnp skewt stabledist]; };
-GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; };
+GEVcdn = derive { name="GEVcdn"; version="1.1.4"; sha256="13p6wi72z6j7iyp5hv16ndvsq6jf6hdqgcmf1i8g713gn73l79kj"; depends=[VGAM]; };
 GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
 GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; };
 GGIR = derive { name="GGIR"; version="1.1-5"; sha256="0lanza1i7bqa0z745hbxkkyjhf6jy578jjva6nbisbbfsrbf7ydj"; depends=[]; };
 GGMselect = derive { name="GGMselect"; version="0.1-9"; sha256="18l98v6hv0sjhany275lsbdjwclx3abqfi924n9qlcnap1rvsfwz"; depends=[gtools lars mvtnorm]; };
 GGally = derive { name="GGally"; version="0.5.0"; sha256="00ix8qafi71l7vhj6268f9srqbgr9iw1qk0202y59mhfrj6c6f5i"; depends=[ggplot2 gtable plyr reshape stringr]; };
 GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
-GIGrvg = derive { name="GIGrvg"; version="0.3"; sha256="014srgh79g8y9fcj979v3md9qqx9i6b6fx6lw0r0qdrg4v6bvr76"; depends=[]; };
+GIGrvg = derive { name="GIGrvg"; version="0.4"; sha256="0sflklyzl2l5bcjhz7n75aww76ih93sq5mbgdc4v1p0vqhrbbg47"; depends=[]; };
 GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
 GLDEX = derive { name="GLDEX"; version="2.0.0.3"; sha256="0ymarfwpm7gagq6wk40n0nsmd14r19pbqbrgigk6cvb8dc2zpbfz"; depends=[cluster]; };
 GLDreg = derive { name="GLDreg"; version="1.0.3"; sha256="0d7cclmmhgaf95bw738d8hz166qsr9df33g73ihy8pla3sg5lr7q"; depends=[GLDEX]; };
-GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[corpcor mvtnorm]; };
-GMCM = derive { name="GMCM"; version="1.2.1"; sha256="1s45xmbx64h3sb10py8n444jpxcgsz4pc36cz3zinfq55amf8r6r"; depends=[Rcpp RcppArmadillo]; };
+GLSME = derive { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; };
+GMCM = derive { name="GMCM"; version="1.2.2"; sha256="1zvhbxz1bli460c9nh2p3vx7v3a5w2jwyyyd7r8dqgxpf3xr1pzw"; depends=[Rcpp RcppArmadillo]; };
 GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
-GMDH = derive { name="GMDH"; version="1.0"; sha256="194bx1gg0d50fq9002ga8lwx288csfk5vfr1qwkn886wiw97wl9n"; depends=[MASS]; };
+GMDH = derive { name="GMDH"; version="1.1"; sha256="053x0flh1jk61ak84d7y1r22fn1s52pj5xqwlbvkc70jmfmvs141"; depends=[MASS]; };
 GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
-GNE = derive { name="GNE"; version="0.99-0"; sha256="1iwlh1mx8z24hgry78i5sqfrbqqp4946x1jxh6h7z1vxs7qfpq0v"; depends=[alabama BB nleqslv SQUAREM]; };
+GNE = derive { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; };
 GOGANPA = derive { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
-GOplot = derive { name="GOplot"; version="1.0"; sha256="15ix1lcbxf63bmxvjsy7y2nz55wf539xii8rb7lf788jplh47gb6"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
+GOplot = derive { name="GOplot"; version="1.0.1"; sha256="0i4b26wkgf77z515027bmq5pqd21bhg0qrg6jbmwiv59nczr146b"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
 GPArotation = derive { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; };
 GPC = derive { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[ks lars orthopolynom randtoolbox]; };
 GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
@@ -743,14 +757,14 @@ GPLTR = derive { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2f
 GPareto = derive { name="GPareto"; version="1.0.1"; sha256="0wscalc855c99yzy3q154rxvhg0xmzy4a4x37jkf8f45n8sgviif"; depends=[DiceKriging emoa KrigInv MASS pbivnorm pso randtoolbox Rcpp rgenoud]; };
 GPfit = derive { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; };
 GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
-GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+GPvam = derive { name="GPvam"; version="3.0-3"; sha256="0dmws29ahbjhx82s2i8jfzhl8pp5q201a592w90jvhwy2bnm1ywk"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
 GRANBase = derive { name="GRANBase"; version="1.0.12"; sha256="1qfx2zp8vjyqx9rqz23kgl1dj7kz7qkligym8r2l41nc0hinijpi"; depends=[hwriter switchr XML]; };
 GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; };
 GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
 GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
 GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
-GSE = derive { name="GSE"; version="3.2"; sha256="1zfvwrz4argv47dvxy18bjx19yn0qlqgy501sllxhqxvd1f7780r"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; };
-GSIF = derive { name="GSIF"; version="0.4-6"; sha256="00m5djgc443678nwnmvgqv070g67pbvp1ci1x8gp7van8knjn5zq"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA sp]; };
+GSE = derive { name="GSE"; version="3.2.1"; sha256="1sq28hi60jayl3yc8432dfv0knavsmy0khmwa5h16ag23cg962w6"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; };
+GSIF = derive { name="GSIF"; version="0.4-7"; sha256="1c2lk6yzacwrxvs5v0al8hwvi7ncqdvn4f7ngicy6g8iyi4p7z08"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA sp]; };
 GSM = derive { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
 GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
 GUILDS = derive { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[pracma Rcpp subplex]; };
@@ -779,7 +793,7 @@ GenWin = derive { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0f
 GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[fdrtool longitudinal MASS]; };
 GeneF = derive { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
 GeneFeST = derive { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; };
-GeneNet = derive { name="GeneNet"; version="1.2.12"; sha256="0z94ws95nvk7jx5fnrwb81925y14fash1g5pd1mmkkj8njq9kk4l"; depends=[corpcor fdrtool igraph longitudinal]; };
+GeneNet = derive { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; };
 GeneReg = derive { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
 Geneland = derive { name="Geneland"; version="4.0.5"; sha256="1v2m8v4sy95rajjw8m9bg4yal5ay7x1k5kqjxrivm45ad546ykwh"; depends=[fields RandomFields]; };
 GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; };
@@ -799,7 +813,7 @@ GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq
 GlobalFit = derive { name="GlobalFit"; version="1.0"; sha256="0cx4jpr5yhjdqbvnswqjwx7542mnmk73dy99klwg8bsz0c36ii5k"; depends=[sybil]; };
 GlobalOptions = derive { name="GlobalOptions"; version="0.0.7"; sha256="1vg948xh0ndwkspbf5qb00b28fy9ygda55m5fq8bspq9d2y3c0pc"; depends=[]; };
 Gmisc = derive { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[abind forestplot Hmisc htmlTable knitr lattice magrittr Rcpp]; };
-GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; };
+GoFKernel = derive { name="GoFKernel"; version="2.0-6"; sha256="11x9xvgrb7si2y6s2cgxgk01j0laizjqddbqmmj37ylmnh0539mw"; depends=[KernSmooth]; };
 GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
 GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[FactoMineR ggplot2 scales scatterplot3d]; };
 GrapheR = derive { name="GrapheR"; version="1.9-84"; sha256="1wwks2a4vzhj1rcspizp1vadl6kvrqr8s4zd6pghj02nd266znk9"; depends=[]; };
@@ -814,6 +828,7 @@ HAC = derive { name="HAC"; version="1.0-3"; sha256="084i123fj5vnhn08fa1qzbk93khs
 HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; };
 HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
 HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; };
+HBglm = derive { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; };
 HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; };
 HDPenReg = derive { name="HDPenReg"; version="0.91"; sha256="0q63pm39ivka64f7rhad6bv0yr1b2b3241ln8gqfnal25qw31w82"; depends=[rtkpp]; };
 HDclassif = derive { name="HDclassif"; version="1.3"; sha256="1b80dnaa6m4px0ijpd9yf45v8jl0b9srcmrdyar8fs7lxpc53k2l"; depends=[MASS]; };
@@ -821,7 +836,7 @@ HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5
 HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
 HGNChelper = derive { name="HGNChelper"; version="0.3.1"; sha256="0vidw7gdvr0i4l175ic5ya8q2x2jj0v2vc7fagzrp2mcy7fn1y6a"; depends=[]; };
 HH = derive { name="HH"; version="3.1-19"; sha256="0hm8fk0wqfhkrjm3ycpxd4i8wwm9hi8ihy45a3wayp0p6lqv4rpp"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
-HHG = derive { name="HHG"; version="1.5"; sha256="0azgl9q3fhaxrjji63kai49jkybdyq1v0ql2jqmg98hynx6s31db"; depends=[]; };
+HHG = derive { name="HHG"; version="1.5.1"; sha256="111b3lqkp8z7m3g4vgmd0dcplkm4szfwa620sxy70084qad1jv4d"; depends=[]; };
 HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
 HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
 HIest = derive { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
@@ -835,9 +850,9 @@ HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di
 HMPTrees = derive { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; };
 HMR = derive { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; depends=[]; };
 HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
-HSAUR = derive { name="HSAUR"; version="1.3-6"; sha256="1872diskd9yz76x0z6yjg6dn1dxh479ybnja8vcly9fr8jb0kqqj"; depends=[]; };
-HSAUR2 = derive { name="HSAUR2"; version="1.1-13"; sha256="13b14m2cknicahvprkn3kmjk1sir7a10vkaq63niinfirw603fa9"; depends=[]; };
-HSAUR3 = derive { name="HSAUR3"; version="1.0-4"; sha256="1m2nqvm0ma5rmwwn27nzzyjzq8c0awsrrjjrnyaj50bcnmg0x0k6"; depends=[]; };
+HSAUR = derive { name="HSAUR"; version="1.3-7"; sha256="16qmsyin8b7x9q3xdx74kw6db6zjinhxprp6pfnl6ddwxhz3jzzf"; depends=[]; };
+HSAUR2 = derive { name="HSAUR2"; version="1.1-14"; sha256="0psykccxyqigkfzrszy7x3qhdw02kppzgz0bqr21q8zh51jb2y3v"; depends=[]; };
+HSAUR3 = derive { name="HSAUR3"; version="1.0-5"; sha256="0hjlkmxp1yhwkfcbx16nda96ysqddjrcvl4z52w2ab84prqn6196"; depends=[]; };
 HSROC = derive { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[coda lattice MASS MCMCpack]; };
 HSSVD = derive { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
 HTMLUtils = derive { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
@@ -855,8 +870,9 @@ Haplin = derive { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dsw
 HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
 HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; };
 HarmonicRegression = derive { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
+Harvest_Tree = derive { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
 HelpersMG = derive { name="HelpersMG"; version="1.2"; sha256="1a9b7j53a8xfxc5dmm6m5f0ac2mir8yzkhg0fgah4gvbivaaz6nb"; depends=[coda]; };
-HiClimR = derive { name="HiClimR"; version="1.2.1"; sha256="12qq3w20xzw2ih15hw5pzn0h58wv8rczhb4zxcdzc7zbg6i8qas4"; depends=[]; };
+HiClimR = derive { name="HiClimR"; version="1.2.2"; sha256="11qx0ych889vccgbh0ckx5hpmpmnbghi4h8lcawiqk8lzxhv03ld"; depends=[]; };
 HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
 HiDimDA = derive { name="HiDimDA"; version="0.2-3"; sha256="0pk7hf8cnwv22p5cbpsh5wd94i1an87ddv80qycgypx4wi0v57hh"; depends=[]; };
 HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula maxLik mnormpow mnormt partitions VGAM]; };
@@ -865,9 +881,10 @@ HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6i
 HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-4"; sha256="1w3j4dnf6ay0a17kn8zdzy38wind4pqfnwlndf9m9fj8m2scaay8"; depends=[]; };
 HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
 HighDimOut = derive { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
-HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca7zifb2q3c5x60rmj32913hw1f79xs9ffdrnkwr"; depends=[class FactoMineR ggplot2 histogram]; };
+HistDAWass = derive { name="HistDAWass"; version="0.1.3"; sha256="09zg7yrw0zdgy7v6z9awysshks618jiqx01fasi8qb9wrdisvf74"; depends=[class FactoMineR ggplot2 histogram]; };
 HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; };
-HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[jpeg plyr png RColorBrewer rgl tkrgl xtable]; };
+HistogramTools = derive { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; };
+HiveR = derive { name="HiveR"; version="0.2.44"; sha256="1ckbgn4vmv35bssbjrgvqhsx7ihm40ibpnxqwwsw6bv7g6ppx3ch"; depends=[jpeg plyr png RColorBrewer]; };
 Hmisc = derive { name="Hmisc"; version="3.16-0"; sha256="03d372bld4mikyrvmfw00ljiz6jf7szkmhrlgxs5vqk3v81kkp2f"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet proto rpart scales survival]; };
 Holidays = derive { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; };
 HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[deSolve MenuCollection RGtk2]; };
@@ -898,6 +915,7 @@ ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f
 ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
 IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[gtools Rsolnp survival]; };
 IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
+IDTurtle = derive { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
 IFP = derive { name="IFP"; version="0.2.0"; sha256="02dm2qbnrs2yi6c64j90hdfimmdsld46k1wdkay8pfg62jy9rrwa"; depends=[coda haplo_stats]; };
 IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
 IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
@@ -905,12 +923,14 @@ INLABMA = derive { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8
 IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; };
 IPSUR = derive { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
 IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[MASS micEcon miscTools qcc]; };
+IRISMustangMetrics = derive { name="IRISMustangMetrics"; version="1.0.0"; sha256="00s3jg1fsicqbmh52ajhacd7r11pnjpgv7qj2n4mdpxfvbndr1v3"; depends=[IRISSeismic pracma RCurl seismicRoll signal stringr XML]; };
+IRISSeismic = derive { name="IRISSeismic"; version="1.0.5"; sha256="1mgb774bmy20c4dzisb7ij4xqz9jhajn384nb7sfcnz5khxznxc4"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
 IRTShiny = derive { name="IRTShiny"; version="1.0"; sha256="1gjfqjqk7izl23b96g758dn6pb784ayb8yjjlryyrwga6mgsqdik"; depends=[beeswarm CTT ltm shiny shinyAce]; };
 ISBF = derive { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
 ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
 ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; };
 ISOcodes = derive { name="ISOcodes"; version="2015.04.04"; sha256="1mg7mifcqh0g0ra4f1skng6fyp2rhfv2xd9m7nyih39inzdjkcdf"; depends=[]; };
-ISOpureR = derive { name="ISOpureR"; version="1.0.8"; sha256="0jjamyj4rf078rfa2qqrn4i55025sc5968lq95yadbw0izxb51i8"; depends=[Rcpp RcppEigen]; };
+ISOpureR = derive { name="ISOpureR"; version="1.0.18"; sha256="1hh23d4dzhkqli68466gs2n6zhlhwjl53dvrpqvl6ag6i4x974ag"; depends=[futile_logger Rcpp RcppEigen]; };
 ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
 ISwR = derive { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; };
 IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; };
@@ -922,6 +942,7 @@ InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja
 IndependenceTests = derive { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
 InfDim = derive { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
 InferenceSMR = derive { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
+InformationValue = derive { name="InformationValue"; version="1.1.0"; sha256="0lnwvxjr1q30aqrcmcrwnliwix8195ax2p814zi13x2rbw59lqx2"; depends=[ggplot2]; };
 IntLik = derive { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
 InterVA4 = derive { name="InterVA4"; version="1.5"; sha256="0w2klq9dara941d4xz85qrq8dcp7vpc6rrz2k9ry01rsnpdzzybh"; depends=[]; };
 Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
@@ -935,7 +956,7 @@ IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjk
 IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[magrittr nnet plyr Rcpp]; };
 Iso = derive { name="Iso"; version="0.0-17"; sha256="0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0"; depends=[]; };
 IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
-IsoGene = derive { name="IsoGene"; version="1.0-23"; sha256="18sl1qki2dn4ldycpqazj23zcibs3zqwp355q24nwr802xx3y4a6"; depends=[affy Biobase ff Iso xtable]; };
+IsoGene = derive { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; };
 IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; };
 JADE = derive { name="JADE"; version="1.9-92"; sha256="0ki3jpz4npjikn3jjb7ppiyx0flhxx3p8aghjxlm3klhkm0k6ix4"; depends=[clue]; };
 JAGUAR = derive { name="JAGUAR"; version="2.0"; sha256="1c9pyg9jph95161g6zz0jlv5hlyvr9z960by7x3pv7plfkppjy7m"; depends=[doParallel lme4 plyr Rcpp]; };
@@ -969,7 +990,7 @@ KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb66
 Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
 KernSmooth = derive { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
 KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[plotrix Rcpp rgl]; };
-Kernelheaping = derive { name="Kernelheaping"; version="0.9"; sha256="0x42cv28c074zcb023plb3pw5ffrihwbl1jlwm2f4h68q84ra3a4"; depends=[evmix ks MASS plyr sparr]; };
+Kernelheaping = derive { name="Kernelheaping"; version="1.0"; sha256="0i255s5gwlcydxpn69kz7qyvzqbr3syppkzq1sq3sfn680i3hdyq"; depends=[evmix ks MASS plyr sparr]; };
 Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; };
 KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[hash rJava Sejong stringr tau]; };
 Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; };
@@ -1030,7 +1051,7 @@ LiblineaR = derive { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfc
 LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; };
 LinCal = derive { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
 LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
-LindenmayeR = derive { name="LindenmayeR"; version="0.1.4"; sha256="05aq7qmzb7a6kw24pwlg78ch17y945ggrxqn7l2rypn1vfm0br9x"; depends=[stringr]; };
+LindenmayeR = derive { name="LindenmayeR"; version="0.1.6"; sha256="10a1m4yqr02gg5akxknwmhrlbqxnza78z8rm0ym36c4vlz8b0hyi"; depends=[stringr]; };
 LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[expectreg kernlab LiblineaR]; };
 Lmoments = derive { name="Lmoments"; version="1.1-6"; sha256="0jffnlamll5mwxrfqrb1qr8kjcn40y57kzd10kkm98vzfjcwg4y4"; depends=[]; };
 LncMod = derive { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; };
@@ -1056,12 +1077,12 @@ MAPA = derive { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv
 MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
 MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
 MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; };
-MASS = derive { name="MASS"; version="7.3-42"; sha256="10gv2i0i0ap3yrca53fwx9afl7zri1xfbwncnxi1p58zrwjs54lx"; depends=[]; };
+MASS = derive { name="MASS"; version="7.3-43"; sha256="12cj337xrxrdbvk1dc2vnwviscdxj9ll6aykwisqq2qjcix090d6"; depends=[]; };
 MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; };
 MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
 MATA = derive { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
 MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
-MAVIS = derive { name="MAVIS"; version="1.1"; sha256="1nbvm6nfwymim63xvfqpvyk1w5fv6cwfh6cl2089myimid22ws1l"; depends=[compute_es ggplot2 MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS]; };
+MAVIS = derive { name="MAVIS"; version="1.1.1"; sha256="1ydmnf4nn1d0iik3ldkk8d4291fvzhrgsjm0qkzd242r0mm2ss2p"; depends=[compute_es ggplot2 MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS]; };
 MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach MASS multcomp randomForest]; };
 MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
 MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; };
@@ -1070,6 +1091,7 @@ MBA = derive { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh
 MBCluster_Seq = derive { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
 MBESS = derive { name="MBESS"; version="3.3.3"; sha256="12jsrxwdprrahqbk0i0js7lja81ydy385xmijlqk0slppd72dd9c"; depends=[]; };
 MBI = derive { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
+MBTAr = derive { name="MBTAr"; version="1.0.0"; sha256="0324bn4r5434zj47krg6mka9ajwx7mdxhibkbf06x3a7kmh8zgjf"; depends=[jsonlite]; };
 MBmca = derive { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; };
 MC2toPath = derive { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
 MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; };
@@ -1129,13 +1151,14 @@ MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54s
 MPDiR = derive { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
 MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
 MPSEM = derive { name="MPSEM"; version="0.2-6"; sha256="1vmdjnhxl8v7xw71kd1m66vhgaa1q0vvifd67v8fmii0i0i5i35y"; depends=[ape MASS]; };
-MPTinR = derive { name="MPTinR"; version="1.9.2"; sha256="1k9mkpwrvrkqh2467kklj9v111pjdwfblk7zpikk18v43qjlayb6"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
+MPTinR = derive { name="MPTinR"; version="1.10.3"; sha256="0281w5dhg8wmi1rz80xribq437shp4m890c504kggsacr28mbhkw"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
 MPV = derive { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
 MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
 MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
 MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[coda KMsurv survival]; };
 MRIaggr = derive { name="MRIaggr"; version="1.1.2"; sha256="0z410xkfyaqfrdiwkw29z7l6n15hdwd4dwbjn211sj6s90fa4q2w"; depends=[Rcpp RcppArmadillo]; };
 MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[ggplot2 lmtest lubridate plyr reshape2]; };
+MRQoL = derive { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; };
 MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[Formula matrixcalc]; };
 MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
 MRwarping = derive { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
@@ -1150,12 +1173,12 @@ MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757z
 MTS = derive { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; };
 MTurkR = derive { name="MTurkR"; version="0.6.5.1"; sha256="0yg2ycramz0rpac4bfyq8wciyv9jl93al0qsdbzrl7c37z151w3l"; depends=[digest RCurl XML]; };
 MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; };
-MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; };
+MVA = derive { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; };
 MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
 MVN = derive { name="MVN"; version="4.0"; sha256="1ql50ch6qig7r0xnfv5f74k3vc32k04jgmvjbndgyzbacn2ibrm7"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; };
-MVR = derive { name="MVR"; version="1.30.1"; sha256="0rs1j2kfa43c0l0vsayrql8fchpyfrrp2hh0cq77pvhpviw4v4ga"; depends=[statmod]; };
+MVR = derive { name="MVR"; version="1.30.2"; sha256="1mq1czz5ipfy19iismdxzrcirji3qvg4av3fabaach20pfdpbrzx"; depends=[statmod]; };
 MVar_pt = derive { name="MVar.pt"; version="1.2"; sha256="1p3xjlykg40zz5354drz962wm9bcp9kmz8fd56pza7dlybblv9i8"; depends=[]; };
-MXM = derive { name="MXM"; version="0.4"; sha256="1hb30n31a54z1v11vmkccdq62h73divmjfv6s7d2a5371xldj73f"; depends=[Hmisc MASS ROCR survival TunePareto VGAM]; };
+MXM = derive { name="MXM"; version="0.4.3"; sha256="028ap2fzw6sqs4wm26g1124fmmmmhzjvgi42ryjcqa7ina8sly6z"; depends=[Hmisc MASS ROCR survival TunePareto VGAM]; };
 MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
 Maeswrap = derive { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; };
 ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; };
@@ -1165,16 +1188,18 @@ MareyMap = derive { name="MareyMap"; version="1.3.0"; sha256="1blbz1rr0p4fljk7fz
 MarkowitzR = derive { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04w5f6s6qs51db8jccpfj10sighsv1l7d056n2xjn"; depends=[gtools matrixcalc sandwich]; };
 MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; };
 MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
+MatchLinReg = derive { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
 Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
 MatchingFrontier = derive { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
 Matrix = derive { name="Matrix"; version="1.2-2"; sha256="0f0a8rl8lx1f0f50fxfq4q37d52hd70a611vvgq3rsb39911j935"; depends=[lattice]; };
 MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; };
 MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; };
 MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
-MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.4"; sha256="04ljjzcqfgy136wviz92gdavqzjhbai1v69nj4kg6vc6nwvkhnbx"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
+MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.3.2"; sha256="0mxdz3268mfw8h0hpg4bpfsp9rmbpc68bf2ah70i7gkmfq3x4zyz"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
 McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
 Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[forecast tseries]; };
 MedOr = derive { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
+Mediana = derive { name="Mediana"; version="1.0.1"; sha256="18whlzikkcbi1wjpbanr9yzcm0xrl0c1zyylzj1nv1dnhrylgslj"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; };
 MenuCollection = derive { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; };
 MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
 MetABEL = derive { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
@@ -1183,7 +1208,7 @@ MetNorm = derive { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1av
 MetSizeR = derive { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
 MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
 MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; };
-MetaLandSim = derive { name="MetaLandSim"; version="0.3"; sha256="04pyl9p2mqf4sgsfbzc2l0hccnq6z9q1929lq24ip0g8pn2svj96"; depends=[Biobase e1071 fgui googleVis maptools raster rgeos sp spatstat spgrass6]; };
+MetaLandSim = derive { name="MetaLandSim"; version="0.4"; sha256="1r2yr3zmd1ldcaxnxqdd6z0vv1jnwv2ghchrsn463r0ibbpciw2a"; depends=[Biobase e1071 fgui googleVis maptools raster rgeos rgrass7 sp spatstat]; };
 MetaPCA = derive { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
 MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; };
 MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1rc7sw1dfyazdm2d57wcmhkggfg3hkdn1vv"; depends=[SKAT]; };
@@ -1196,7 +1221,7 @@ Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b
 MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; };
 MiRSEA = derive { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
 MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
-MicSim = derive { name="MicSim"; version="1.0.8"; sha256="0i9vyim7wfnaf1zcs1vz6yc7xkr1hzhqcccbcvg15vkzhr23f8lg"; depends=[chron rlecuyer snowfall]; };
+MicSim = derive { name="MicSim"; version="1.0.9"; sha256="1c7gkyb3vpqm14qfwkl06kp3b7rng8sdac74n5j57dspygbb6rw4"; depends=[chron rlecuyer snowfall]; };
 MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[Hmisc memisc]; };
 MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
 MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; };
@@ -1209,7 +1234,7 @@ MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41g
 MixGHD = derive { name="MixGHD"; version="1.7"; sha256="0cbrm5n6gsa61fpk02l3fky482vc2z9wd48hpv87pck6pd7ihqk9"; depends=[Bessel e1071 ghyp MASS mixture mvtnorm numDeriv]; };
 MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
 MixSim = derive { name="MixSim"; version="1.1-1"; sha256="1a1hrsnm6zv9vag7hq8plrkjr4ak26w7k58wdkgxsjb9r6qzm1yf"; depends=[MASS]; };
-MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; };
+MixedTS = derive { name="MixedTS"; version="1.0.3"; sha256="19cf7iir6ann3ahpslysn48pyirr7qbx6vykshf9kkk0rsh6h5ax"; depends=[MASS]; };
 MixtureInf = derive { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; };
 Mobilize = derive { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[ggplot2 Ohmage reshape2 wordcloud]; };
 Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[class mvtnorm zoo]; };
@@ -1238,7 +1263,7 @@ MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102
 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
 Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
 NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; };
-NAM = derive { name="NAM"; version="1.3.2"; sha256="0rzhqs9qcry3w4q1lcfzmp4fndbmj4bm8981i7nn4cipcjfx7635"; depends=[randomForest Rcpp]; };
+NAM = derive { name="NAM"; version="1.3.3"; sha256="17b4xbhdncql5wl2a016xh45jm0mip0g10nrhd41v5m1s5k81k4h"; depends=[randomForest Rcpp]; };
 NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; };
 NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
 NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
@@ -1308,10 +1333,11 @@ OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40k
 OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
 OPI = derive { name="OPI"; version="2.1"; sha256="1pzw5b4gwf1q98547cgq7b363fn72ll0zlvcahy56wc1ci5ny3dd"; depends=[]; };
 ORCI = derive { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; };
-ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni6nrwnhk11bbr00ycqym39alr2wjw"; depends=[Iso]; };
+ORCME = derive { name="ORCME"; version="2.0.2"; sha256="1pm8ajj24qqj2fir0gjzq5f4mfpl1cnj6fm2z5qg6g3sbnm57ayk"; depends=[Iso]; };
 ORDER2PARENT = derive { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; };
 ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; };
 ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; };
+OTE = derive { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; };
 OUwie = derive { name="OUwie"; version="1.45"; sha256="1g1315g015pcnd7g8k0vngjg7f842nq8ixhmqnj64by4vsafliva"; depends=[ape corpcor lattice nloptr numDeriv phangorn phytools]; };
 Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
 OasisR = derive { name="OasisR"; version="1.0.0"; sha256="0anw1ncbjjmlnhigcfwm9zqmp4ah5cfbmmm3588k95xxp6xq9vmv"; depends=[rgdal rgeos spdep]; };
@@ -1326,9 +1352,10 @@ OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f
 OpasnetUtils = derive { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[digest ggplot2 httpRequest plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
 OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
 OpenMPController = derive { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
-OpenMx = derive { name="OpenMx"; version="2.2.4"; sha256="1w72ikysda45zbvwlr297fqqjl3law2r6m3c9n9j5d8r3clfhqyl"; depends=[BH digest MASS RcppEigen StanHeaders]; };
+OpenMx = derive { name="OpenMx"; version="2.2.6"; sha256="07g1558487rasr78fy1zphpz2lac7j0xjy9zsmpg3b17y1cy49wr"; depends=[BH digest MASS RcppEigen StanHeaders]; };
 OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
 OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[raster rgdal rJava]; };
+OptGS = derive { name="OptGS"; version="1.1"; sha256="1fy1im2ns5mxl15jv0w1d7kzfapff93kbjwjy0ji1pxcxafs0m42"; depends=[]; };
 OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
 OptInterim = derive { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
 OptimalCutpoints = derive { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; };
@@ -1360,6 +1387,7 @@ PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5
 PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; };
 PBSmapping = derive { name="PBSmapping"; version="2.69.76"; sha256="1fci7mx5m3jqy92nqfaw5w5yd5rw6f0bk5kya1v0mmvf7j715kar"; depends=[]; };
 PBSmodelling = derive { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; };
+PCA4TS = derive { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; };
 PCAmixdata = derive { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; };
 PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; };
 PCGSE = derive { name="PCGSE"; version="0.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[MASS RMTstat safe]; };
@@ -1376,14 +1404,14 @@ PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9y
 PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[gdata RColorBrewer xtable]; };
 PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; };
 PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; };
-PGRdup = derive { name="PGRdup"; version="0.2"; sha256="12vxdw4093xmmpcl6ars7h03f1a21gjl5p29r5d19hp68h4hchi1"; depends=[data_table igraph stringdist stringi]; };
+PGRdup = derive { name="PGRdup"; version="0.2.1"; sha256="1hkkpylfchs06a42q19sv9ixc3bd7ilk9jc4qmiqg42j0gsizilm"; depends=[data_table igraph stringdist stringi]; };
 PHENIX = derive { name="PHENIX"; version="1.2"; sha256="0fnrx2xf6q9ng9pwfxbbbzvcf6kqj12byd81x0q0vfl85h1xddws"; depends=[ppcor SuppDists]; };
 PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
 PHeval = derive { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; };
 PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[ARTP snowfall survival xtable]; };
 PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
 PK = derive { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; };
-PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3yplqp68zl3p9g2shkam60p6w"; depends=[base64enc]; };
+PKI = derive { name="PKI"; version="0.1-3"; sha256="1xhc84k4iszvfawwwzrwclfs41nvb8bmyygapxmsxjky725s7k1g"; depends=[base64enc]; };
 PKPDmodels = derive { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
 PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
 PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
@@ -1396,22 +1424,23 @@ PMCMR = derive { name="PMCMR"; version="1.1"; sha256="0f3882rjyxlcr183qa9y22bxh8
 PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp]; };
 PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
 PPtreeViz = derive { name="PPtreeViz"; version="1.1.0"; sha256="0rdic7xdb5brxkhdrfcr7mdzxz1a02kjjkln7vwxnqxrhicx6pwz"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo reshape2]; };
+PRIMsrc = derive { name="PRIMsrc"; version="0.5.7"; sha256="1va2ck6m8n8mih6qd55fr2jd84gch3d676glcar51139552ddn5h"; depends=[glmnet Hmisc MASS survival]; };
 PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[ggplot2 gplots Matrix]; };
 PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; };
 PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
 PRROC = derive { name="PRROC"; version="1.1"; sha256="1v35z9inzb6x42fil8z7kfcrnfif93cj8974mfbqhhx0f9vi476a"; depends=[]; };
 PReMiuM = derive { name="PReMiuM"; version="3.1.1"; sha256="10xrgqq6vii5xcxcf6jqbhzmkiy88ssxjvn2pnfx5a9xj037ymqb"; depends=[BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
-PResiduals = derive { name="PResiduals"; version="0.2-1"; sha256="0my5slprmswazsxgjvpw8hjr41aqxm6j1s2dga65fvpfv5qimsw6"; depends=[actuar Formula MASS rms sandwich]; };
+PResiduals = derive { name="PResiduals"; version="0.2-2"; sha256="1c1j9avnaprlcw6x86cf4hy45cb7ki6pq8xj0gi6dyswbs1mxhlf"; depends=[Formula MASS rms]; };
 PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; };
 PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
 PSCBS = derive { name="PSCBS"; version="0.44.0"; sha256="1bpvqn2p8pw57dpwk1mr51rsiqirk5sywrycqwbazvjr7hkiqa3d"; depends=[DNAcopy matrixStats R_cache R_methodsS3 R_oo R_utils]; };
 PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[deSolve MASS numDeriv ucminf]; };
 PST = derive { name="PST"; version="0.86"; sha256="0m6v7j36v47zdqqd3lf05w6pk0f3wfs1kix1qfvy2gj8n41jjmxf"; depends=[RColorBrewer TraMineR]; };
-PTAk = derive { name="PTAk"; version="1.2-9"; sha256="1wbjak8dp53601z39kkpa4ysm264x32371rbgbzmyzx89ap2c0cq"; depends=[tensor]; };
+PTAk = derive { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; };
 PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; };
 PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dclone dcmle]; };
 PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; };
-Pade = derive { name="Pade"; version="0.1-3"; sha256="0jysdk55gnxa3x0j9v7r7qqqim0wfjph1v3amn08xf5wh5fd68yi"; depends=[]; };
+Pade = derive { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; };
 PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; };
 PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
 Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
@@ -1420,6 +1449,7 @@ ParallelForest = derive { name="ParallelForest"; version="1.1.0"; sha256="1xa9lf
 ParamHelpers = derive { name="ParamHelpers"; version="1.5"; sha256="1ywsc96gc252i6girr2ph674wfrzjfk96l2w8512rqy9bgimr0lr"; depends=[BBmisc checkmate]; };
 ParentOffspring = derive { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
 ParetoPosStable = derive { name="ParetoPosStable"; version="1.0.3"; sha256="0f3f4wn33vw1y3cjcvlk44g8z6hjkv4ws535pkcz3lgb95fl4q0n"; depends=[ADGofTest lmom]; };
+Pasha = derive { name="Pasha"; version="0.99.16"; sha256="1arzvii3rm4l94ivjccxvy9jgk8answy4r97l0zh7sznng8w1x6z"; depends=[Biostrings bitops GenomicAlignments GenomicRanges gtools IRanges Rsamtools S4Vectors ShortRead]; };
 PatternClass = derive { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqjnc7pnbya7gyl160kzl56nys9g0y1sa6cqycy3y5x"; depends=[SDMTools]; };
 Peaks = derive { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; };
 PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yhq1z6dqjzhkb9l0f88jrr4iyclns1pcqvrvi"; depends=[]; };
@@ -1427,19 +1457,21 @@ PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf7
 PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; };
 PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; };
 Peptides = derive { name="Peptides"; version="1.1.0"; sha256="0nfldckrb9cvxnzqkhqr06d8a5nna5b900439x49r8njcwr4xpcg"; depends=[]; };
-PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasgcxcza2q02821sg8zcs0vk5k80md9a7"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
+PerFit = derive { name="PerFit"; version="1.4"; sha256="1pjyns9qsqr7c3m5n8a12z3i2b0y98alq0fs84r909m4m5lb22k3"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
 PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp]; };
 PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; };
 PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; };
 PermAlgo = derive { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; };
 PhViD = derive { name="PhViD"; version="1.0.6"; sha256="04vh3892fwb8pn2wmsw5449al80z5sm6avi6b67shky942dasl17"; depends=[LBE MCMCpack]; };
 PharmPow = derive { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
+PharmacoGx = derive { name="PharmacoGx"; version="1.0.6"; sha256="0ly3zb3kj2hb46745gcdangafz0crywsflmq7l5yvjqq3s6i3ahd"; depends=[Biobase caTools downloader magicaxis piano RColorBrewer]; };
 PhaseType = derive { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
 PhyActBedRest = derive { name="PhyActBedRest"; version="1.0"; sha256="0fpg17fwap12da7xka8pnd1wk6rbmw3zl099588g2r05wq3425sx"; depends=[]; };
 PhyloMeasures = derive { name="PhyloMeasures"; version="1.1"; sha256="1wxm9yiplasxhqxs3qxys46k1i7n459frxxh275abczafq46l8if"; depends=[ape]; };
 PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
 PivotalR = derive { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2lslkb78qhj05765k9snkgdhh4dfnlgnyb19kkw"; depends=[Matrix]; };
 PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; };
+PlotPrjNetworks = derive { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; };
 PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; };
 PogromcyDanych = derive { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; };
 PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; };
@@ -1462,13 +1494,13 @@ PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxc
 PortfolioAnalytics = derive { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; };
 PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
 PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp RcppArmadillo]; };
-Power2Stage = derive { name="Power2Stage"; version="0.4-1"; sha256="0g2gvi890hv497h7344j0rnf16k375nlbmxq9v4vh65wkb2bp140"; depends=[PowerTOST]; };
-PowerTOST = derive { name="PowerTOST"; version="1.2-07"; sha256="0d8nbha0jwkz4phiddpfm32kf8hjrkck05y3w60f40110j9f8yy7"; depends=[mvtnorm]; };
+Power2Stage = derive { name="Power2Stage"; version="0.4-2"; sha256="0h1zy5ppqb90x1225k3iqk2cvb2ld0pv6baj6vqz5690rr4g936y"; depends=[PowerTOST]; };
+PowerTOST = derive { name="PowerTOST"; version="1.2-08"; sha256="19963whk1ij255dk0xrg3iy3sgqa17l2js5vcakgh1jh131acsg2"; depends=[mvtnorm]; };
 PracTools = derive { name="PracTools"; version="0.2"; sha256="1njnm0rk2z9p3p8wsj881mddqhpayh56gyyis4cwb5b6pc344s9p"; depends=[]; };
 PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
 PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
 PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
-PrevMap = derive { name="PrevMap"; version="1.1.5"; sha256="0bzk09ygz4i3v8s39p0n157wrylp38h5xz32f18py8gr776x311n"; depends=[geoR maxLik pdist raster splancs]; };
+PrevMap = derive { name="PrevMap"; version="1.2"; sha256="06036c5171lz8ys6sh2q58jq6frb9j5rgzd2v862prr6jg5643ci"; depends=[geoR maxLik pdist raster splancs truncnorm]; };
 PrivateLR = derive { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; };
 ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
 ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; };
@@ -1485,18 +1517,20 @@ PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ng
 PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.2"; sha256="1xn4ygpvj6pm548yj5kjh2l8n59p2caihfpbkykvbkzgf7hq8p00"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
 PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
 PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; };
+PythonInR = derive { name="PythonInR"; version="0.1-0"; sha256="0zbd0yi7f49r20kjljfyvpmmw7zdvw6hi2kqdijz59p53dwzjyml"; depends=[pack R6]; };
 QCA = derive { name="QCA"; version="1.1-4"; sha256="0wg2yfg61bmcxmkxvm9zjrnz4766f176y4gyqvfp5hsp9pp0h2lm"; depends=[lpSolve]; };
 QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
 QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; };
 QCAfalsePositive = derive { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
 QCAtools = derive { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[directlabels ggplot2 QCA stringr]; };
 QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
+QFRM = derive { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
 QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeSeries]; };
 QSARdata = derive { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
 QTLRel = derive { name="QTLRel"; version="0.2-14"; sha256="05x56a8fjr6xk38dphdzh77y520cr6zykjp3qlx27drk9s5z06cs"; depends=[gdata]; };
 QUIC = derive { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
 QZ = derive { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzypgb1jhf2by147gv103izkrz"; depends=[]; };
-QoLR = derive { name="QoLR"; version="1.0"; sha256="1ah6x1fcs4l571jvgm0c257cgxhhpkzfhqimwbb9j7xbz3h55lp3"; depends=[survival zoo]; };
+QoLR = derive { name="QoLR"; version="1.0.1"; sha256="0hgvb013d2ckvg863lidyjybm6rnrlwmq2y0g0vqxzh05rp6wii5"; depends=[survival zoo]; };
 QuACN = derive { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; };
 QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
 Quandl = derive { name="Quandl"; version="2.6.0"; sha256="1mz39sj7dxfh9p5kdq7bxlifbg9izqz04l3ilnfchva7qq1ij01q"; depends=[httr xts zoo]; };
@@ -1525,7 +1559,7 @@ R2MLwiN = derive { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s
 R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[boot coda]; };
 R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[cairoDevice gWidgets gWidgetsRGtk2 lattice latticeExtra lme4 MASS Matrix proto RGtk2Extras statmod]; };
 R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; };
-R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-20"; sha256="052frb3qlqfy6zl0qd2a9d4w2s7prfvdb0vn45rns68q03dma1ml"; depends=[boot coda]; };
+R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; };
 R2admb = derive { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; };
 R2jags = derive { name="R2jags"; version="0.5-6"; sha256="0zknl9qrypp96qz6rx7bkxg7bslvsnlhrgh749q4q566fz944n1g"; depends=[abind coda R2WinBUGS rjags]; };
 R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; };
@@ -1535,6 +1569,7 @@ R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0a
 R6 = derive { name="R6"; version="2.1.0"; sha256="0vszmwpc32h3gd5jxr47v338nci69cj30wf0b6hkmwznq34hwdfc"; depends=[]; };
 RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
 RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape Biostrings geiger phangorn]; };
+RAHRS = derive { name="RAHRS"; version="1.0.2"; sha256="0s7vkmyc3yh62m2xbsvajgvi9xdw5x4irnp7rcllhqa7z9nj50c9"; depends=[pracma RSpincalc]; };
 RAM = derive { name="RAM"; version="1.2.1"; sha256="11ymhx0nk113cy068s52hjj38y8glv8nh24yljqqvr1fd9fmy64g"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra Hmisc labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
 RAMP = derive { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; };
 RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[ellipse lavaan]; };
@@ -1548,6 +1583,7 @@ RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8n
 RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
 RAtmosphere = derive { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
 RBPcurve = derive { name="RBPcurve"; version="1.0-20"; sha256="1fk2zj16xj8n9jnydzd60crdfsigqd6xs2hq572b9r65ldiikv3z"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
+RBerkeley = derive { name="RBerkeley"; version="0.7-5"; sha256="049qvlpqwcaj82fdl815c0b2il7jbs6karibqpkq0fa3hq0q4hzz"; depends=[]; };
 RBitly = derive { name="RBitly"; version="0.6.1"; sha256="0lwwx9la3dhjy4r14kn8lgz85wwnk59ammn7jh45z2nyk7zflkdr"; depends=[httr jsonlite stringr]; };
 RCA = derive { name="RCA"; version="1.4.5"; sha256="0s200s28a6gh3dggad52dgqnf0k2jsfrqv1hbg8w2529v4s3dc5i"; depends=[igraph]; };
 RCALI = derive { name="RCALI"; version="0.2-15"; sha256="0w9807dyjghqy1rnv2c0k4kdjlwxzg5fk5r3rsqrmzjj4r8x9g9w"; depends=[splancs]; };
@@ -1559,10 +1595,10 @@ RCircos = derive { name="RCircos"; version="1.1.2"; sha256="0j7ww2djnhpra13vjr6y
 RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
 RColorBrewer = derive { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
 RConics = derive { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
-RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RCurl RJSONIO]; };
+RCryptsy = derive { name="RCryptsy"; version="0.4"; sha256="01rz9wz5y1k77mjw4zs0jng3k4zwqda32m5xvw6kx7vkgzfas6q0"; depends=[RCurl RJSONIO]; };
 RCurl = derive { name="RCurl"; version="1.95-4.7"; sha256="1qsxffqcb3lg3zkq6l1l78bm52szlk4d2y2bnmxn4lg0i4yxfx48"; depends=[bitops]; };
 RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
-RDML = derive { name="RDML"; version="0.8-4"; sha256="0zrzi81rlxz8hrpz19g7v470fh930n5y6brn6mjq52shn0ap742m"; depends=[assertthat dplyr plyr R6 XML]; };
+RDML = derive { name="RDML"; version="0.9-1"; sha256="0ir8qp3k326gxy5f0hy144zi8xcgsk6svahz7lr5pjfj05czmxxm"; depends=[assertthat dplyr plyr R6 rlist tidyr XML]; };
 RDS = derive { name="RDS"; version="0.7-2"; sha256="143pb13wg0ms9zaiilb3ylqj6r6bcy4iqbq19j57z33i1q6ll51c"; depends=[ggplot2 gridExtra igraph reshape2 scales]; };
 RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; };
 RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
@@ -1574,7 +1610,7 @@ REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fz
 REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
 REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[lattice rJava]; };
 REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
-RESS = derive { name="RESS"; version="1.1"; sha256="1g4g15m29cb6c60ah86si6ibi8sb2j7spqml6lmcflk4rrnyi4pc"; depends=[]; };
+RESS = derive { name="RESS"; version="1.2"; sha256="13125b616z3ib2y9bkn770h4ix914gxgqi0yxqnr99qc99n7lavs"; depends=[]; };
 REST = derive { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; };
 REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; };
 RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
@@ -1585,7 +1621,7 @@ RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0z
 RFmarkerDetector = derive { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; };
 RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[plyr RCurl XML]; };
 RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; };
-RGA = derive { name="RGA"; version="0.2.2"; sha256="1n3czw1yl13ws23yv2rhpq9l7wm0lvgm0jidh6j0mb833322jljx"; depends=[curl httpuv httr jsonlite shiny]; };
+RGA = derive { name="RGA"; version="0.2.3"; sha256="0a4c5bn5pvrf975psyx03s9a78z9ba851ykqhmx85kl33zmq6mhp"; depends=[curl httpuv httr jsonlite shiny]; };
 RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
 RGENERATE = derive { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; };
 RGENERATEPREC = derive { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
@@ -1608,12 +1644,13 @@ RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9q
 RInside = derive { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp]; };
 RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[abind lattice SparseM svd xtable]; };
 RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; };
-RJSDMX = derive { name="RJSDMX"; version="1.3"; sha256="1z4l6iw404qn3syk2877msywkr8369nic5zzvnx1qj0gj9x2mm2p"; depends=[rJava zoo]; };
+RJSDMX = derive { name="RJSDMX"; version="1.4"; sha256="1g14nrjkspv3wyg9kc5bnn9zb37dw1z8y7mc4sxhacd1n2nxzb97"; depends=[rJava zoo]; };
 RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
-RJaCGH = derive { name="RJaCGH"; version="2.0.3"; sha256="0wz7vhlgzf8smzl7gx01dx070266fnmzw66wpl0im20nxfy8mr0l"; depends=[]; };
-RJafroc = derive { name="RJafroc"; version="0.0.1"; sha256="0zjyr7qz50wvzkais6q9kyf3wp29g15kan73b8wdqrvab0f5rjqs"; depends=[ggplot2 stringr xlsx]; };
+RJaCGH = derive { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; };
+RJafroc = derive { name="RJafroc"; version="0.1.0"; sha256="00nag4yak89pialch9p3r2ln6gs03jl5cx9rmipgvgyg031gf43f"; depends=[ggplot2 shiny stringr xlsx]; };
 RKEA = derive { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
 RKEAjars = derive { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; };
+RKlout = derive { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
 RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[mgcv Rcpp]; };
 RLumShiny = derive { name="RLumShiny"; version="0.1.0"; sha256="0j4w3h1j6dm5q98639am3xfixjdx2xhiiy3qghkb0z8lv5rbvvw5"; depends=[digest googleVis Luminescence RCurl shiny]; };
 RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
@@ -1628,7 +1665,7 @@ RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw
 RMark = derive { name="RMark"; version="2.1.13"; sha256="04wrl4i3d6kwy4masqc17qab24jv8p3kbfcx2z5l11wyf84xaqgx"; depends=[coda matrixcalc msm snowfall]; };
 RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[e1071 lavaan MASS]; };
 RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
-RMySQL = derive { name="RMySQL"; version="0.10.3"; sha256="0791pshzr7rjjcnlm9md7gfsqkzizhzr9vwgnk2acc7sw5hikga6"; depends=[DBI]; };
+RMySQL = derive { name="RMySQL"; version="0.10.4"; sha256="0lybsqmngh9hqkwxgvkz5w13i40i0jbj8k1niwa8yk1fdik57v8d"; depends=[DBI]; };
 RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
 RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[abind fields fossil maps RColorBrewer sp tgp]; };
 RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
@@ -1643,18 +1680,20 @@ ROCS = derive { name="ROCS"; version="1.2"; sha256="1liph11p5dwvm1z5vq7ph5pizzqr
 ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date relsurv survival]; };
 ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
 RODBC = derive { name="RODBC"; version="1.3-12"; sha256="042m7bwjhlzpq2hgzsq0zy4ri3s8ngw3w4qrqh1ag7fprpn55flj"; depends=[]; };
-RODBCext = derive { name="RODBCext"; version="0.2.3"; sha256="0j0774gpnd72mw3x9qv7shiwrk0s5rk8hf0wjq4iy42wwbvql7l6"; depends=[RODBC]; };
+RODBCext = derive { name="RODBCext"; version="0.2.5"; sha256="18a0ajqrq3rcfcsyz0c9mwq6bi03prpg83z9jasbbc866gqs6fvq"; depends=[RODBC]; };
 RODM = derive { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
 ROI = derive { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; };
 ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3cq59app3xdv8dvqr24m937a36lzd274mdl2a9r4fwny2rssa"; depends=[Rglpk ROI]; };
 ROI_plugin_quadprog = derive { name="ROI.plugin.quadprog"; version="0.0-2"; sha256="0mkjq87rv1xf0bggpqd2r4gabv11spgcds2y94r3vpmh8krf71jf"; depends=[quadprog ROI slam]; };
 ROI_plugin_symphony = derive { name="ROI.plugin.symphony"; version="0.0-2"; sha256="1z4cahz0h38jw54p9363ca6i3qq7dwlm3568dr91gvpqf76b05wd"; depends=[ROI Rsymphony slam]; };
+ROMIplot = derive { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; };
 ROSE = derive { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
-RObsDat = derive { name="RObsDat"; version="15.02"; sha256="1fagbmp48rnyln6jh2yzvc414q82q6dvixmia7yqg64lrkzkh302"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
+RObsDat = derive { name="RObsDat"; version="15.08"; sha256="0n64jqba682rdy696yfpi5l5sw6g33421hg1rnb1dwdnvr7yd0y9"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
 ROptEst = derive { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; };
 ROptEstOld = derive { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx evd RandVar]; };
 ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[distr distrEx RandVar ROptEstOld]; };
-ROracle = derive { name="ROracle"; version="1.1-12"; sha256="1ydmckr0wzjgvhhh410l4ih7idbr8140g6v11avh655wffk02q5p"; depends=[DBI]; };
+ROptimizely = derive { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; };
+ROracle = derive { name="ROracle"; version="1.2-1"; sha256="19avgm4sxv052alh938bcvc7z8xx70vdwd9pilaidxydbar5kqz1"; depends=[DBI]; };
 RPANDA = derive { name="RPANDA"; version="1.0"; sha256="1q8chhmdgn697a4qp4f7prdviar29z0py050748qw7ab326lqp5d"; depends=[ape deSolve picante pspline]; };
 RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
 RPEnsemble = derive { name="RPEnsemble"; version="0.2"; sha256="1kbgpbk7gma0vhl0aybdj7bk2chhbggzh7h1w7snddgdvvj6cz10"; depends=[class MASS]; };
@@ -1669,15 +1708,16 @@ RPushbullet = derive { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df
 RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
 RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp]; };
 RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
+RRNA = derive { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
 RRTCS = derive { name="RRTCS"; version="0.0.2"; sha256="0lwc0girdsrni6qv0z7bggqhlwlny4amgkayd8s3cdh3m006dn95"; depends=[sampling samplingVarEst]; };
-RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; };
+RRreg = derive { name="RRreg"; version="0.4.1"; sha256="0qlahjhlfjcbvdr6z3ap8ns8vw8g0pvifrkyvcxfg35p4dr6p3yl"; depends=[doParallel foreach]; };
 RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
 RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
 RSAGA = derive { name="RSAGA"; version="0.94-1"; sha256="0zr3rm3s5pf2l2gkvbsr60srj6s1xx7kn26krpbzz3xqgbfgmz6k"; depends=[gstat plyr shapefiles]; };
 RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
 RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[abind FactoMineR ggplot2 glmnet scales scatterplot3d sqldf XML]; };
 RSEIS = derive { name="RSEIS"; version="3.4-5"; sha256="0wh7977vm721hb566lh721mwn6b4x0p7x6xb7gv0nvrd3kpsw9zn"; depends=[RPMG Rwave]; };
-RSGHB = derive { name="RSGHB"; version="1.1.0"; sha256="08ir7460mg0f414j69s7ffj35drip9qbbzwva1ps6x0gjjdnmzcq"; depends=[]; };
+RSGHB = derive { name="RSGHB"; version="1.1.1"; sha256="0mfxn59p1sd7id1jqw7xk040k6fa8awshfqxdhvka8b93qvwb8f1"; depends=[]; };
 RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; };
 RSNNS = derive { name="RSNNS"; version="0.4-7"; sha256="15293a6lrihk407spv2ndpcf0r9xm5l8ggc1sagf5r2mvbfiv57c"; depends=[Rcpp]; };
 RSNPset = derive { name="RSNPset"; version="0.4"; sha256="1asrl75jlkdp829phjfza10fcl9akiqspbxncd8zf2a23f2r54sy"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
@@ -1685,20 +1725,21 @@ RSPS = derive { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksn
 RSQLServer = derive { name="RSQLServer"; version="0.1.1"; sha256="0xaw8a06xgc78hjg4bndip0jpc7l4glk28pggm2l3j31ybx81kw7"; depends=[DBI rJava RJDBC]; };
 RSQLite = derive { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; };
 RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; };
-RSclient = derive { name="RSclient"; version="0.7-2"; sha256="04ml4pynjl97295wrclvb61mpwacrkzc9x5pbwyfg1qr3l8hss93"; depends=[]; };
+RSclient = derive { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; };
 RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[graph RBGL sybil]; };
 RSelenium = derive { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[caTools RCurl RJSONIO XML]; };
 RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
-RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.3"; sha256="003mazcwz7w814pm8i9zdfmsbijf02n80w48ml4grmjjn1v7x5ar"; depends=[base64enc digest httr jsonlite plyr stringr]; };
-RSocrata = derive { name="RSocrata"; version="1.6.0-12"; sha256="0db1p3bxlh07d43rlg4cmj2gbasqd21mg8qnrrp8zkqasmjdzhn7"; depends=[curl httr jsonlite mime]; };
+RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.4"; sha256="09bfrfbrkbfg49rwvll1pwl9axibk3s4gmlfg3sry227srnqjg5s"; depends=[base64enc digest httr jsonlite plyr stringr]; };
+RSocrata = derive { name="RSocrata"; version="1.6.2-10"; sha256="0nj0g40cy1g47j6nyp3a86g4gcm9ipalbm7dsy2s7367r7k0fa65"; depends=[httr jsonlite mime]; };
 RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp]; };
+RSpincalc = derive { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; };
 RStars = derive { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RCurl RJSONIO]; };
 RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
 RSurveillance = derive { name="RSurveillance"; version="0.1.0"; sha256="1y17bfv0glzzb5rfniia0z4px810kgv2gns0igizw7w427zshnm0"; depends=[epiR epitools]; };
 RSurvey = derive { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9lni9amfqfv4vhz7kakg3a5180j5rcag12"; depends=[MBA rgeos sp]; };
 RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
 RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
-RTDE = derive { name="RTDE"; version="0.1-0"; sha256="00hh1axipp2blrhjwl9mc4fkqv3l132gxlhi9hdy52w20yhwigin"; depends=[]; };
+RTDE = derive { name="RTDE"; version="0.2-0"; sha256="1dj7dsj4256z9m70y2fpcgprxpqbgqxz0dqwn0jl80sj2325f66s"; depends=[]; };
 RTOMO = derive { name="RTOMO"; version="1.1-3"; sha256="10qkqdx2zj2m854z9s57ddf5jbzagac9mq5v6z5393c0s8bx10x8"; depends=[GEOmap RPMG RSEIS splancs]; };
 RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[caTools e1071 glmnet ipred maxent nnet randomForest SparseM tau tm tree]; };
 RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
@@ -1726,14 +1767,14 @@ RadioSonde = derive { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3sy
 Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
 Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; };
 RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
-RandomFields = derive { name="RandomFields"; version="3.0.62"; sha256="1v2dmwl3nq3mw88439z6hjaf3gkz9sf7dqm9iipgk333qw1s6sfk"; depends=[sp]; };
-RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.7"; sha256="1rdhc81gd0y5ss1ap74y1n8g2d7z4gjryviw86z53aznn3ddnbhg"; depends=[]; };
+RandomFields = derive { name="RandomFields"; version="3.1.1"; sha256="1hxf03nz1pcj2w60kys8mlwdxfyr90g7q457ycj9d8j3sd5zz0ip"; depends=[RandomFieldsUtils sp]; };
+RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.10"; sha256="1g5mpdgfapwkaqgxkk7yqlvgf75qv3l4yp81w437d0d2v1fz2mf5"; depends=[]; };
 RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
 RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
 Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp RcppEigen]; };
 RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[PBSmapping RANN RgoogleMaps sp]; };
 Rarity = derive { name="Rarity"; version="1.3-4"; sha256="0zz1axr8a1r6js0la2ncls0l6jnjvx807ay2ngzb52hqbijifghx"; depends=[]; };
-RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; };
+RaschSampler = derive { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; };
 RbioRXN = derive { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[ChemmineR data_table fmcsR gdata KEGGREST plyr RCurl stringr]; };
 Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
 Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp RcppArmadillo]; };
@@ -1744,7 +1785,7 @@ Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiy
 Rchoice = derive { name="Rchoice"; version="0.3"; sha256="1ac2nw03g66z2rgxzv8jqad74cp4c9ry0hvnw77d57ddaxszkrva"; depends=[Formula maxLik msm plm plotrix]; };
 Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; };
 Rcmdr = derive { name="Rcmdr"; version="2.1-7"; sha256="1qn0bfh36shdnm2qbjwggjv19vqkkhng82x39sdbljx0z3g3bmdg"; depends=[abind car RcmdrMisc tcltk2]; };
-RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[abind car e1071 Hmisc MASS sandwich]; };
+RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-3"; sha256="134yr2n0m61bw8rv1iar2l9dk9a178k2pxba0bsxrd1c9j3s1f0j"; depends=[abind car colorspace e1071 Hmisc MASS readxl sandwich]; };
 RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; };
 RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
 RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
@@ -1757,7 +1798,7 @@ RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="
 RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; };
 RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
 RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[ordinal Rcmdr]; };
-RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.4"; sha256="1qxx685wd974dc2zj7myg0jlxz5s63lkjfycc66f3mcj1qk5j4k6"; depends=[MASS mixlm pls Rcmdr xtable]; };
+RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.3"; sha256="0iyy3kzczifz1ipp8sscaycxd2b2bs86sdmgz9w3gsxxqlrhkqh6"; depends=[MASS mixlm pls Rcmdr xtable]; };
 RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0-1"; sha256="1hk8gmv74mngcx2pjgv1zkdh2csixxgd4yqz38bdn1l2zf243czq"; depends=[coda igraph Rcmdr rmeta runjags]; };
 RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
 RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[Rcmdr SCMA SCRT SCVA]; };
@@ -1784,18 +1825,18 @@ RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-5"; sh
 RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.3"; sha256="1ssnky8basr135lhnagq7dlwlj1c9qrvm14hbdm0k3g9gnqmxkgh"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
 Rcolombos = derive { name="Rcolombos"; version="1.5.2"; sha256="1whjn447jk2bjyjf0fwl0165f8x41fjzmkmagl6dfq1c4373sf27"; depends=[httr]; };
 Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; };
-Rcpp = derive { name="Rcpp"; version="0.11.6"; sha256="153gwzg2inxmzs5qrr87r3zabjvfh32i8kdivdy77b3c5yfrl5za"; depends=[]; };
+Rcpp = derive { name="Rcpp"; version="0.12.0"; sha256="182109z0yc1snqgd833ssl2cix6cbq83bcxmy5344b15ym820y38"; depends=[]; };
 Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
 RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp]; };
 RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.6"; sha256="1n4wrllhxn95lgkralvw5jjgff93nay5wdlyihih7f195fq5wqms"; depends=[Rcpp]; };
-RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.200.1.0"; sha256="0vz0yl5k0q57xrnjpz1bxs6j3hpysp1mkcxf5fs6xdy6nzaqsr7x"; depends=[Rcpp]; };
+RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.300.4"; sha256="0d6lda82lh896k7rf9s7alzqklmkrr0jwk8zxf6zqli7g1qmrywb"; depends=[Rcpp]; };
 RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
 RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp]; };
 RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp]; };
 RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; };
 RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo]; };
 RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
-RcppEigen = derive { name="RcppEigen"; version="0.3.2.4.0"; sha256="1p6lfylj0mh059pxbp198r8nci8f89h0gb11x2pi0jgg7cqbxgh6"; depends=[Matrix Rcpp]; };
+RcppEigen = derive { name="RcppEigen"; version="0.3.2.5.0"; sha256="164ghglzdwvrfpiw512j19m1hjpy4h7xyaqhlw1yrncngr2sdb99"; depends=[Matrix Rcpp]; };
 RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; };
 RcppFaddeeva = derive { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
 RcppGSL = derive { name="RcppGSL"; version="0.2.5"; sha256="16zvqgn4hkijsg5fxvzm6hq200w8z4189aag10zciw81ka4isqv5"; depends=[Rcpp]; };
@@ -1803,22 +1844,22 @@ RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2i
 RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[digest pkgmaker Rcpp stringr]; };
 RcppParallel = derive { name="RcppParallel"; version="4.3.14"; sha256="04kch598fqxkclv7ys8s9mqsd9wbzjqk1yjc66drzyycjc8jl9qi"; depends=[]; };
 RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp]; };
-RcppRedis = derive { name="RcppRedis"; version="0.1.4"; sha256="00cv6yicv247bbx617i4k4hfkl5kiv5q2ky84w3sk3g3f0wnp9np"; depends=[RApiSerialize Rcpp]; };
+RcppRedis = derive { name="RcppRedis"; version="0.1.5"; sha256="0yvf3yfdpk7s0vac7njpjdrkcq87j7q750vi6bvilqk9adlbjfny"; depends=[RApiSerialize Rcpp]; };
 RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; };
 RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; };
 RcppStreams = derive { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[BH Rcpp]; };
-RcppTOML = derive { name="RcppTOML"; version="0.0.3"; sha256="0v9gxbr5gb7k273ld6vx2n0vzy22px13s7cvackbm7mhc68bp5jw"; depends=[Rcpp]; };
+RcppTOML = derive { name="RcppTOML"; version="0.0.4"; sha256="0ipfbcp55ghmh8i80vyq0w2js07360wiq3z11qpkb816ln1gqb89"; depends=[Rcpp]; };
 RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
-RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp RcppGSL]; };
+RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.3"; sha256="0s82haf96krr356lcf978f229np6w0aihm2qxcnlm0w3i02gzh3x"; depends=[Rcpp RcppGSL]; };
 Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
 Rd2roxygen = derive { name="Rd2roxygen"; version="1.6"; sha256="0y0vh1dfflh8lrgrdj9wfmwh70ywd9kiia49f09h849mv1ln1z60"; depends=[formatR roxygen2]; };
-Rdistance = derive { name="Rdistance"; version="1.2.2"; sha256="0njfcgcaw8vkvayd102wd5cdp1ai9ghqhi8zsijv6iifxs6yvwq9"; depends=[]; };
-Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[bibtex gbRd]; };
-Rdsdp = derive { name="Rdsdp"; version="1.0.2"; sha256="0rpy3897dargrfrn6qd5m1j6i1pvfk2qa3cny0iacqkgqbg8a4wx"; depends=[]; };
+Rdistance = derive { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; };
+Rdpack = derive { name="Rdpack"; version="0.4-18"; sha256="0s387gadr1bz5f5ix69z0r9hzcp5w4axbrn1iq9932kkincmg8qj"; depends=[bibtex gbRd]; };
+Rdsdp = derive { name="Rdsdp"; version="1.0.3"; sha256="0hsgcb7vk5csrcpzvvbjwhzrgbdr7p92lxahf6x8aflrqdk9d95j"; depends=[]; };
 Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
 ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
 ReacTran = derive { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[deSolve rootSolve shape]; };
-RealVAMS = derive { name="RealVAMS"; version="0.3-1"; sha256="04d4sc3lhlklx1y016rmh3x27m8caxlp53qn2ks5wz52w26pfdhn"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+RealVAMS = derive { name="RealVAMS"; version="0.3-2"; sha256="0rmqy3csgfvq5c3sawvd3v37is8v5nnnrhifschqfsycmadf1gdp"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
 RecordLinkage = derive { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
 Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
 RedditExtractoR = derive { name="RedditExtractoR"; version="1.1.1"; sha256="00y9m55isnhx8bl82nc2rpll4aijkcrxqgkayqpp2yxy4rj6klfj"; depends=[RJSONIO]; };
@@ -1834,14 +1875,16 @@ RenextGUI = derive { name="RenextGUI"; version="1.3-0"; sha256="0ydq57k5va1l10dx
 Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[ape RCurl XML]; };
 ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
 RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
-ReporteRs = derive { name="ReporteRs"; version="0.7.8"; sha256="1gzsdrkmz2g59m2653xfcl4d6zs010hzcjxr6sk26dhxj11alqgr"; depends=[ReporteRsjars rJava]; };
+ReporteRs = derive { name="ReporteRs"; version="0.8.2"; sha256="1widvbfwqvzcjyk746ybz921yifnn1q3ybi3ijy31mixqgm9m9ka"; depends=[ReporteRsjars rJava]; };
 ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; };
 ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
 ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; };
 RevEcoR = derive { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[gtools igraph magrittr Matrix plyr stringr XML]; };
 Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httpuv httr rjson]; };
 Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; };
+Rgbp = derive { name="Rgbp"; version="1.1.0"; sha256="1bz5w8xd9vldlsr23dsbp1s70xwsikl253awv8bk26hck76mk85s"; depends=[mnormt sn]; };
 Rglpk = derive { name="Rglpk"; version="0.6-1"; sha256="011l60571zs6h8wmv4r834dg24knyjxhnmxc7yrld3y2qrhcl714"; depends=[slam]; };
+Rgnuplot = derive { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
 RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; };
 Rhpc = derive { name="Rhpc"; version="0.15-176"; sha256="0amnr1x1zvh5y2cblx4wjw5y5wm1815x4rm7w03f0ri9qdk5i8ax"; depends=[]; };
 RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.15-148"; sha256="1carylfz9gafradbdyg7fz2bypr7n72fbm8vhyiinmp0k4s5ipvc"; depends=[]; };
@@ -1899,7 +1942,7 @@ Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf2
 Rtts = derive { name="Rtts"; version="0.3.1"; sha256="1zgrkj4y7267d1n8iw1q3pgf2lmmklkslf5211kl7v788zxqr9c5"; depends=[RCurl]; };
 Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; };
 Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
-Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6yajd6lwvzy4a1a5gs67dz5k1zbza8avw0"; depends=[]; };
+Runuran = derive { name="Runuran"; version="0.22.0"; sha256="10ial5kz4vfprl1rk4v7dd9l3h5wpvzf4ypynl9c1f6p62vz64im"; depends=[]; };
 RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; };
 Rvcg = derive { name="Rvcg"; version="0.12.2"; sha256="15lj2ba9fwzbqzwwl7wpzij1n983qxmql2fwxjcapkl76hl68kp9"; depends=[Rcpp RcppEigen]; };
 Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
@@ -1910,7 +1953,7 @@ RxnSim = derive { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l
 Ryacas = derive { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; };
 Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; };
 SAENET = derive { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; };
-SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; };
+SAFD = derive { name="SAFD"; version="1.0"; sha256="1mq9ncvgw4lpr2ixram9ds9pjcvmg6vbm31cscyqzky9q8bpyv9f"; depends=[]; };
 SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
 SAMUR = derive { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
 SAMURAI = derive { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
@@ -1934,6 +1977,7 @@ SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24
 SDD = derive { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; };
 SDDE = derive { name="SDDE"; version="1.0.0"; sha256="1vd96w6qjy7ak85gj1c255fb0ifaffp79k6swqnvskvkq2cc524m"; depends=[doParallel foreach igraph iterators]; };
 SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; };
+SDR = derive { name="SDR"; version="0.6.0.0"; sha256="0gjliq7pdssyqnchwyhf7mc6blrycfjg82bf75nxbhmis93g5dc4"; depends=[shiny]; };
 SDaA = derive { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
 SEAsic = derive { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
 SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
@@ -2024,7 +2068,7 @@ SamplerCompare = derive { name="SamplerCompare"; version="1.2.7"; sha256="149ipr
 SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; };
 Scale = derive { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; };
 SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[ellipse MASS]; };
-SciencesPo = derive { name="SciencesPo"; version="1.02.12"; sha256="0v947xjfwyidl2fa6i7drvv9vnskz06kq4rmz46qzns7g0lwfjnq"; depends=[data_table foreign ggplot2 lubridate MASS xtable]; };
+SciencesPo = derive { name="SciencesPo"; version="1.3.6"; sha256="1xsxr5d88y9zs7kakglg93nmxin99g03z8h78ghkazy59rin22b6"; depends=[data_table dplyr ggplot2 magrittr plyr RSQLite scales stringr vcd]; };
 ScoreGGUM = derive { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; };
 ScottKnott = derive { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; };
 ScrabbleScore = derive { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; };
@@ -2036,22 +2080,23 @@ Sejong = derive { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6d
 SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[Ecdat mvtnorm xtable]; };
 SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x0hw0qxbrdhgfrcx5ggw8n4pjfv553p38ni"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
 SemiCompRisks = derive { name="SemiCompRisks"; version="2.0"; sha256="0in3pv66nhb0ar4xfxskvf24c7bqkr9ik069a4nynwnc3idpsq32"; depends=[]; };
-SemiMarkov = derive { name="SemiMarkov"; version="1.4.1"; sha256="048hmbcmhqkvqw8nbzm0136mc9w7b27jy8q9r3rvc3banh854d1m"; depends=[MASS numDeriv Rsolnp]; };
+SemiMarkov = derive { name="SemiMarkov"; version="1.4.2"; sha256="0xfa3arn98pfnhbcq3p880v177dhczcjm5bc1m84kygbhiaifsjg"; depends=[MASS numDeriv Rsolnp]; };
 SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; };
-SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.4"; sha256="038k5vvgrk20n2cbji8qrp9nkg0ck5dcbxnd7wc5hy1l780g4k5g"; depends=[magic mgcv survey trust VGAM VineCopula]; };
+SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.5"; sha256="1m063bv9fqsnmi6aw2w6dx2s2qgh9ci1v9bcvh83zb3j2ajprkrk"; depends=[magic mgcv survey trust VGAM VineCopula]; };
 SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula gamlss_dist magic Matrix mgcv mvtnorm trust VGAM]; };
 SenSrivastava = derive { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; };
 SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
 SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[cluster FactoMineR KernSmooth]; };
 SensusR = derive { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate plyr rworldmap sp]; };
 SeqFeatR = derive { name="SeqFeatR"; version="0.1.7"; sha256="195pkpk9sh99v01mk827axsynwaccygx19i1x0h0ma7bsqlmw1qc"; depends=[ape Biostrings calibrate ggplot2 phangorn plotrix plyr qvalue tcltk2 widgetTools]; };
-SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
+SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
 Sequential = derive { name="Sequential"; version="2.0.1"; sha256="11z7d02j97589s5csq5vzsfal3vip5klhm1q8h8pizqjv32i1lv5"; depends=[]; };
 SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[betareg lattice]; };
 ShapeSelectForest = derive { name="ShapeSelectForest"; version="1.0"; sha256="0jy40aql33xwl4s7y2s3wb6yig4vr6ly6fhz7hn2d59b8428p04q"; depends=[coneproj raster rgdal]; };
 SharpeR = derive { name="SharpeR"; version="1.0.0"; sha256="107nk8ipqx4mzfhlv5b6k6vx60zi9rmvzk8qaxqic170p4ppcl2z"; depends=[matrixcalc sadists]; };
 ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.1.0"; sha256="1v2rr97wz5521cjy41j5vdqq29xd7696pc1rzw4angsfjrq3fnh4"; depends=[]; };
 SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
+SigTree = derive { name="SigTree"; version="1.10.2"; sha256="0d91s2x809mhirkmcdn8zvnivimssqhnydgfwchfrckk6p4jfm40"; depends=[ape phyext2 phylobase phyloseq RColorBrewer]; };
 SightabilityModel = derive { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
 Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.9"; sha256="1cq168ga4p70hgx7rsm9rvam8b0wvjivqp2nsprk39i864j9sr91"; depends=[rgl scatterplot3d]; };
 SimComp = derive { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mratios multcomp mvtnorm]; };
@@ -2082,10 +2127,12 @@ Sofi = derive { name="Sofi"; version="0.0.26"; sha256="0jcnwy308h8qdswapdqpphdx5
 SoftClustering = derive { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; };
 SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
 SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
-SoundexBR = derive { name="SoundexBR"; version="1.1"; sha256="1rhmwbf7687lgwwx1qldljb9j7qj7hcaypawlchmys61ny9500wl"; depends=[]; };
+SoundexBR = derive { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; };
+SoyNAM = derive { name="SoyNAM"; version="1.0"; sha256="0vqaxkbjwqx8xmwsmyvxg0i1x355wjpzgs2ndiv6dgsgdl52yvan"; depends=[lme4 NAM reshape2]; };
+SparseFactorAnalysis = derive { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; };
 SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
 SparseM = derive { name="SparseM"; version="1.6"; sha256="1296snm3481259xwhj97vffwjb2v8367ivf2g5amd4pzqzwx6p1k"; depends=[]; };
-SparseTSCGM = derive { name="SparseTSCGM"; version="2.1.1"; sha256="0xr3l049kssi7k074wggvc96p2zlca076j2hwpwpmna42xl3dmqv"; depends=[abind flare glasso longitudinal MASS mvtnorm network]; };
+SparseTSCGM = derive { name="SparseTSCGM"; version="2.2"; sha256="0a1iscn4l587hn582hx4v8fawn6d9gg1m173fc0bsfpkyckgq8hx"; depends=[abind flare glasso longitudinal MASS mvtnorm network]; };
 SpatPCA = derive { name="SpatPCA"; version="1.0.0.2"; sha256="0f8byi4zhrjj8fdka93r22kbjjqgkx3p06a65sppgvq65v8lff0l"; depends=[fields Rcpp RcppArmadillo]; };
 SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
 SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; };
@@ -2095,7 +2142,7 @@ SpatialPosition = derive { name="SpatialPosition"; version="0.9"; sha256="0w09yr
 SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[Rcpp RcppArmadillo spBayes]; };
 SpatialVx = derive { name="SpatialVx"; version="0.2-4"; sha256="0nm3mripq1fiqn7ydl854azwpl1sdh2ls8gj1k432xsvi02m05y3"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
 SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; };
-SpecHelpers = derive { name="SpecHelpers"; version="0.1.6"; sha256="1h14a1rsk7x5qafn4hcpmannkdf2wdphkzaa3b6nbb9jqjs1szi0"; depends=[gsubfn]; };
+SpecHelpers = derive { name="SpecHelpers"; version="0.1.19"; sha256="1y6mcxz5d0d48awzkp73v8h43bkn8yjhr7whrs5lxv8ykygzfic5"; depends=[gsubfn]; };
 SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; };
 SpecsVerification = derive { name="SpecsVerification"; version="0.3-0"; sha256="19vr4xlx9gx0ph6k2kf59bpbhmzncm1mmzz7ld3pjc7k4jfba3np"; depends=[]; };
 SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; };
@@ -2107,14 +2154,14 @@ StMoMo = derive { name="StMoMo"; version="0.2.0"; sha256="1pddlwf3kns9fzmqddfak6
 StMoSim = derive { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
 StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
 Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; };
-StanHeaders = derive { name="StanHeaders"; version="2.6.0-10"; sha256="0bw11myc16ddi1qhh8dcsf8dqg6dcp1wjbyrp5p98dcc1rym7kmg"; depends=[]; };
+StanHeaders = derive { name="StanHeaders"; version="2.7.0"; sha256="016sha21aff2bmry0n77abhkgr5rqm8sb49y8qasg6xqmdz6cix0"; depends=[]; };
 StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
 Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
 StatDA = derive { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
 StatDataML = derive { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
 StatMatch = derive { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[clue lpSolve proxy RANN survey]; };
 StatMeasures = derive { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; };
-StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS pmr rjags]; };
+StatMethRank = derive { name="StatMethRank"; version="1.2"; sha256="1mk9yl1flr7garf0278mlj2309s620iiingd2cxkmdrzpfa9g4k2"; depends=[MASS pmr Rcpp rjags]; };
 StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[plyr truncdist]; };
 Statomica = derive { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[Biobase distr fBasics multtest]; };
 Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
@@ -2136,17 +2183,19 @@ SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqn
 SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
 Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
 SvyNom = derive { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; };
+SwarmSVM = derive { name="SwarmSVM"; version="0.1"; sha256="10gsasllycnmgaf5xq44ph5x7ajh38cnfd97x4hyc6bk4wz7p42r"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; };
 SweaveListingUtils = derive { name="SweaveListingUtils"; version="0.6.2"; sha256="0n15gkiil9rlb0dhnkfimhcs09av35b7qx79iba7bx3y7spvzaqy"; depends=[startupmsg]; };
 SwissAir = derive { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; };
 SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; };
 SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
 SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
 Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
-TAM = derive { name="TAM"; version="1.9-0"; sha256="0ysl77dk2fxzm5x7910sgpc9ajlijrlmja6sq8xac52qbmj9ggd9"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
+TAM = derive { name="TAM"; version="1.10-0"; sha256="1x53gjaqwm3hfilxkkn50zkdydlrh19bxcawy3hii9nvmkh6crqq"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
 TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
 TAQMNGR = derive { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; };
 TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
 TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
+TCGA2STAT = derive { name="TCGA2STAT"; version="1.0"; sha256="1jvc29k8s9zqf6fk2gd20vz8zyck07mipfzq0pl69m6yf41mxlp2"; depends=[CNTools XML]; };
 TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; };
 TDAmapper = derive { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
 TDCor = derive { name="TDCor"; version="0.1-1"; sha256="001rmwi2v4vy1b2d7wwvvca4xnkizz8dmys3q3xbjv7wrfxyvai8"; depends=[deSolve]; };
@@ -2167,7 +2216,7 @@ TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8
 TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[ExPosition InPosition prettyGraphs TExPosition]; };
 TKF = derive { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; };
 TMDb = derive { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
-TOC = derive { name="TOC"; version="0.0-2"; sha256="0zkwbjyi5dc6y0fzmwkbyrf32h0r5vhxxz67zjrhqc06vyasai8w"; depends=[bit raster rgdal]; };
+TOC = derive { name="TOC"; version="0.0-3"; sha256="0zgggkxsn7mqa5bh9rpb29ag019bwpy4yf3nd3nrcz5yk22bh7bn"; depends=[bit raster rgdal]; };
 TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; };
 TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[gdata gWidgets gWidgetstcltk plyr rappdirs RCurl taxize XML]; };
 TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
@@ -2188,14 +2237,14 @@ TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l
 TScompare = derive { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; };
 TSdata = derive { name="TSdata"; version="2015.4-2"; sha256="1c0ly1gs6p3fspwvk1f6c2xgzvc7p7pkzakm44lisbyjklacnilp"; depends=[]; };
 TSdbi = derive { name="TSdbi"; version="2015.1-1"; sha256="1bqxpd4g0ppm1261srgwjzghfwwl53vybkihz99azckky0539m1s"; depends=[DBI tframe]; };
-TSdist = derive { name="TSdist"; version="2.2"; sha256="1zqqy2pxjzxlj1d32d086qrkf9rlgj9vn9smzbcfix8wlgvxfi1l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
+TSdist = derive { name="TSdist"; version="3.1"; sha256="0kwj1l45qv2iwf14rad71381ajnq2ikz7kkgal25y3d528q4nd6y"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
 TSfame = derive { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; };
 TSmisc = derive { name="TSmisc"; version="2015.1-3"; sha256="1hv1q9p7vp7pxx9s4s9w3vkif1w1xr4y656x3zaf48ijxf6c6a90"; depends=[DBI gdata its quantmod tframe tframePlus TSdbi tseries xts zoo]; };
 TSodbc = derive { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; };
 TSsdmx = derive { name="TSsdmx"; version="2015.2-2"; sha256="1xwriyg0raqd6812r6vf34dljs0cjhxls9gpal4w0bjmvmc67khb"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
 TSsql = derive { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe tframePlus TSdbi zoo]; };
 TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[e1071 fBasics Hmisc lubridate multcomp nlme pastecs relimp reshape tcltk2 timeSeries wq]; };
-TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts]; };
+TTR = derive { name="TTR"; version="0.23-0"; sha256="1p648hdjdnda6c2vcrp6rf9x2gx8nks3ni8pjlkm2cm7fnbfrcj1"; depends=[xts zoo]; };
 TTmoment = derive { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
 TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; };
 Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
@@ -2215,7 +2264,7 @@ Thermimage = derive { name="Thermimage"; version="1.0.1"; sha256="16wpmwqfqjghhp
 Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
 ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; };
 ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; };
-ThresholdROC = derive { name="ThresholdROC"; version="2.0"; sha256="1qnxzp8rkxm39zgs8yv2yqkzda9hkd67910ikig423zs70gb6nj7"; depends=[MASS numDeriv pROC]; };
+ThresholdROC = derive { name="ThresholdROC"; version="2.1"; sha256="06v8dqy23hk6xvqnk8csac041jbwf5p8wiam53wk1jriq7a2s8c2"; depends=[MASS numDeriv pROC]; };
 TickExec = derive { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; };
 TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
 Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; };
@@ -2223,12 +2272,15 @@ TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9
 TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
 TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; };
 TimeWarp = derive { name="TimeWarp"; version="1.0.12"; sha256="1qadaf8n8ym5nv1z328hd5wiw78f014imgd2ryvi70sh4dmzb16l"; depends=[]; };
-Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; };
+Tinflex = derive { name="Tinflex"; version="1.1"; sha256="1wnb893x4gj1h3fpyblks07dln5ilpllpmmwp7wpqbvj7hzrj661"; depends=[]; };
+TipDatingBeast = derive { name="TipDatingBeast"; version="0.1-6"; sha256="0yfm99j2b3k9har87qb675jxgfp5vq3aizqvxc1njnfyh5yjg89k"; depends=[mclust]; };
+Tmisc = derive { name="Tmisc"; version="0.1.1"; sha256="14yz8j0dzpxhn7w7zviy3habq78dn4z1absz664vhdrkcql4f3fx"; depends=[dplyr]; };
 TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3kwcfmcv0vj2pw91154rd1p19ivhmbvhvnhwvh"; depends=[gplots Hmisc]; };
-TraMineR = derive { name="TraMineR"; version="1.8-9"; sha256="0qawgjifz6w7gb06j9q5kbvhf8pn17922mvmgwzva5mykvqfmdic"; depends=[boot RColorBrewer]; };
-TraMineRextras = derive { name="TraMineRextras"; version="0.2.3"; sha256="0b6xh1xhmigjfj9cbk4gdpi1d131cq9ikwgdblcwwrmnrhcjgld6"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
+TraMineR = derive { name="TraMineR"; version="1.8-10"; sha256="05x23argga7xh7ggv08b659j9ljnygbfwfh3pqiadhw9dipgyqqp"; depends=[boot RColorBrewer]; };
+TraMineRextras = derive { name="TraMineRextras"; version="0.2.4"; sha256="144s25ivq27f81dgh9x9h1fph1hdk86w9yac1hy6358kc8jnmi3q"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
 TrackReconstruction = derive { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
 Traitspace = derive { name="Traitspace"; version="1.0"; sha256="1pxyc5brlhsi0bhgr6nmd80kvrb032iwsshdqamicm48jyxn06xb"; depends=[mclust permute]; };
+TransModel = derive { name="TransModel"; version="1.0"; sha256="1cxvfmf304x8riwcnx6gp5fb5gkqa552zby2n6yxc0ic0m0w77kb"; depends=[survival]; };
 TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; };
 TreePar = derive { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
 TreeSim = derive { name="TreeSim"; version="2.1"; sha256="01izfzlvrak65mzwpz4bn5cansw10fvfjfvj164f5g0qghg9v84n"; depends=[ape geiger laser]; };
@@ -2252,12 +2304,13 @@ UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="1
 UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; };
 UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
 Unicode = derive { name="Unicode"; version="0.1-5"; sha256="088f38qy3vympxj6n4vyvvqd4gldcfli9l8rmzgmm1rm3v195mvn"; depends=[]; };
+UpSetR = derive { name="UpSetR"; version="0.0.5"; sha256="0z4z3xrdgl3rkhni6x356pl0xsa7nvkrcrcl1pfybvh4f6c7dpx2"; depends=[ggplot2 gridExtra plyr]; };
 UsingR = derive { name="UsingR"; version="2.0-4"; sha256="0wj6cn9ijc0rkpxsy1fd104m254b997dhmvwzz0knjkh5nybm8zm"; depends=[HistData Hmisc MASS]; };
 V8 = derive { name="V8"; version="0.6"; sha256="1cr9nm5wvi3b2766fpdgihnfmn1ckrwrzyya6dchvg2lr3giba38"; depends=[curl jsonlite Rcpp]; };
 VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
 VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm mclust sna]; };
 VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice mnormt pixmap]; };
-VCA = derive { name="VCA"; version="1.1.1"; sha256="14xm220ymg5p1m2h2xvjkbgaqfhi7dmf8fmi4zmfm5gksgf4v351"; depends=[Matrix numDeriv]; };
+VCA = derive { name="VCA"; version="1.2"; sha256="0hifg22nz9pg56nc0097jp33pa3j0vc3gm7rh5x95jn4kf68zdis"; depends=[Matrix numDeriv]; };
 VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
 VGAM = derive { name="VGAM"; version="0.9-8"; sha256="0wizv2r1k79ifg9m0z9m2l80bshvfmajanznk5a5370ih3fih33a"; depends=[]; };
 VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh54qbf90alcbaiz27rs0zc0i5jhh2cv716y6"; depends=[]; };
@@ -2283,23 +2336,23 @@ Vdgraph = derive { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv9
 VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; };
 VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; };
 VennDiagram = derive { name="VennDiagram"; version="1.6.9"; sha256="0sxgspqsn15y3pipd9wy4wh2n5rkb9bazqkfwkf88p483azpjxw9"; depends=[]; };
-VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[pracma Rcpp RCurl RJSONIO zoo]; };
-VineCopula = derive { name="VineCopula"; version="1.5"; sha256="1ifb7y0y1b5kha9nv395mlf3h3cczlqkvk782a2z0xy5vf0frfhi"; depends=[ADGofTest copula igraph lattice MASS mvtnorm]; };
+VideoComparison = derive { name="VideoComparison"; version="0.15"; sha256="0592fz0v4xvq1qy2hj4ph90v7zn1cnzr6a094mp9p1k61ki3fbg2"; depends=[pracma Rcpp RCurl RJSONIO zoo]; };
+VineCopula = derive { name="VineCopula"; version="1.6"; sha256="16hzjdllpk2dsc66x7yk8n8id0mwd63inlnqxggw9g2shvdyf96j"; depends=[ADGofTest copula igraph lattice MASS mvtnorm]; };
 VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; };
 Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
 VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
-W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[wavemulcor waveslim]; };
+W2CWM2C = derive { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; };
 W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-4"; sha256="08697va5n59d7yyv882ya3s2qw94n7c53d8wyavpvhqq9d3n8nwi"; depends=[RCurl XML]; };
 WARN = derive { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; };
 WCE = derive { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
 WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
 WDI = derive { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
 WGCNA = derive { name="WGCNA"; version="1.47"; sha256="1q4lags9ihadbwyisbyc21bpb7p8dd82sxwmbjq83z7s3vrlh8bd"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach Hmisc impute matrixStats preprocessCore reshape survival]; };
-WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59q1cnixisa5fgm5hkpq35h9zfmdnfaj3xl8pxhzyn"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
+WMCapacity = derive { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
 WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
-WRS2 = derive { name="WRS2"; version="0.3-1"; sha256="11i9zv7p7808v3hvnhjn58yl7mwh26zhis6hh9n73dw3hn22xdng"; depends=[MASS plyr reshape]; };
+WRS2 = derive { name="WRS2"; version="0.3-2"; sha256="0451cj7zqndhmyfc1p9r782a6nc31rza3h3rjfdx9fhc0mh66ggv"; depends=[MASS plyr reshape]; };
 WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
-WaterML = derive { name="WaterML"; version="1.2.3"; sha256="0w9040acrvs2kqh4slkg4pcswzvsbbcpzr2cdvxzhjv6a0im7hyz"; depends=[httr RJSONIO XML]; };
+WaterML = derive { name="WaterML"; version="1.3.2"; sha256="14dsmndfmp8v09ahyv0k4h6zss0b7533n0xy62vd0284dywlaimy"; depends=[httr plyr RJSONIO XML]; };
 Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
 WaveletComp = derive { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; };
 WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[cluster RColorBrewer TraMineR]; };
@@ -2307,7 +2360,7 @@ WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v
 WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
 WhiteStripe = derive { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[mgcv oro_nifti]; };
 WhopGenome = derive { name="WhopGenome"; version="0.9.2"; sha256="0nhl3qanwvyxvkrdc0wngzdx6id0yfzbf9wp170mcsyd4qh7pxzs"; depends=[]; };
-WiSEBoot = derive { name="WiSEBoot"; version="1.0.0"; sha256="1hfazm9zb2b6gzm38xlq672y1x1bqzj0mwvzinz6y65m9kb4l93g"; depends=[wavethresh]; };
+WiSEBoot = derive { name="WiSEBoot"; version="1.1.0"; sha256="034f668cjbwz4qwavzflf0jifqhm50v1w7gsxbqq3dy6gbnyl4hl"; depends=[wavethresh]; };
 WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp]; };
 WikidataR = derive { name="WikidataR"; version="1.0.0"; sha256="061745pz4j9gldbwy6pa5pbxmin84csqpv7r5r8lanvc0m7kgcgx"; depends=[httr jsonlite WikipediR]; };
 WikipediR = derive { name="WikipediR"; version="1.2.0"; sha256="1l9q9yg4z4j0lch9r8xr9q0f8mr0lpzf50ygmkkcvfd5sp7hirmi"; depends=[httr jsonlite]; };
@@ -2316,6 +2369,7 @@ WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrb
 WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
 WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
 WriteXLS = derive { name="WriteXLS"; version="3.6.1"; sha256="19rifwxfnmb65lf3a8nshyjnq3bn0lpkqfcwslfgjp6y8l7jx7gv"; depends=[]; };
+WufooR = derive { name="WufooR"; version="0.5.5"; sha256="0s5r7sawpx0lh38kf5m49bfazmmbd09f8cq5mp94h3als2hzmn3k"; depends=[dplyr httr jsonlite]; };
 XBRL = derive { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp]; };
 XHWE = derive { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
 XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[rJava XLConnectJars]; };
@@ -2331,7 +2385,7 @@ YaleToolkit = derive { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgn
 YieldCurve = derive { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
 YourCast = derive { name="YourCast"; version="1.6.2"; sha256="0vl37svwky6j1am235ac2wk1fdmh509w0h4m7y93lpjhzj6m8c1p"; depends=[foreign ggplot2 gridExtra lattice reshape2]; };
 YplantQMC = derive { name="YplantQMC"; version="0.6-4"; sha256="09galr2bcjvfpcp84znsv45j2cfyn4yhdx31kxs062sylys6kxld"; depends=[geometry gplots LeafAngle rgl]; };
-YuGene = derive { name="YuGene"; version="1.1.2"; sha256="0sy0bh49l0fajh1z88mpb4f0k3hsf3kd1vxv731qhpxcrc3pz09b"; depends=[mixOmics]; };
+YuGene = derive { name="YuGene"; version="1.1.4"; sha256="0qvws7jccq7cg4r3lr7c19q56rh3gy2jx7bba4mfjy2ywl24q62n"; depends=[mixOmics]; };
 ZIM = derive { name="ZIM"; version="1.0.2"; sha256="1n4dc0as011gzaac153zq1dfbg1axvmf9znlmhl7xjj4dz4966qm"; depends=[MASS]; };
 ZeBook = derive { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; };
 Zelig = derive { name="Zelig"; version="4.2-1"; sha256="1hhr9jx25fdnkqwyj2bkgrvqlah4z2drphmb5mdn1an2p2g23v9z"; depends=[boot MASS sandwich]; };
@@ -2342,25 +2396,26 @@ aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0
 aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
 aRpsDCA = derive { name="aRpsDCA"; version="1.0.1"; sha256="1hxf3lpdcx8h9gndclppsxr8rs048mi3nysjj1z3fgbpmkqnlxgs"; depends=[]; };
 aRxiv = derive { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; };
-aSPU = derive { name="aSPU"; version="1.35"; sha256="0wlp47wc75mmgh3986npqa72d4jia1jgalfvz7sq62wjsh1wkrbv"; depends=[]; };
+aSPU = derive { name="aSPU"; version="1.37"; sha256="01593vykj5hiw3nhl7kxylb52qvndpmpiwsb0igh0ci20ng45ci4"; depends=[]; };
 aTSA = derive { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; };
 abbyyR = derive { name="abbyyR"; version="0.1"; sha256="03krflrjhq7yx06wacfyxzqvq0v2b17xvcyl8sfnaylrilracwjq"; depends=[httr XML]; };
 abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
 abc_data = derive { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
 abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; };
-abctools = derive { name="abctools"; version="1.0.2"; sha256="1wdm42g2maab700fq2shpr1kajpj9m4c4z6k49gghrdzpk1kqxsa"; depends=[abc abind plyr]; };
+abctools = derive { name="abctools"; version="1.0.3"; sha256="0985sgyz8dqqq59klhriwx5rara838i9ca3s40xhgw46n49q0nd7"; depends=[abc abind plyr]; };
 abd = derive { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; };
 abf2 = derive { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
 abind = derive { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; };
 abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; };
 abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
-acc = derive { name="acc"; version="1.1.1"; sha256="0q4xq5mmcwb9b86k22c1x7zl4zxqacl62w7mcqrdb03v9xmjn4h4"; depends=[mhsmm PhysicalActivity timeDate zoo]; };
+acc = derive { name="acc"; version="1.1.7"; sha256="0b3p46y0d8z43x70yw8haidyk23m9jwsb2sml291p8dl79g8yl8h"; depends=[mhsmm PhysicalActivity zoo]; };
 accelerometry = derive { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; };
 accrual = derive { name="accrual"; version="1.1"; sha256="12zlv34pgmhcvisqk3x09hjpmfj91pn56pkjyj483mcf634m9ha4"; depends=[fgui SMPracticals]; };
-accrued = derive { name="accrued"; version="1.3"; sha256="091abkq7jwlw1gj0691qsv7ikgmn471hnkaadb8v0kxhs44mfq52"; depends=[]; };
+accrued = derive { name="accrued"; version="1.3.5"; sha256="10j8vrjgb43bggkf2gn518ccfard2f071mj6nwsxrzkm00pbx32v"; depends=[]; };
 acepack = derive { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; };
 acid = derive { name="acid"; version="1.0"; sha256="0m59xnz6435n7j3fggv274g5rap7cpr0zby3aqbaycfdfrp78d1h"; depends=[gamlss gamlss_dist Hmisc]; };
 acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
+acmeR = derive { name="acmeR"; version="1.0.0"; sha256="1wcfllpcv3x1kc50j212bc64ilsnmfa5ij6aybjgr52vhmf3gcmh"; depends=[foreign]; };
 acnr = derive { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; };
 acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
 acp = derive { name="acp"; version="2.0"; sha256="11ij2xhnkhy7lnzj8fld7habidb9av8a2bk22ycf62f556pqf533"; depends=[quantmod tseries]; };
@@ -2368,10 +2423,10 @@ acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqj
 acss = derive { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
 acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
 activity = derive { name="activity"; version="1.0"; sha256="1y1vy3kj9n21jvbyl3s5hllfkqp3z1rnn7701c5jxhay5dbdz3p2"; depends=[circular overlap pbapply]; };
-actuar = derive { name="actuar"; version="1.1-9"; sha256="00b0gpbvm0aivcjvk91rk3c28fzd3ir8h42b1kpnrgdjrc198im4"; depends=[]; };
+actuar = derive { name="actuar"; version="1.1-10"; sha256="1bm61inq8vxics33mj9ix36ibc9qp92q1m3ckha42kw8x521m6l4"; depends=[]; };
 ada = derive { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; };
 adabag = derive { name="adabag"; version="4.0"; sha256="0n4zls13f46rxqrx9qkvrifshb3cl8l6ni7zw36pm6fixbz844fk"; depends=[caret mlbench rpart]; };
-adagio = derive { name="adagio"; version="0.5.9"; sha256="1yp9w557advb7dzrdqwkffpdmhn6mk4879lrrjd0d6kv89fwz5yr"; depends=[]; };
+adagio = derive { name="adagio"; version="0.6.1"; sha256="0slch2i3a102621b4fs356gd0apip0h2my9jmkcmwxy9x974755w"; depends=[]; };
 adaptDA = derive { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; };
 adaptMCMC = derive { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; };
 adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
@@ -2383,11 +2438,11 @@ ade4 = derive { name="ade4"; version="1.7-2"; sha256="01pchn70jpz8v9l86ng34a2vgn
 ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
 adegenet = derive { name="adegenet"; version="2.0.0"; sha256="10y4l06k2g42s4vf394dx7pdsqsl0ff2w58mzap1khj90pxyrxdz"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep]; };
 adegraphics = derive { name="adegraphics"; version="1.0-3"; sha256="0i1qln99vdfnxjsbfq80c1c7allsw8ras7hlx7vr0dkdzcp1wy6z"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; };
-adehabitat = derive { name="adehabitat"; version="1.8.17"; sha256="0cy98fd6mcbjc152vv41mnh5xj19xdfag8n950fvffbrpvpgbcpb"; depends=[ade4 shapefiles sp tkrplot]; };
-adehabitatHR = derive { name="adehabitatHR"; version="0.4.13"; sha256="140ar1naf67v996d5p0i2v07g02pf9c4c6h1pjicai5n59s7z72v"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
-adehabitatHS = derive { name="adehabitatHS"; version="0.3.11"; sha256="0sbhc1mvdc8pxq56plbgk0ry65chxcv3zjry4151hiv7yxpn39ri"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
-adehabitatLT = derive { name="adehabitatLT"; version="0.3.19"; sha256="0h9n6j3a52bik5pslysvhb11d8df5k50ghi34zlxhdcbm09gfnmz"; depends=[ade4 adehabitatMA CircStats sp]; };
-adehabitatMA = derive { name="adehabitatMA"; version="0.3.9"; sha256="15n9mg8m4mjg5zn5c5hz9bl5qcghzkijiflk8psc0kg2csfpv7hy"; depends=[sp]; };
+adehabitat = derive { name="adehabitat"; version="1.8.18"; sha256="1ng55j95hzhh853qa55mfx4xdh954ap8pqy01kyg5mgyn45i7rpa"; depends=[ade4 shapefiles sp tkrplot]; };
+adehabitatHR = derive { name="adehabitatHR"; version="0.4.14"; sha256="0ljmn4zbg2lb5b2ckddbxd7ibbib1pzv4iv0ld2k3bv1mvn2j565"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
+adehabitatHS = derive { name="adehabitatHS"; version="0.3.12"; sha256="06lrg1s3l7slbff17my62ap7mn6h3p6s8jnn7j8mrs48nvim00z9"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
+adehabitatLT = derive { name="adehabitatLT"; version="0.3.20"; sha256="0sxi4dzd34p61d8dskj92nw7n4x9iflyf9fx48jxwb19lvy5902m"; depends=[ade4 adehabitatMA CircStats sp]; };
+adehabitatMA = derive { name="adehabitatMA"; version="0.3.10"; sha256="0b8nxk8339chhmjqjwsdlmy9nf729p0fgyh2hd1q93grgds9p1rs"; depends=[sp]; };
 adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 adegenet ape phylobase]; };
 adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[ape polynom spider]; };
 adimpro = derive { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; };
@@ -2397,7 +2452,7 @@ adwave = derive { name="adwave"; version="1.1"; sha256="0kkwgcyxddzmrb8h1w1f4xy2
 aemo = derive { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[assertthat dplyr lubridate stringr]; };
 afex = derive { name="afex"; version="0.13-145"; sha256="0wyjgxh1rdibj21f8dbwg7f30q1z6jwwpj2dcjx2rh60axvp1dir"; depends=[car coin lme4 Matrix pbkrtest reshape2 stringr]; };
 aftgee = derive { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; };
-agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[lme4 miscF R2jags]; };
+agRee = derive { name="agRee"; version="0.4-0"; sha256="19nvn2hiijn81wgqhx7s6blr2ilzx6p2s2qx1lw9shmnsmyywmss"; depends=[coda lme4 miscF R2jags]; };
 agop = derive { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
 agricolae = derive { name="agricolae"; version="1.2-1"; sha256="1vrc1bjqcp3xk8q41bl3kvjvaj58gw19dv7vwsxn9r6r99hlb3j1"; depends=[cluster klaR MASS nlme spdep]; };
 agridat = derive { name="agridat"; version="1.12"; sha256="1b3dgrp6mkfpfaywqdm22sakadhnl1vlyj1n3rq6bc2f0gf8kcrw"; depends=[lattice reshape2]; };
@@ -2410,6 +2465,7 @@ akmeans = derive { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002r
 alabama = derive { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
 ald = derive { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; };
 algstat = derive { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; };
+alineR = derive { name="alineR"; version="1.1"; sha256="15qniiwvn55aab56p85sh84jqi5d77nyqxr86092vnamir5gdzkl"; depends=[]; };
 allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
 allanvar = derive { name="allanvar"; version="1.1"; sha256="142wy1mf4jbp4hy756rz95w24f4j1dgf14f1n5sd09dg4w98j7xg"; depends=[gplots]; };
 alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; };
@@ -2425,7 +2481,7 @@ amap = derive { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468
 amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
 amen = derive { name="amen"; version="1.1"; sha256="084bl46sxn2sxslcpi9lm22k6x8cz1jld228l0iardy4vmh4cxdk"; depends=[]; };
 aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
-anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[car colorspace fda rgl scatterplot3d]; };
+anacor = derive { name="anacor"; version="1.0-6"; sha256="0nq3jhai586d3980y8raqmbhh8snd5bpx5z8mlwrxvkmr62hcrpl"; depends=[car colorspace fda rgl scatterplot3d]; };
 analogue = derive { name="analogue"; version="0.16-3"; sha256="0lv8ljf10jdrgrd59pcjdi1wvjfd0j6qb87xzfx5k8kcp9awx4h6"; depends=[brglm lattice MASS mgcv princurve vegan]; };
 analogueExtra = derive { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[analogue rgl vegan3d]; };
 analyz = derive { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; };
@@ -2438,6 +2494,7 @@ anfis = derive { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr
 anim_plots = derive { name="anim.plots"; version="0.1"; sha256="0qjwmxpkvjf27parh1fvhrkiczm4zlv9c034dp04yysbdz65r1by"; depends=[animation]; };
 animalTrack = derive { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
 animation = derive { name="animation"; version="2.3"; sha256="1hqgkaxmyyfrx7cfzv00010r9l2n8gxm35jd41p3kc208mhd7ssp"; depends=[]; };
+anoint = derive { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
 anominate = derive { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6bafg3c36a7whnznnww0101da2y0i6dw79lg5"; depends=[coda MCMCpack oc pscl wnominate]; };
 antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[BB evd ggplot2 MASS numDeriv]; };
 aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
@@ -2455,16 +2512,17 @@ aplpack = derive { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw
 apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
 appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
 apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
+appnn = derive { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; };
 approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
 aprean3 = derive { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; };
-aprof = derive { name="aprof"; version="0.2.4"; sha256="0gw5qj6c5ygjc6nwx2lb8biykkk73fv2x3j1xxabpgnsfq1whwyc"; depends=[]; };
-apsimr = derive { name="apsimr"; version="1.0"; sha256="1lk8n0vb20sxs02s6xx16d2xrh09p08b6i50b99bx9k7dhlgn6cf"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; };
+aprof = derive { name="aprof"; version="0.2.5"; sha256="1rbdj3dvg5sp19vp2jgwha4ln8wq45jwlllv4ls6i2rkr9vqvv56"; depends=[]; };
+apsimr = derive { name="apsimr"; version="1.1"; sha256="125v9y1d6c0ml3vrh5vr05b4119qf77spcf6231piwg6wx9vq9vb"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; };
 apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
 apt = derive { name="apt"; version="2.3"; sha256="0yrgxdqzwa5zv6rv8d8nnlraxngq60i1f0yrkygwsj4kngv2yhyv"; depends=[car copula erer gWidgets urca]; };
 aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
 aqp = derive { name="aqp"; version="1.8-6"; sha256="03gwvb5sm9l4vyl0jh9rzjs3ka2qmw4qqh40ywahq3dchpbxmlzd"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
 aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; };
-archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; };
+archdata = derive { name="archdata"; version="1.0"; sha256="1hs2pgdaixifqjnwcbrjxlrzng0r2vmv6pdzghsyvzlg28rnq2rk"; depends=[]; };
 archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
 archiDART = derive { name="archiDART"; version="1.1"; sha256="1md8y3nq575y9v4gj963y92as54h6bzaysnmjirk634rravps9ja"; depends=[XML]; };
 archivist = derive { name="archivist"; version="1.5"; sha256="0mcb35bllg82w0373prcai8h58gd6aj1pil90ni81zp7p1pdmcw3"; depends=[DBI digest httr lubridate RCurl RSQLite shiny]; };
@@ -2472,8 +2530,8 @@ arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nf
 arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; };
 argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
 argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[findpython getopt proto rjson]; };
-argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; };
-arm = derive { name="arm"; version="1.8-5"; sha256="0mjsjqrim2a6ds8gxrbdyp96b6sz1vjsqic80a5izrc2z9bml5p5"; depends=[abind coda lme4 MASS Matrix nlme]; };
+argparser = derive { name="argparser"; version="0.3"; sha256="1lwlkrh8hq4p02jmb76nss9qjrgyf5fqqzifv9z8ff1lk7szgmy4"; depends=[]; };
+arm = derive { name="arm"; version="1.8-6"; sha256="1bdjzq1da9nwfll4ial74ln920f2i19n4mwc5f4a5lwqrk4c69c7"; depends=[abind coda lme4 MASS Matrix nlme]; };
 arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
 aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.2"; sha256="0km1mhy8p6pksa0wnwx0cxbfgipi6c7xn7913agsqdpfbfphhm8j"; depends=[aroma_apd aroma_core MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; };
 aroma_apd = derive { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; };
@@ -2482,7 +2540,7 @@ aroma_core = derive { name="aroma.core"; version="2.13.1"; sha256="1085qh092sij4
 arqas = derive { name="arqas"; version="1.1"; sha256="1vdx9nfqkdrn6s4h90spb0g5vk7qxm5rg3mr2jkk4n67x7s5cv3x"; depends=[distr doParallel fitdistrplus foreach ggplot2 gridExtra iterators reshape]; };
 arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
 ars = derive { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
-arules = derive { name="arules"; version="1.1-7"; sha256="19wb85swasa3n2wg1bl6aww56294f2icqcmj0x2kjncin964blg2"; depends=[Matrix]; };
+arules = derive { name="arules"; version="1.1-9"; sha256="1cn5gvjx4g66pn1c79xa0z6gvjxjc36bdzy3micqxl0md6z50gf7"; depends=[Matrix]; };
 arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
 arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; };
 arulesViz = derive { name="arulesViz"; version="1.0-2"; sha256="1lss9xlbdxpcqphczk0i0kib1px30jf2hcygrkhxk8aajnni9ar6"; depends=[arules igraph scatterplot3d seriation vcd]; };
@@ -2491,14 +2549,16 @@ asbio = derive { name="asbio"; version="1.1-5"; sha256="1br9rhj6nghwx54i2hpjrsdh
 ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
 asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; };
 ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; };
+asht = derive { name="asht"; version="0.5"; sha256="04wlvn4j8c8c3sxsa9ydb1garb7px768xvrnr6ywhb722srwi5gy"; depends=[bpcp coin exact2x2 exactci ssanv]; };
 aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
-aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; };
+aspect = derive { name="aspect"; version="1.0-4"; sha256="1kxddm8v1y0v2r7lg24r1wpzk7lqzxlrpzq5xb9kn343g53lny6i"; depends=[]; };
 asremlPlus = derive { name="asremlPlus"; version="2.0-0"; sha256="1iag76aldb84zwfvy9m3p66ypmc8bz1b3c9yzkf9clk8rlzn53zv"; depends=[dae ggplot2]; };
-assertive = derive { name="assertive"; version="0.2-6"; sha256="1iracxm6af1lbd39zrnjziz31lvwgxi8rry82x8sjlab5l0w6lh9"; depends=[knitr]; };
+assertive = derive { name="assertive"; version="0.3-0"; sha256="1v9l5ni060a3bfwnp9ydpymsjnm633xday9ybgjdcf4sj0qs1crc"; depends=[assertive_base knitr]; };
+assertive_base = derive { name="assertive.base"; version="0.0-1"; sha256="0n6jyhahz4s5l5zy8azbqnqvp3ivl267rapjmbc1rw0jv5mb0pva"; depends=[]; };
 assertr = derive { name="assertr"; version="1.0.0"; sha256="0z7cgksjc0a7niar9f26f0512ln0a7cifyqcfrbhar552dnkg33i"; depends=[dplyr lazyeval MASS]; };
 assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; };
 assist = derive { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; };
-aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; };
+aster = derive { name="aster"; version="0.8-31"; sha256="1rn9hp7dg81rd14ckmfz23aav3ywm7i3w46jx66kqbrfs7kdrslq"; depends=[trust]; };
 aster2 = derive { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; depends=[]; };
 astro = derive { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
 astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
@@ -2535,22 +2595,22 @@ bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33
 barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
 bartMachine = derive { name="bartMachine"; version="1.2.0"; sha256="0hcz39397v2y8qgdy67i97j0z5g2qidkkf5p9ydcqp9fp5msshq7"; depends=[car missForest randomForest rJava]; };
 base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; };
-base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; };
+base64enc = derive { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; };
 baseline = derive { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
 basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszznlhrk52jr19syl549qdq3nspbxcn2mj65f5pw"; depends=[]; };
 batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
 batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
 batchmeans = derive { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb56pi0rv9hchlghjr95pflmmpwhblqfq27djss2"; depends=[]; };
-bayesDccGarch = derive { name="bayesDccGarch"; version="1.1"; sha256="1gjba5c9vfgvhlard6k47rc2f4r497qy4ybjwr57rm3n3jb0vkl1"; depends=[coda numDeriv]; };
+bayesDccGarch = derive { name="bayesDccGarch"; version="1.2"; sha256="15skkm4vmqj1r0vic1wgr58x8c7p6igvlmafbv0c46yl224qgryv"; depends=[coda numDeriv]; };
 bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2012]; };
 bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[coda mvtnorm]; };
 bayesGDS = derive { name="bayesGDS"; version="0.6.1"; sha256="0134x5knwp9pmkjyzgi1k7hjj92sym1p0zq98sizlbs0mff2p2s4"; depends=[Matrix]; };
 bayesLife = derive { name="bayesLife"; version="2.2-0"; sha256="09r915azz60ca5b4w0kkd8x8mb0cxz36lapakdmgrgxd4qax17nv"; depends=[bayesTFR car coda hett wpp2012]; };
 bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; };
-bayesPop = derive { name="bayesPop"; version="5.3-4"; sha256="1zq0vjkz4b33niwldli6sh8pgz5wsyzk59iyx5bcdpkbkprv57np"; depends=[abind bayesLife bayesTFR plyr wpp2012]; };
+bayesPop = derive { name="bayesPop"; version="5.4-0"; sha256="0v3k9dp1f8g41zng9w94phpd094y9g7qsnkyx9xw1jslz2f1s048"; depends=[abind bayesLife bayesTFR fields googleVis plyr rworldmap wpp2012]; };
 bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
-bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[coda smoothSurv survival]; };
-bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[coda MASS mvtnorm wpp2012]; };
+bayesSurv = derive { name="bayesSurv"; version="2.6"; sha256="0lam6w0niy30wgzbc3zrwbfz291whig20prjzdpcpv91syrnw687"; depends=[coda smoothSurv survival]; };
+bayesTFR = derive { name="bayesTFR"; version="4.2-0"; sha256="0c94498ncjzzv8xmi08kw87bqjarg1gg7ls5q4qcz6bhbhsmg2dr"; depends=[coda MASS mvtnorm wpp2012]; };
 bayescount = derive { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
 bayesm = derive { name="bayesm"; version="3.0-2"; sha256="014l14k8fraxjqfch2s6ydgp1mcljvj4cgrznjyz2l35fwj3rcf3"; depends=[Rcpp RcppArmadillo]; };
 bayesmix = derive { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
@@ -2563,13 +2623,13 @@ bbmle = derive { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkq
 bbo = derive { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
 bc3net = derive { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net igraph infotheo lattice Matrix]; };
 bclust = derive { name="bclust"; version="1.4"; sha256="1s04fqff5bw6d5kk0smvach6yq492dv1w0ahh9mrm2jsi2q58h7p"; depends=[]; };
-bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp]; };
+bcp = derive { name="bcp"; version="4.0.0"; sha256="1bkd7812jacyk955l71b2szpc9550p0hpv3x337qgl09zck4vdgm"; depends=[Rcpp RcppArmadillo]; };
 bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
 bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
 bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[ggplot2 mvtnorm]; };
 bcrypt = derive { name="bcrypt"; version="0.2"; sha256="0f4sw1w2k1237wipfva3k9w2a678pvfz0k86jd7djslhyimb6jrq"; depends=[openssl]; };
 bcv = derive { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
-bda = derive { name="bda"; version="5.1.3"; sha256="0v2xki9a1j6y42x03a3rrm746xx4qd3ris1m0k7alh25j3ayhs3p"; depends=[]; };
+bda = derive { name="bda"; version="5.1.6"; sha256="0rpxvmjbqiph8hpzsvlj8q6h70jsc9771fiq7l3lmkz69jn1gf4q"; depends=[]; };
 bde = derive { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
 bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
 bdscale = derive { name="bdscale"; version="1.2"; sha256="0j2h7ainfnh78szp355didbkmcl6d5vz1di8nznjarwxncrbgc6g"; depends=[ggplot2 scales]; };
@@ -2589,6 +2649,7 @@ ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzb
 berryFunctions = derive { name="berryFunctions"; version="1.8.1"; sha256="0plksyprbc5537005aw0yswwpahxk23c16lrq77zspzfa60i2vf0"; depends=[]; };
 bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
 betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
+betalink = derive { name="betalink"; version="2.0.2"; sha256="13v28lzr8jw61cgvm98qrzlcdpps5l78bhm4nmw4bgid281gnf8p"; depends=[igraph plyr stringr]; };
 betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; };
 betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[ellipse vegan]; };
 betareg = derive { name="betareg"; version="3.0-5"; sha256="1zpj1x5jvkn7d8jln16vr4xziahng0f54vb4gc4vs03z7c853i4a"; depends=[flexmix Formula lmtest modeltools sandwich]; };
@@ -2640,14 +2701,15 @@ binseqtest = derive { name="binseqtest"; version="1.0.1"; sha256="0snlrwmmmwrl3f
 bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
 bio3d = derive { name="bio3d"; version="2.2-2"; sha256="0sqwl27n15sbablw4mcqgf0w2k28jc59wf8yqxrmqbg8cckfsh9j"; depends=[]; };
 bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
-biogas = derive { name="biogas"; version="1.0.1"; sha256="0fjxfj4c4clyp4gkzm0dl5ls7pbyaxmff56dw59wswijm4na2il7"; depends=[]; };
+biogas = derive { name="biogas"; version="1.1.0"; sha256="0cbz4vy6iah4qbxlk4dmvpvyj4by7mkmzac1xi5j14w8xjlw5h0y"; depends=[]; };
 biogram = derive { name="biogram"; version="1.2"; sha256="1kklidp1nm9jb0nvlhlhxklh4fp86plfsslp4ajnv8i4rc6h0v19"; depends=[bit entropy slam]; };
 biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[Matrix plyr RJSONIO]; };
+biomartr = derive { name="biomartr"; version="0.0.1"; sha256="10bi0vz9y2s7v41rkxifgf23w67ladpmmhhpfvnhbjqwwdk97snc"; depends=[biomaRt Biostrings data_table downloader dplyr httr RCurl stringr XML]; };
 biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[abind gbm ggplot2 MASS mda nnet pROC randomForest raster rasterVis reshape rpart sp]; };
 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
 biorxivr = derive { name="biorxivr"; version="0.1.1"; sha256="0v2jmqpdcci3wwpcrakqcssahy3yx07s265axs14615w74dgd4kl"; depends=[XML]; };
 bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; };
-biosignalEMG = derive { name="biosignalEMG"; version="1.0.3"; sha256="0nbr0d2hf28csv3lhl4af7hhqivwxaa1c1aj2yy1xjvnn6fd8mr3"; depends=[]; };
+biosignalEMG = derive { name="biosignalEMG"; version="2.0.0"; sha256="0avn35r567crp3z4i1fvlfirvc085cf3g6znc6wgnm7mhxp3l1ss"; depends=[signal]; };
 biotools = derive { name="biotools"; version="2.1"; sha256="15ncx700v5ignr3gggz5zfspskzpj3kpzsy6rg2y4pnjm1vlndgj"; depends=[boot MASS rpanel tkrplot]; };
 bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[fields igraph MASS permute sna vegan]; };
 biplotbootGUI = derive { name="biplotbootGUI"; version="1.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; };
@@ -2683,9 +2745,11 @@ bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834l
 bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
 bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
 bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[LowRankQP lpSolve]; };
+bnclassify = derive { name="bnclassify"; version="0.3.0"; sha256="0fqib9gq0rpwy5bs11dn251s6yld1scrg0lib034dzbkkblvik1m"; depends=[assertthat crossval entropy graph matrixStats RBGL rpart]; };
 bnlearn = derive { name="bnlearn"; version="3.8.1"; sha256="07lh67nw7wpjimim44zpw8h1rq4yqa2sdjcwj95bmyc25hlzv1s1"; depends=[]; };
 bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
 bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
+bnstruct = derive { name="bnstruct"; version="1.0"; sha256="1bc4q5gk56xmmsiglg8434hpl3lvbyg9hgv5xx5b8law6hn5znz4"; depends=[bitops igraph Matrix]; };
 boa = derive { name="boa"; version="1.1.8-1"; sha256="15nkr24hgv1286h9b6sdhlpljnm98fi5mmpsygl76h24dayy3854"; depends=[]; };
 boilerpipeR = derive { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
 bold = derive { name="bold"; version="0.2.6"; sha256="15hnbspp5s293v2jykmirf9rvdgpkd71h431gizz71ssayanzp67"; depends=[assertthat httr jsonlite plyr reshape stringr XML]; };
@@ -2694,7 +2758,7 @@ boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1k
 boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
 boot = derive { name="boot"; version="1.3-17"; sha256="1lxjj0sbm9v21f34srrwkniiwbc59ibjh99yry9756ic55h6jyl5"; depends=[]; };
 bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; };
-bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; };
+bootLR = derive { name="bootLR"; version="1.0"; sha256="1asf4yxy3abfkgqqg89mv9r2iifc5bgcjipy5idni0lvwfjashnd"; depends=[boot]; };
 bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
 bootSVD = derive { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
 bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
@@ -2704,7 +2768,7 @@ bootsPLS = derive { name="bootsPLS"; version="1.0.2"; sha256="1d2jn3c74d31rp37qp
 bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
 bootstrap = derive { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; };
 boottol = derive { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
-boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl6j8fb6a28vfciykr2364mgmahp"; depends=[coda fishMod MASS mvtnorm R2jags]; };
+boral = derive { name="boral"; version="0.8"; sha256="19yami2k4b12g4xzvd774hpa5adnk2wszlys0qgygsjxazv4zan5"; depends=[coda fishMod MASS mvtnorm R2jags]; };
 boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[geepack lme4 Matrix ncdf]; };
 boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
 boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
@@ -2722,15 +2786,16 @@ brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6y
 brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl stringdist XML]; };
 brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
-brms = derive { name="brms"; version="0.3.0"; sha256="0rgh0s1nlyhq41w24bq3qf3xxxzbfrnyrqw4pk0n5syqb7rdmi6m"; depends=[abind coda ggmcmc ggplot2 gridExtra Rcpp]; };
+brms = derive { name="brms"; version="0.4.1"; sha256="0kkkg2wp49f6iclbahxlrnz5cczv3qs2qb9jazflshgpnnn0vqqy"; depends=[abind ggmcmc ggplot2 gridExtra Rcpp reshape2 rstan]; };
 brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
-broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
+broman = derive { name="broman"; version="0.59-5"; sha256="0sl7ppdy0d3mnnp7vz98ingv9irv58xjazf3rx473qw811ybcjdn"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
 broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[dplyr plyr psych stringr tidyr]; };
 bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; };
 bspec = derive { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
 bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
 bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[gbm rpart]; };
-bsts = derive { name="bsts"; version="0.6.1"; sha256="0hs2inbwwpafpcr6y51qnmxms121z8cy8mil6acjfhrfc27f1msd"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
+bsts = derive { name="bsts"; version="0.6.2"; sha256="0m18yl9c12p19psx3iz7swlblgbkmyyvfls5g74gm8qbbhbxmdsk"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
+btergm = derive { name="btergm"; version="1.5.2"; sha256="1llf9f9qkiw0pnbsnsybyxgch92dyzwdr77bcxqhipbmdb8fdckd"; depends=[boot coda ergm Matrix network ROCR sna speedglm statnet statnet_common texreg xergm_common]; };
 btf = derive { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[coda Matrix Rcpp RcppEigen]; };
 bujar = derive { name="bujar"; version="0.1-4"; sha256="0v48mkg78sy91z1z4xvy2r3xmay74615kzqxjqlclkk20999z56m"; depends=[earth elasticnet gbm mboost mda ncvreg rms]; };
 bursts = derive { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
@@ -2752,18 +2817,20 @@ calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k
 calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; };
 calmate = derive { name="calmate"; version="0.12.0"; sha256="1jd1ag1v10bpgkqpf5134av0yc7xph1679q40y541kyr59df0lxw"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
 camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[igraph lattice MASS Matrix]; };
+camtrapR = derive { name="camtrapR"; version="0.97.1"; sha256="1kcq4wyfxz4zs90wib0siiv50qlrkm1z4p6r4wfs4j126cvxq95q"; depends=[overlap]; };
 cancerTiming = derive { name="cancerTiming"; version="3.0.0"; sha256="1sc5mz2gnrzvkc9kfnspq9vddk48a0a99yyywkwy1vvj0q2dgmyn"; depends=[gplots LearnBayes]; };
 candisc = derive { name="candisc"; version="0.6-7"; sha256="1g2vypcniy94h462kylmzraa6q3ys9m0r1cn21dm8rzzjxid9g3g"; depends=[car heplots]; };
 cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd fdrtool igraph Matrix qpcR shape]; };
 caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
 capm = derive { name="capm"; version="0.8.0"; sha256="1vz17x0v5cjs5kdqkbay08f91kclsx4rcli5vgh9yxlk4ih9w4dd"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; };
+captioner = derive { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; };
 capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; };
 capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
 car = derive { name="car"; version="2.0-25"; sha256="1h7fndsypg9jqfc4xlr8aszjgs477jsvvw4lkpgjxrlb4j779yyj"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
 carcass = derive { name="carcass"; version="1.4"; sha256="16apmiackw194p5n0fivkgd2ymca9bfajasypl82xqyfk6amh088"; depends=[arm expm lme4 MASS survival]; };
 cardidates = derive { name="cardidates"; version="0.4.6"; sha256="02ib56fvn2z63sbinhwnlw123y86h6xazbkzw68sa9klqaxv69yl"; depends=[boot lattice pastecs]; };
 care = derive { name="care"; version="1.1.9"; sha256="0fx5cbi1fx3hpyzghn1788rkh91i10z1ngryqc1v3iqqn3akbk4j"; depends=[corpcor]; };
-caret = derive { name="caret"; version="6.0-47"; sha256="0mpmch0435gcszj5yq4p7jpq7y9q8jk1bz3i1c9ij7a73kq2368i"; depends=[BradleyTerry2 car foreach ggplot2 lattice nlme plyr reshape2]; };
+caret = derive { name="caret"; version="6.0-52"; sha256="1z6z63q0dh5pjcl8nizs5jrfng9f34imkijfq5xc1m77r8m853dk"; depends=[BradleyTerry2 car foreach ggplot2 lattice nlme plyr reshape2]; };
 caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools digest ggplot2 gridExtra lattice pbapply plyr]; };
 caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
 caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
@@ -2777,9 +2844,9 @@ catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2
 cati = derive { name="cati"; version="0.99"; sha256="1xghdqmqfwi0wnzvrd896z4snyjqqs9kw3whmkd3cph8zf0jl931"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; };
 catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; };
 catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
-causaleffect = derive { name="causaleffect"; version="1.1.3"; sha256="04wbwl40iwyqi1j5ngss9rlsrp21qdr9pcp32ckl9g61qj8f6jxa"; depends=[ggm igraph XML]; };
+causaleffect = derive { name="causaleffect"; version="1.2.0"; sha256="0dw2660g958ni086jhqr084hxfsf7rnv30qyx56vi8l5qbapsxaw"; depends=[ggm igraph XML]; };
 causalsens = derive { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; };
-cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; };
+cba = derive { name="cba"; version="0.2-15"; sha256="1qw1r5drxip4y1a59hwz92iw50nj3vkxynsisv28srnwr58imnaj"; depends=[proxy]; };
 ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
 ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
 cccd = derive { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
@@ -2814,10 +2881,10 @@ cgh = derive { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697ly
 cghFLasso = derive { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
 cghseg = derive { name="cghseg"; version="1.0.2"; sha256="1x7j62aq5c1xj8ss3pys5160y6vny4pa1wvf6xh59ak2zr4xjm9h"; depends=[]; };
 cgwtools = derive { name="cgwtools"; version="3.0"; sha256="01888n056x4c8g0676jnbh6d89hamzxrh33aw6r28mzlnmfy5lmw"; depends=[]; };
-changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; };
+changepoint = derive { name="changepoint"; version="2.0.1"; sha256="13nqnp53rksafdybkvwg434j7cs5wv262qzqgzs77nvk0dzh6gch"; depends=[zoo]; };
 cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
 chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; };
-checkmate = derive { name="checkmate"; version="1.6.0"; sha256="0jcqkdw850dndsh6mbyim5zgxgichmkr4yks3zh5fm9ffs1nmqkw"; depends=[]; };
+checkmate = derive { name="checkmate"; version="1.6.2"; sha256="1phw4amr3ck0kglgfsjf3zimlgiygij0dbx50hbxid003281hwxa"; depends=[]; };
 checkpoint = derive { name="checkpoint"; version="0.3.10"; sha256="147phhsv5g8k23fd355jqjqpjjj8n3s0bblm8mv5c3d0322li7ac"; depends=[]; };
 cheddar = derive { name="cheddar"; version="0.1-629"; sha256="13fmr37jj7dky5jrpr20z1iai9jbnpmwsh2pbzjwvib7561pyd6x"; depends=[]; };
 chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; };
@@ -2839,12 +2906,12 @@ chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yj
 chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
 chron = derive { name="chron"; version="2.3-47"; sha256="1xj50kk8b8mbjpszp8i0wbripb5a4b36jcscwlbyap8n4487g34s"; depends=[]; };
 cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
-circlize = derive { name="circlize"; version="0.2.5"; sha256="0kc58cin98a5w63iz20kwpll7129l1ww455hjjp4yvlpnsr6m038"; depends=[GlobalOptions shape]; };
+circlize = derive { name="circlize"; version="0.3.0"; sha256="0hd74fss5f3nr0m7vdb6apkgplydhqkknad4ng4frfyf03pnxkpx"; depends=[GlobalOptions shape]; };
 circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
 cit = derive { name="cit"; version="1.4"; sha256="0axmi41bydkj512jscil9mqz9g6f11khl8hi6fci96wnm9x8gw7s"; depends=[]; };
 citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
 citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
-cjoint = derive { name="cjoint"; version="1.0.3"; sha256="0f9yh4rbgqlx12vx336isfxc3lnrl5sgbapld0qfkv93p26in9h6"; depends=[ggplot2 lmtest sandwich]; };
+cjoint = derive { name="cjoint"; version="2.0.0"; sha256="02jsdlqpcg5xjnpbnw658fsyhym0ssmhhm69z9ij8vm65qxi47f8"; depends=[ggplot2 lmtest sandwich survey]; };
 clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
 cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; };
 class = derive { name="class"; version="7.3-13"; sha256="0y6gms2hbzx45a10n86899hfaxjg3bjn6gfd5jhqzan5dalnp5w1"; depends=[MASS]; };
@@ -2859,7 +2926,7 @@ clickstream = derive { name="clickstream"; version="1.1.5"; sha256="010bf7rxicv4
 clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
 climdex_pcic = derive { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; };
 clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
-climwin = derive { name="climwin"; version="0.0.1"; sha256="1ajkqk6lj2d8gx7arkwrznrkrjvdc5g9789vwaawwczbdavyi8kd"; depends=[evd ggplot2 gridExtra lme4 lubridate MuMIn reshape]; };
+climwin = derive { name="climwin"; version="0.1.1"; sha256="0idn3nlnlgm81npxkszgk5fph32z35hcs24a9qkam4j95nk7jfyn"; depends=[evd ggplot2 gridExtra lme4 lubridate MuMIn reshape]; };
 clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
 clinfun = derive { name="clinfun"; version="1.0.10"; sha256="1q69qn7ib0mzpx5cv69fcgflp9rfmys5j33lqdj4b3g1z036bqrr"; depends=[mvtnorm]; };
 clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; depends=[]; };
@@ -2870,14 +2937,14 @@ clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm
 clue = derive { name="clue"; version="0.3-50"; sha256="0r3lb625a6vhxr7im2slz279zav9i74s0b9srkarqmz1bhaf6ly2"; depends=[cluster]; };
 clues = derive { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; };
 clustMD = derive { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[MASS mclust msm mvtnorm tmvtnorm truncnorm]; };
-cluster = derive { name="cluster"; version="2.0.2"; sha256="1zk6y68l5lz0yvzr1d5rs45xid2pcjpvhdarwxz074iqb0ha5sih"; depends=[]; };
+cluster = derive { name="cluster"; version="2.0.3"; sha256="03jfczb3dwg57f164pya0b762xgyswyb9a7s33lw9i0s5dq72ri8"; depends=[]; };
 cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
 clusterCrit = derive { name="clusterCrit"; version="1.2.5"; sha256="1xwbvvzrh2dz47y4snmhb96mriblk3czy7dp5bmyvckh5papr2xv"; depends=[]; };
 clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; };
 clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
 clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
 clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
-clusterSEs = derive { name="clusterSEs"; version="2.0"; sha256="18m1d5i2mjv5yhi0zbkqwx9c20x79kqwq8cj62xcl531q1gx4bpq"; depends=[AER Formula lmtest mlogit plm sandwich]; };
+clusterSEs = derive { name="clusterSEs"; version="2.1"; sha256="1r1cwnx7kdisq6v9ssr0z270yhfkkq3jyg2rq81l43dx7a6yv04y"; depends=[AER Formula lmtest mlogit plm sandwich]; };
 clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; };
 clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; };
 clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; };
@@ -2892,21 +2959,21 @@ cmaes = derive { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqa
 cmm = derive { name="cmm"; version="0.8"; sha256="1661v2lzxgf4s37wdsrnbsvqwppcr7mbp70i1xsysfzki1z6xr19"; depends=[]; };
 cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
 cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; };
-cmsaf = derive { name="cmsaf"; version="1.4"; sha256="1pdfwsy9cjzikld19dh1fhq16l03wha5pg144wp3j1g78cldyb08"; depends=[fields ncdf4 raster RNetCDF sp]; };
+cmsaf = derive { name="cmsaf"; version="1.5"; sha256="06gmdxiss71qn3gaw4cs3wp0mizyny1ln3ymjlnp6kh3v9vzkjkw"; depends=[fields ncdf4 raster sp]; };
 cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[elliptic emulator]; };
 cna = derive { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; };
 cncaGUI = derive { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
+coala = derive { name="coala"; version="0.1.1"; sha256="04w1h1v8l4by4wqjhb2qlvkmp7nr5yklq20a2krym9x1frgcqw7m"; depends=[assertthat R6 Rcpp RcppArmadillo rehh scrm]; };
 coalescentMCMC = derive { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
 coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; };
 cobs = derive { name="cobs"; version="1.3-0"; sha256="1aly7ir7vzir9wnbhyfbrkl7dbq68f79jwxhqrfpf0v2m5kxhz88"; depends=[quantreg SparseM]; };
-cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; };
 cocor = derive { name="cocor"; version="1.1-1"; sha256="1w6v9499jj727iznap66hlv9lr4r3s9pr5jnsin9zi8hjb2vhj4h"; depends=[]; };
 cocorresp = derive { name="cocorresp"; version="0.2-3"; sha256="0r1kmcwnf476xbw7r40r3vbn6l1zgmaiq6cpgrvnyss7i5313q8s"; depends=[vegan]; };
 cocron = derive { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd3pcj8r6da20781583rrq6585yqh4g6"; depends=[]; };
 coda = derive { name="coda"; version="0.17-1"; sha256="1qjsqf4xi6xii60dscn577gmhqgbm525cgg67ax5mhs7il7br26f"; depends=[lattice]; };
 codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
 codep = derive { name="codep"; version="0.4-1"; sha256="1jkd6k80d6vyriwmq1car5zjms304zrdrfbjib664zxzx1wadf8z"; depends=[]; };
-codetools = derive { name="codetools"; version="0.2-11"; sha256="1mal1xa7san28l6rssvanndsgm90qhvbskz840ybfwwix8bqnbmh"; depends=[]; };
+codetools = derive { name="codetools"; version="0.2-14"; sha256="0y9r4m2b8xgavr89sc179knzwpz54xljbc1dinpq2q07i4xn0397"; depends=[]; };
 coefficientalpha = derive { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; };
 coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr proto reshape2 scales useful]; };
 coenocliner = derive { name="coenocliner"; version="0.2-0"; sha256="1ndz7nhkzb8y0akyf1ja39m60c1afk4sb8qk7m4xd3srd71wb35z"; depends=[]; };
@@ -2917,6 +2984,7 @@ coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b
 colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
 coloredICA = derive { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
 colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
+colorscience = derive { name="colorscience"; version="1.0.1"; sha256="0085cxdknfm70i0x57jb9fpaqhpgcvl150n2mcaw8wgw1lf59f06"; depends=[Hmisc munsellinterpol pracma sp]; };
 colorspace = derive { name="colorspace"; version="1.2-6"; sha256="0y8n4ljwhbdvkysdwgqzcnpv107pb3px1jip3k6svv86p72nacds"; depends=[]; };
 colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
 colourlovers = derive { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7cknn4z1jqb0l1w8v5zj0qbk4msaf1pqfcx9a70pw8s0m5"; depends=[png RJSONIO XML]; };
@@ -2960,6 +3028,7 @@ conting = derive { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfr
 contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; };
 controlTest = derive { name="controlTest"; version="1.0"; sha256="0gzhd92qy3dykwdfwckw6x46bd9m044hcn4bqwpv16af1xbrj963"; depends=[survival]; };
 convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape cluster geiger MASS phytools]; };
+convoSPAT = derive { name="convoSPAT"; version="0.1"; sha256="1vm6ghxbdbhgjr744mffnyrsz0a7x37k9ckm7n1mn862fdvsb2w3"; depends=[ellipse fields geoR MASS plotrix StatMatch]; };
 cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[ggplot2 gmp reshape2]; };
 cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
 copBasic = derive { name="copBasic"; version="1.7.1"; sha256="0qhrazzsrc429z9fsbqklvwdfgn65adck51vp74jijjd0p6pki4s"; depends=[lmomco]; };
@@ -2999,24 +3068,25 @@ coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmn
 coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; };
 coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
 coxsei = derive { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; };
-cp4p = derive { name="cp4p"; version="0.2"; sha256="1rm6dgfiv2dx17svlzyaiqiqkpip24ns5wp8lddr6gmpws581ywl"; depends=[limma MESS multtest qvalue]; };
+cp4p = derive { name="cp4p"; version="0.3"; sha256="10jr3hkqqq305ic3f166zza3zsgsxgh253qm4p700gwgk5z57sqc"; depends=[limma MESS multtest qvalue]; };
 cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; };
 cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; };
 cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
 cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; };
-cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
-cpm = derive { name="cpm"; version="2.0"; sha256="0k27r3bfqrdy3iwpzyh8mp8lr3ndcsc688g6mp5ha4blxiwgciyb"; depends=[]; };
+cplm = derive { name="cplm"; version="0.7-3"; sha256="17h7wnwym49pm56ifi31lnjzja3bqgd4nkla6hbqk338a56lqspl"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
+cpm = derive { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
 cqrReg = derive { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
-cquad = derive { name="cquad"; version="1.1"; sha256="09rzqdv59q81nsrpjhjbdwm3p803q51w18arjg8x8l2jcgk3zcga"; depends=[]; };
+cquad = derive { name="cquad"; version="1.2"; sha256="1ygq1z9mkrfvjq5yipfg6wpd0gmwh8h40ykp0hv06hvn40aqkw4h"; depends=[MASS]; };
 crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; };
 cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
 crank = derive { name="crank"; version="1.0-7"; sha256="1ni5icg1c9ypvcvcxrr7dcp1zbk4iwyns421rrqsgmpns06s59w6"; depends=[]; };
 cranlogs = derive { name="cranlogs"; version="2.0.0"; sha256="13c8sa3s1xvb5naj4cy7d5azcbf716l0gp4x086sqd5dg1hqdy8b"; depends=[httr jsonlite]; };
 crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
 crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm raster sp]; };
-crayon = derive { name="crayon"; version="1.3.0"; sha256="1s51ijdsss02d6wwbx2r14vz03w8b17757rh43i7nc1vh36ylbjk"; depends=[memoise]; };
+crayon = derive { name="crayon"; version="1.3.1"; sha256="0d38fm06h272a8iqlc0d45m2rh36giwqw7mwq4z8hkp4vs975fmm"; depends=[memoise]; };
 crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
 crch = derive { name="crch"; version="0.9-0"; sha256="0kd71lv239sn08f3v63k18dxxn6zbk3m0znx2xrmd4a2akrqwjsj"; depends=[Formula ordinal]; };
+credule = derive { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; };
 crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
 crimelinkage = derive { name="crimelinkage"; version="0.0.3"; sha256="018ni9jgnm4k8vybz99drsx8phb0ar3x0raa5ydkfpgqp525sayi"; depends=[geosphere igraph]; };
 crmn = derive { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
@@ -3025,13 +3095,14 @@ crossReg = derive { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w
 crossdes = derive { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
 crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; };
 crossval = derive { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; };
-crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; };
-crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9mnhzi4dy08d810nm16wiqabkw4"; depends=[fields Matrix pracma tseriesChaos]; };
+crp_CSFP = derive { name="crp.CSFP"; version="2.0.1"; sha256="0l2fwdawfbx7971q7jg7604w2ys056rfywiw0myfgc0z864saz0n"; depends=[MASS]; };
+crqa = derive { name="crqa"; version="1.0.6"; sha256="1v9fwl98jjlg2z5skqsjmmgpmmxy4g1gzvc28yflvdp50qn509v8"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
 crrp = derive { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
 crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
 crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
-crunch = derive { name="crunch"; version="1.3.2"; sha256="021xzhxmid5r9f9c02vkywp498xmgyqcdg0yb20j507dabkbayjr"; depends=[httr jsonlite RCurl]; };
+crunch = derive { name="crunch"; version="1.4.2"; sha256="141m8kmci7fdvi1dzfpgyx5fg435pz4ggsjv972s0n01wjwifp8i"; depends=[curl httr jsonlite]; };
+cruts = derive { name="cruts"; version="0.1"; sha256="0p2iiccjf1414g5xp6rcww58vimh2ahj0ghak1mrjyvgb4q6zgh3"; depends=[lubridate ncdf raster sp stringr]; };
 csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
 csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
 cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[maptools plyr sp]; };
@@ -3040,6 +3111,7 @@ csn = derive { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p0
 csrplus = derive { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
 cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
 csvread = derive { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; };
+ctmm = derive { name="ctmm"; version="0.2.7"; sha256="07dh6ginqp4xj7g2sd27xsxiwwbvdvkpz65kv9kasv6flk9fwy0a"; depends=[expm manipulate MASS Matrix numDeriv raster rgdal sp]; };
 cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; };
 ctv = derive { name="ctv"; version="0.8-1"; sha256="1fmjhh4vr4vcvqg76dzp1avqappsap5piki1ixahikwbwirxcwvw"; depends=[]; };
 cubature = derive { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; };
@@ -3062,17 +3134,18 @@ cvplogistic = derive { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q766
 cvq2 = derive { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
 cvxbiclustr = derive { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; };
 cvxclustr = derive { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; };
-cwhmisc = derive { name="cwhmisc"; version="5.0"; sha256="0b70ssss48kpjyimwm8hwcx82whg77j40qxaaj4vhhqc8d2bzgd2"; depends=[lattice]; };
+cwhmisc = derive { name="cwhmisc"; version="6.0"; sha256="13lgpxl957lbf333m1a17ad8iy3kjfrzav0sxx7w3vnsj98aqa43"; depends=[lattice]; };
 cwm = derive { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
 cxxfunplus = derive { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
 cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
+cymruservices = derive { name="cymruservices"; version="0.1.1"; sha256="1pqqqmsgicp87r9axv96qj61mmxrn50d8xnhfhjf7sklxkh57482"; depends=[stringr]; };
 cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
 cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
 d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
-d3heatmap = derive { name="d3heatmap"; version="0.6.0"; sha256="1whagc3pyb03j7p3wsphcfivirgh5an5sx4im5iw2g6a9v7zh0gv"; depends=[base64enc dendextend htmlwidgets png scales]; };
+d3heatmap = derive { name="d3heatmap"; version="0.6.1"; sha256="01lrz8r84yy5cdkl7ip2brwgfmyllg09zz2bayrb132xib21427x"; depends=[base64enc dendextend htmlwidgets png scales]; };
 dMod = derive { name="dMod"; version="0.1"; sha256="0170hvgngwxr0qfl7knmj0l2gg053xj5yfd5hkfyjnl6ivcsw3c9"; depends=[cOde ggplot2 trust]; };
 dae = derive { name="dae"; version="2.7-2"; sha256="0b38bwk5c8fzgvkg8jpci4n8cj94zdypc099apfjzy2gkw5l71ym"; depends=[ggplot2]; };
-daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[BsMD FrF2 lattice]; };
+daewr = derive { name="daewr"; version="1.1-6"; sha256="1gk7hs7m4ma505i6n8wf3c9ifzz93w8qljmb03xf13c9qchrqi61"; depends=[BsMD FrF2 lattice]; };
 daff = derive { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[jsonlite V8]; };
 dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
 dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
@@ -3102,15 +3175,16 @@ dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702
 dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
 dbarts = derive { name="dbarts"; version="0.8-5"; sha256="1w170mdfl5qz7dv1p2kqx0wnkmbz2gxh2a4p7vak1nckhz2sgpgn"; depends=[]; };
 dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
-dbmss = derive { name="dbmss"; version="2.2.0"; sha256="0ngf7l7nsp03jvspa7xfhal2ccaxcvjny5sd5aypfwfgrndrd71z"; depends=[cubature Rcpp spatstat]; };
+dbmss = derive { name="dbmss"; version="2.2.1"; sha256="0maz8zhz8c8xjdcmkhsaxz6149mh4mkcwmmd01saqsy57ncy7qhq"; depends=[cubature Rcpp spatstat]; };
+dbscan = derive { name="dbscan"; version="0.9-1"; sha256="1i8iq5y93f6cmd20h4nnwkj902d967m6d9crxnj76vbnwgilbjgw"; depends=[Rcpp]; };
 dbstats = derive { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; };
-dcGOR = derive { name="dcGOR"; version="1.0.4"; sha256="1vvij7f2vw9xaky32wyr7h1iwcq5m3s2s46kn9vjq1jllw85phgl"; depends=[dnet igraph Matrix]; };
+dcGOR = derive { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; };
 dcemriS4 = derive { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; };
 dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; };
 dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[coda dclone lattice rjags]; };
 dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
 dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-ddalpha = derive { name="ddalpha"; version="1.1.2.3"; sha256="1n1502is99gxw84g4a0n8ciq2pr8dpvi7cmzcxqvcpqdjrjdhr20"; depends=[BH class MASS Rcpp robustbase]; };
+ddalpha = derive { name="ddalpha"; version="1.1.3.1"; sha256="0vi7crw30mfpllmspicilz1vwhbsmlzx2mfs53kv2hs8vj7r1in8"; depends=[BH class MASS Rcpp robustbase]; };
 ddeploy = derive { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; };
 ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[evd orthopolynom]; };
 deSolve = derive { name="deSolve"; version="1.12"; sha256="0npcayl6q2f32b3iflfgs7gg2slg4dfgdcz4awpllza0lwgzyyfj"; depends=[]; };
@@ -3120,10 +3194,10 @@ deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1
 debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
 decctools = derive { name="decctools"; version="0.2.1"; sha256="01h119gdvvbfnqfxaca7ca0yhpp6wggq0b69k6ww5lnkfnlj0sgi"; depends=[lubridate plyr RCurl reshape2 stringr XLConnect XML]; };
 decisionSupport = derive { name="decisionSupport"; version="1.101.1"; sha256="08qcvdwp0wgspnfnlhkpxz3p6y43pjf32p185knw8g81wr1950ip"; depends=[msm mvtnorm]; };
-decode = derive { name="decode"; version="1.1"; sha256="06c6l2s32s1vri51hbnl17sxgkl7x8537prk0zzq6zlqhkwy6j77"; depends=[]; };
+decode = derive { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; };
 decompr = derive { name="decompr"; version="4.1.0"; sha256="1agzfy7iyyzh71pb56l7438bvpsx0q2z9mxh16fc8mfnywcl2jr2"; depends=[]; };
 decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
-deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; };
+deducorrect = derive { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; };
 deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
 degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
 degreenet = derive { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; };
@@ -3134,7 +3208,7 @@ demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1
 deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; };
 demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; };
 demography = derive { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
-dendextend = derive { name="dendextend"; version="1.0.1"; sha256="1q2lhl1h1f9ga3anqcdhzksg8kqri6gwl9a8mjzs8yr17cs51ff6"; depends=[magrittr whisker]; };
+dendextend = derive { name="dendextend"; version="1.1.0"; sha256="0gpxifsfhzdrif33hcsqs462vfrs44q6406w9zipzffywy5i5mvh"; depends=[magrittr whisker]; };
 dendextendRcpp = derive { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[dendextend Rcpp]; };
 dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; };
 dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; };
@@ -3149,7 +3223,7 @@ depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6j
 depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
 dequer = derive { name="dequer"; version="1.0"; sha256="1xf2kl6ppgsplqwhxxyak39575bjijh81snq534yndf31pdqqhd7"; depends=[]; };
 descomponer = derive { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; };
-descr = derive { name="descr"; version="1.1.1"; sha256="1flnz05j390izwadsv2l5bcxgl6zmq4vzz1aycfifjz75zyqqy8s"; depends=[xtable]; };
+descr = derive { name="descr"; version="1.1.2"; sha256="1bqr63s2w0gak117506f5v7k9wfj08cn6jy6idw5ii7x6jjh6xx7"; depends=[xtable]; };
 deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; };
 desiR = derive { name="desiR"; version="1.0"; sha256="10c9ld918yg5zgvf40bhlsj2i7w6i08ws26q799w9ma9splgq8sk"; depends=[]; };
 designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
@@ -3206,11 +3280,11 @@ disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv
 disparityfilter = derive { name="disparityfilter"; version="2.1"; sha256="0ld43hd4dr389pd8sncslp707jyfgbx7w1larq75gkzjykc29aqw"; depends=[igraph]; };
 displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
 dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
-disposables = derive { name="disposables"; version="1.0.0"; sha256="0xd8war6vav8swpwgmyi9hd6xv0j6j72yrk4sdcwiwzgs4l8cbfj"; depends=[]; };
+disposables = derive { name="disposables"; version="1.0.1"; sha256="1gmmf34hq8vm2gjg1560hkarppxmzakymgjbpzbpy2j471kd9s7a"; depends=[]; };
 dissUtils = derive { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
-distcomp = derive { name="distcomp"; version="0.25.1"; sha256="04cq4hsv1yl65cchhran9s3844w4knsbfja5wxfib5gh4dadriwk"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
+distcomp = derive { name="distcomp"; version="0.25.3"; sha256="1rjgzwh3i17w0r9qdiix88px1ddynkfwwzn78g6s3f8kjksiackn"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
 distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
-distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; };
+distillery = derive { name="distillery"; version="1.0-2"; sha256="12m4cacvc18fd3aayc8iih5q6bwsmvf29b55fwp7vs8wp1h8nd8c"; depends=[]; };
 distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; };
 distr = derive { name="distr"; version="2.5.3"; sha256="13ssdidbh4x534f0vvhfpi5cdrhlpmrz8s0y33q7ccf3dfmdsyan"; depends=[sfsmisc startupmsg SweaveListingUtils]; };
 distrDoc = derive { name="distrDoc"; version="2.5.1"; sha256="02wcqy9z36lxkpxy42vj1yv7x2v3i57rngpw58s7immzp5j3dlam"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg SweaveListingUtils]; };
@@ -3237,7 +3311,7 @@ dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a
 dmm = derive { name="dmm"; version="1.6-2"; sha256="00wqa33n1zd6gbl658vrz07f6kkhbmdg8f3y9x9n3zq2ygnxrid1"; depends=[MASS Matrix nadiv pls robustbase]; };
 dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
 dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
-dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
+dnet = derive { name="dnet"; version="1.0.7"; sha256="0aa64y7mm1xan34h1pimajm7hvlm7z3r9rikysc2dw5dskkhli40"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
 doBy = derive { name="doBy"; version="4.5-13"; sha256="07ppghcf381wc9s9igsi3viy6p86b5bmpfm1s8iwq7ca4j89qw42"; depends=[MASS Matrix survival]; };
 doMC = derive { name="doMC"; version="1.3.3"; sha256="0g5psgk92b2zk9fkap3a86haay2y0kfz75cyk3d1ila9m7cd2cn4"; depends=[foreach iterators]; };
 doMPI = derive { name="doMPI"; version="0.2.1"; sha256="1d2pkxsap656l7h88q37ymy1jw0zd4n9h892511a1a230dxwc0xh"; depends=[foreach iterators Rmpi]; };
@@ -3251,7 +3325,8 @@ domino = derive { name="domino"; version="0.2-7"; sha256="1wp2rikyggjvqpg29qjn3z
 dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[aod Matrix mvmeta]; };
 dostats = derive { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
 dotenv = derive { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[falsy magrittr]; };
-downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; };
+dotwhisker = derive { name="dotwhisker"; version="0.1.0.1"; sha256="00apyw3w7ribazpnbg91q82awd4rhmlrylsimvf9dra4pgaq4n3d"; depends=[dplyr ggplot2 gridExtra gtable]; };
+downloader = derive { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
 dpa = derive { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; };
 dpcR = derive { name="dpcR"; version="0.1.4.0"; sha256="0fv17vzlsjb5cy1f0ll5gi5y8npavp2y7frzc595na5g15xphmxc"; depends=[binom chipPCR dgof e1071 multcomp pracma qpcR rateratio_test shiny signal spatstat]; };
 dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
@@ -3260,7 +3335,7 @@ dplRCon = derive { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vv
 dplyr = derive { name="dplyr"; version="0.4.2"; sha256="1b0nb7agzb515jrm33sv8yhszsf06d9fga6pgdxi2kwl71vjfrd6"; depends=[assertthat BH DBI lazyeval magrittr R6 Rcpp]; };
 dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; };
 dpmr = derive { name="dpmr"; version="0.1.7-1"; sha256="0nh45hg9za9w4w4syrrg54s1fpn6iikv431qkdjyinv8y1a3klga"; depends=[digest httr jsonlite magrittr rio]; };
-dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; };
+dr = derive { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
 drat = derive { name="drat"; version="0.0.4"; sha256="0pq74a0f1pkgfzgrh0r2xa2xkgxbanp8a5v13bmma09ghy5vnrhm"; depends=[]; };
 drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
 drc = derive { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[car gtools MASS multcomp plotrix scales]; };
@@ -3274,11 +3349,12 @@ ds = derive { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9n
 dsample = derive { name="dsample"; version="0.91.1.5"; sha256="02ksm4d9ybz4w7j3c9rjqh262k6rqs1bdhj3p7w5rcaskpc6qz9s"; depends=[]; };
 dse = derive { name="dse"; version="2014.11-1"; sha256="0fl1av8zd0csbsk6fplcxgqsb50qr1baasw2jrqv6h83j2xwph2l"; depends=[setRNG tfplot tframe]; };
 dslice = derive { name="dslice"; version="1.1.4"; sha256="0srqw1kznbjl1v6dpgh7vsrpf9k3zj7j55zw9k50jsbw2z4xqzfw"; depends=[ggplot2 Rcpp scales]; };
-dsm = derive { name="dsm"; version="2.2.5"; sha256="0sfsfzcsqnvjkc5l7h5xq8p2jsgwxfzds75sqs58a0kzagcm1b05"; depends=[ggplot2 mgcv mrds nlme statmod]; };
+dsm = derive { name="dsm"; version="2.2.9"; sha256="147c94bk73ss7bcliz4a65zx0lhf3gap9ygcc82yvf7sibpasnqd"; depends=[ggplot2 mgcv mrds nlme statmod]; };
 dst = derive { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; };
 dti = derive { name="dti"; version="1.2-0.1"; sha256="09ad7mwa53dk1jlddkql3wm1s2diyqij7prd5klh59j21kvkf0hy"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
 dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
 dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; };
+dtwclust = derive { name="dtwclust"; version="0.1.0"; sha256="0q0d9qnppj6wdc5dlic7x53dpn7l99lrmkbhwkhdj4w1mcbsg9v0"; depends=[caTools dtw flexclust ggplot2 modeltools proxy reshape2]; };
 dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
 dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
 dummy = derive { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
@@ -3297,9 +3373,10 @@ dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6
 dynatopmodel = derive { name="dynatopmodel"; version="1.0"; sha256="1dq18wqbf7y597mbqv8fwwc5fm8l618mkqvb2l95bplq7n508hng"; depends=[fields hydroGOF intervals maptools raster rgdal rgeos shape sp spam topmodel xts]; };
 dynia = derive { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
 dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[car lmtest zoo]; };
-dynsim = derive { name="dynsim"; version="1.0"; sha256="0w4brs8kcps6gkamkic57nj61iz7zdxq972jwzs17i43wfcrw32c"; depends=[ggplot2 gridExtra MASS]; };
+dynpred = derive { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
+dynsim = derive { name="dynsim"; version="1.2"; sha256="0vd08mdv7yklhy5rqmhji0ff9284n2z15a3ij4ylw7a0hzlyp2m3"; depends=[ggplot2 gridExtra MASS]; };
 dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
-e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; };
+e1071 = derive { name="e1071"; version="1.6-7"; sha256="1069qwj9gsjq6par2cgfah8nn5x2w38830761x1f7mqpmk0gnj3h"; depends=[class]; };
 eHOF = derive { name="eHOF"; version="1.5.9"; sha256="187c85fp7q63ipqd3qzivlv9asm9zc49rvw33j39js03mak4r0d2"; depends=[lattice mgcv]; };
 eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[lattice MASS Matrix]; };
 eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; };
@@ -3329,12 +3406,14 @@ edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilk
 edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
 edgeRun = derive { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; };
 editrules = derive { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; };
+edmr = derive { name="edmr"; version="0.6.3.1"; sha256="1avb4gnw8s635yyn3sh20pmppsnz39s7r1pr8ggdc61ca1mkh2mk"; depends=[data_table GenomicRanges IRanges mixtools S4Vectors]; };
 edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[lasso2 MASS mvtnorm rgl]; };
 eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 fields splus2R wmtsa]; };
 eegkit = derive { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; };
 eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
 eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[arm data_table ggplot2 maptools MASS memisc stringr]; };
 effects = derive { name="effects"; version="3.0-4"; sha256="0ypw49gighmg2azc2872y8r9rx9v3x0r2gsidgkwqlaqg95vfcd7"; depends=[colorspace lattice lme4 nnet]; };
+efflog = derive { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
 effsize = derive { name="effsize"; version="0.5.4"; sha256="1dc90avbnb83nrm70wh0h45g3c6dcg8zh2ynklc2x86cqk7b264b"; depends=[]; };
 ega = derive { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; };
 egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[fArma ggplot2 MASS tseries TTR urca xts zoo]; };
@@ -3361,7 +3440,7 @@ embryogrowth = derive { name="embryogrowth"; version="6.0"; sha256="0l08imqagn2w
 emdbook = derive { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[bbmle coda lattice MASS plyr rgl]; };
 emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
 emg = derive { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
-emil = derive { name="emil"; version="2.0.2"; sha256="16fkf5ns6pw0nrpysr1yy5hwwg59mkfa84skajchfvq75aw6hwbi"; depends=[data_table dplyr ggplot2 lazyeval magrittr tidyr]; };
+emil = derive { name="emil"; version="2.1.1"; sha256="09n9qrlww33x4n3020dc8snc7qadyvjinc73dn7r6rvhf76ygrx3"; depends=[data_table dplyr ggplot2 lazyeval magrittr tidyr]; };
 emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
 emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
 emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
@@ -3370,7 +3449,7 @@ empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.3"; sha2
 emplik = derive { name="emplik"; version="1.0-1"; sha256="1kwgikdnxh52wsmzrzqv7sp8s55w9q40aq9kpfd3zshkflx7w8g1"; depends=[quantreg]; };
 emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
 emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
-enaR = derive { name="enaR"; version="2.8.1"; sha256="1p2vhqd1zxwar5fb16ibvwrzrxl7c574ls6747bkdjzlx7vznrn1"; depends=[gdata MASS network sna stringr]; };
+enaR = derive { name="enaR"; version="2.9"; sha256="0nhaqjp18zmjk3bl442fhpgxvz7psk1r3zff3qdrz794hxi5s6a9"; depends=[gdata MASS network sna stringr]; };
 endogMNP = derive { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
 endorse = derive { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; };
 energy = derive { name="energy"; version="1.6.2"; sha256="008yf4r6546mzk9q515zliqxyjx6w0z19g5wlarg7f4lrzsmqiaw"; depends=[boot]; };
@@ -3399,7 +3478,7 @@ eqs2lavaan = derive { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb
 eqtl = derive { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
 equate = derive { name="equate"; version="2.0-3"; sha256="0y37nxily7zjx00z7h4vmpn8cs7bl3aravhjkjz9l6y0fv0rc5vv"; depends=[]; };
 equateIRT = derive { name="equateIRT"; version="1.2"; sha256="07qh5awa12d1bcm504k0rpgyxyzhymg92131cl676kdlfp49aqk1"; depends=[statmod]; };
-equivalence = derive { name="equivalence"; version="0.6.0"; sha256="1q17c2bs36f46bmm6wzmp0g2lg7d0j9mlrfnkzxnlvmspwksc0zl"; depends=[boot lattice PairedData]; };
+equivalence = derive { name="equivalence"; version="0.7.0"; sha256="0x9840kyyhdlj13r2rhijc6p0chvzyqp6lkxxf561pnprhkzzqdj"; depends=[boot lattice PairedData]; };
 erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn24qdyhszssai9i390mi7w0p88wgba9"; depends=[lattice]; };
 erer = derive { name="erer"; version="2.3"; sha256="165hngfzbzn403gwdcjkhvlm7jygl57nbpwdmlya2rd43z09kp77"; depends=[ggplot2 lmtest systemfit tseries urca]; };
 ergm = derive { name="ergm"; version="3.4.0"; sha256="1qyj4b22d998qky0rv1h9h0r33vdwr7lw7gpkvbgzf5d44yng33b"; depends=[coda lpSolve Matrix network robustbase statnet_common trust]; };
@@ -3425,11 +3504,11 @@ eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid
 evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
 evmix = derive { name="evmix"; version="2.6"; sha256="1rc52mqmzl05n5n1lr990czqgpq9h2x8shnv6s7hvr8896kjasjm"; depends=[gsl MASS SparseM]; };
 evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[ape geiger seqinr stringr taxize]; };
-evolqg = derive { name="evolqg"; version="0.1-5"; sha256="1s9jh14ycymlajc285cczr9m529vv6la4bkv0lgk3dc0557m7q5w"; depends=[ape ggplot2 magrittr mvtnorm phytools plyr Rcpp reshape2 tidyr vegan]; };
+evolqg = derive { name="evolqg"; version="0.1-6"; sha256="1n37cvngaw5sqfw71k7kysxp848p6d4cir46959cqj9q3yvgffvc"; depends=[ape ggplot2 magrittr Matrix mvtnorm phytools plyr Rcpp reshape2 tidyr vegan]; };
 evolvability = derive { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
 evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
 evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
-exCon = derive { name="exCon"; version="0.1.9"; sha256="0nqnr21rhhb41nqg55fjhv17qmgjz32hl9yq4gzwihjvb53xkf0z"; depends=[jsonlite]; };
+exCon = derive { name="exCon"; version="0.1.12"; sha256="0zap8jzjxqqg0kzdhjbpn05d5lb4wpvqjdfds15z281gnb19k9hg"; depends=[jsonlite]; };
 exact2x2 = derive { name="exact2x2"; version="1.4.1"; sha256="1a4cg8j8kdgwkj27qza6xm5x16m9sb2vczb1b9im8k4pas6v6jpk"; depends=[exactci ssanv]; };
 exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
 exactRankTests = derive { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; };
@@ -3456,7 +3535,7 @@ extraBinomial = derive { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n
 extraTrees = derive { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; };
 extrafont = derive { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; };
 extrafontdb = derive { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
-extremevalues = derive { name="extremevalues"; version="2.3.0"; sha256="1nn67kgf3qd41nmizkbc2cy3128kajsxbxg03fhfgkjdqa0781lq"; depends=[gWidgets gWidgetstcltk]; };
+extremevalues = derive { name="extremevalues"; version="2.3.1"; sha256="1x1yqm4yif46l9znxba4m8sp3xwj6vrdlqz8jdspqin53jm69gzw"; depends=[gWidgets gWidgetstcltk]; };
 eyetracking = derive { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
 ez = derive { name="ez"; version="4.2-2"; sha256="1dk4ig137ridr4pw4afp3flm22s8l38yrgxabld1zv46slndc8mm"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
 ezglm = derive { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
@@ -3490,15 +3569,15 @@ fail = derive { name="fail"; version="1.2"; sha256="0xzvb71iq20ah1x1zlb9kbx0r47j
 faisalconjoint = derive { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; };
 falcon = derive { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; };
 falsy = derive { name="falsy"; version="1.0.1"; sha256="1n2b2h7w7p3vib4vgb9vadd3c07dx12vz5gm8bawbdx7llh2pr24"; depends=[]; };
-fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; };
+fame = derive { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; };
 fanc = derive { name="fanc"; version="1.23"; sha256="01bsny14r3i0a0yxbq3c670vh6m17g0lcjiphm6g5427rkn70whq"; depends=[Matrix]; };
 fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[DiceKriging igraph sensitivity]; };
 fanplot = derive { name="fanplot"; version="3.4.0"; sha256="1arb10jxksicrdpgj8fq8r0sdnzvvdjjbw357aplqh422x54w4mp"; depends=[]; };
 faoutlier = derive { name="faoutlier"; version="0.5"; sha256="1via1gggcj6cpdkyn61fbvlvhl47dwv9hi81x2jlq15lh340ljd4"; depends=[lattice lavaan MASS mirt mvtnorm sem]; };
-far = derive { name="far"; version="0.6-4"; sha256="166lhswdd1shx591wvx8a3lwzjini60mc37rbb3qvm6fxrb6fl55"; depends=[nlme]; };
+far = derive { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; };
 faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; };
 farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
-fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; };
+fast = derive { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; };
 fastGHQuad = derive { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; };
 fastHICA = derive { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
 fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; };
@@ -3510,13 +3589,15 @@ fastcluster = derive { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5
 fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; };
 fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; };
 fastpseudo = derive { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
+fasttime = derive { name="fasttime"; version="1.0-1"; sha256="1yfxj7k781ks4bx45bmmg1zkfzz7s027h393a0l5h6i5g1z7b81d"; depends=[]; };
 fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; };
+favnums = derive { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; };
 fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
 fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[fgui pbatR rootSolve]; };
 fbroc = derive { name="fbroc"; version="0.2.1"; sha256="06qpdnh86klkbwiv593l57wnbamrmcj5ysabyrbjf9mr8mjzhkkj"; depends=[ggplot2 Rcpp]; };
 fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
 fclust = derive { name="fclust"; version="1.1.1"; sha256="0gxgyvz6nzqp5sdjhfdjmm3r4lf1b4min3s5rfddwdqiswzxg8m8"; depends=[]; };
-fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; };
+fcros = derive { name="fcros"; version="1.4"; sha256="0bawzzyx4512kyvd44dgnswpxgilmzz5xf2bmrnfapc9p4xcfjfw"; depends=[]; };
 fda = derive { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; };
 fda_usc = derive { name="fda.usc"; version="1.2.1"; sha256="1w0dw06vgviia4yy2v5mrq0jvnfvdp7y8f2x246v3xliqgjmg7as"; depends=[fda MASS mgcv rpart]; };
 fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp RcppArmadillo]; };
@@ -3563,7 +3644,7 @@ fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yv
 fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
 fitbitScraper = derive { name="fitbitScraper"; version="0.1.4"; sha256="0shbi5mmr9fw3cc2hn1yzd1ma9kid53ria9pbfkz1pk81n75krj1"; depends=[httr RJSONIO stringr]; };
 fitdistrplus = derive { name="fitdistrplus"; version="1.0-4"; sha256="02ds5vmxc3rk50c33rxdnpqf2hbx186ss6br29n6538q7734nra9"; depends=[survival]; };
-flam = derive { name="flam"; version="2.0"; sha256="10pzjdymcxm5yfqgqc2n99j986585ndxccpfvr4jilq4asf3iiaq"; depends=[MASS Rcpp]; };
+flam = derive { name="flam"; version="3.0"; sha256="0c3j382sa7szqrpd0j8vcg19p6yn18jphd55cbvl0g6z0z76y53p"; depends=[MASS Rcpp]; };
 flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; };
 flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
 flexCWM = derive { name="flexCWM"; version="1.5"; sha256="1q6nkw6al56wc53sj719c94iv20a9a82pq4s62jnb2flq1pwdaml"; depends=[adehabitat ellipse Flury MASS mclust mixture mnormt numDeriv statmod]; };
@@ -3575,6 +3656,7 @@ flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1
 flora = derive { name="flora"; version="0.2.4"; sha256="1rdwdx7mphfr7sk3yba0vhbsh3xggz2k6ip8dmfiqjjhv2vxji5k"; depends=[shiny]; };
 flower = derive { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; };
 flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
+flows = derive { name="flows"; version="1.0"; sha256="0bc5xs5dd4np68v7gp7qya37k83mjigjp35i9qsqcxyyvvsyd2jx"; depends=[igraph reshape2 sp]; };
 flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
 flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
 fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[forecast tseries]; };
@@ -3586,12 +3668,12 @@ fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0
 foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
 forams = derive { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; };
 foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
-forecTheta = derive { name="forecTheta"; version="1.0"; sha256="1ip6l27d37xqnmg8w285lq1y5j6akrjrviq4338c8sq075d8hckn"; depends=[forecast]; };
+forecTheta = derive { name="forecTheta"; version="1.1"; sha256="0cp582mwi9jf8nnb4p4hvzy86w8q12js3i8rp0gaq2xhm36w6v02"; depends=[forecast]; };
 forecast = derive { name="forecast"; version="6.1"; sha256="1hwv3arcpkkhpj5n2dvpw2fyx687b6x6yakxx55cw9rrka70rx1k"; depends=[colorspace fracdiff nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
 foreign = derive { name="foreign"; version="0.8-65"; sha256="03zg48vjqqcq9ri4a53czpyp82hml409g2rmdnmbfw8c1isdqacf"; depends=[]; };
 forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
 forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
-forestFloor = derive { name="forestFloor"; version="1.5"; sha256="1cpgjj2p4j14h2ks586nq8426k9nlnnwhnxniaack33rdy3axbdp"; depends=[kknn Rcpp rgl trimTrees]; };
+forestFloor = derive { name="forestFloor"; version="1.8.3"; sha256="1qxlkalq49ww290hz3dh4ha10qclaqbki063g2nxinrj4sqapap1"; depends=[ggplot2 gridExtra kknn Rcpp rgl]; };
 forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; };
 formatR = derive { name="formatR"; version="1.2"; sha256="0dlj728qdm7wmxcxvw1ip64pl4ajgmi8ax69zafrn3306pg9y136"; depends=[]; };
 formula_tools = derive { name="formula.tools"; version="1.5.4"; sha256="1qs7ls757qvh5gdkx32zslgpx1a4zk2vf8bbgjdax02jmlyp2qrp"; depends=[operator_tools]; };
@@ -3631,13 +3713,14 @@ fslr = derive { name="fslr"; version="1.4.4"; sha256="0k6973hd1q54q6243lir4xi3wl
 fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
 ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
 fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; };
-ftsa = derive { name="ftsa"; version="4.3"; sha256="0hf3v83a5mh6s8y3hhvnwqmj55n707c8lgkpmxlc52gxykgnayjz"; depends=[colorspace forecast MASS pcaPP rainbow]; };
+ftsa = derive { name="ftsa"; version="4.4"; sha256="1nj1m1asvhp8x9cdi9ywk94yhh0x12crqp2hs1rw5fdfw8w6k0xy"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; };
 fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
 fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; };
 fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
 funFEM = derive { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
 funHDDC = derive { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; };
 functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
+functools = derive { name="functools"; version="0.1.0"; sha256="0vcj376nskpz5a0l2bjrnvarlrc21wwk2w4054da6j63fm6ir8q3"; depends=[]; };
 funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; };
 funtimes = derive { name="funtimes"; version="1.1"; sha256="0z478b57l7hg8b42jyzcdjzs3nn62m2y117xmgbw1gbyf3rcnjkw"; depends=[Jmisc]; };
 futile_any = derive { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
@@ -3645,7 +3728,7 @@ futile_logger = derive { name="futile.logger"; version="1.4.1"; sha256="1plld1ic
 futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
 futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
 futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
-future = derive { name="future"; version="0.6.0"; sha256="14lsjay59xfdhqhdyz7v2qkwx5zd8hbkgq6l6vnihvm48rzsdg8v"; depends=[globals listenv]; };
+future = derive { name="future"; version="0.7.0"; sha256="0fkaqqwqbg4v4cgsqdsz861g809agz2jmhrs458qqrwx3as3j0gm"; depends=[globals listenv]; };
 fuzzyFDR = derive { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
 fuzzyMM = derive { name="fuzzyMM"; version="1.0.1"; sha256="1pqfc9b9l2xx5pl45hfildikqjsdgqfhqzi2nbb34026nla5m8vk"; depends=[frbs igraph osmar rgdal rgeos]; };
 fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-7"; sha256="0mhml0zzya58yn4wrafxk62agfrck6rryn5klprr416pj83pzcgk"; depends=[]; };
@@ -3677,7 +3760,7 @@ gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rq
 gains = derive { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
 galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; };
 gam = derive { name="gam"; version="1.12"; sha256="00rx8y7pcxabwjvg0ch6c76xqs43drjg3ih3kflqxdcl2rmaapnd"; depends=[foreach]; };
-gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; };
+gamair = derive { name="gamair"; version="0.0-9"; sha256="014fkysiyd49q9j0rrqh6wlp4pqz1q8lqgrqjxbp59x2mfhgxhsg"; depends=[]; };
 gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnskf4hic9y075chsd8214n1nk7i6jmz"; depends=[]; };
 gamboostLSS = derive { name="gamboostLSS"; version="1.1-3"; sha256="1gdsrizr4q5zyfs2g8c8fdwriqz0xrpq9vyy4wd2ywdh5lbi995b"; depends=[mboost]; };
 gamboostMSM = derive { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
@@ -3685,14 +3768,14 @@ gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0
 games = derive { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
 gamlr = derive { name="gamlr"; version="1.13-1"; sha256="1y97zsb9shll93f6j7r95296c26dbmxwa1z67ziy0yh4gsgbijc8"; depends=[Matrix]; };
 gamlss = derive { name="gamlss"; version="4.3-5"; sha256="167kpr6gnjfas8w944h7gds9mkhyly0q8kr0aa8crgi8g3j5npkn"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
-gamlss_add = derive { name="gamlss.add"; version="4.3-3"; sha256="0cs4mcpm0ckaim3g8q7m4yb6y3izqgvndzgkqgrwr75cxz0wd4vh"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
-gamlss_cens = derive { name="gamlss.cens"; version="4.3.1"; sha256="1y3a4b6n86h0r287065kr574ix0qpc2nnjpp8fp49nbpxwxlz962"; depends=[gamlss gamlss_dist survival]; };
-gamlss_data = derive { name="gamlss.data"; version="4.2-7"; sha256="0g3fmqrwxmj14r0p0ai1adq6cs3bd3ys47gjcja035xjiajg6cs2"; depends=[]; };
-gamlss_demo = derive { name="gamlss.demo"; version="4.3-1"; sha256="04xl2ddf8wg2j8m05y8j5avcgfrr55a7g6m9wzxx4k599m0c7c8i"; depends=[gamlss_dist gamlss_tr rpanel]; };
-gamlss_dist = derive { name="gamlss.dist"; version="4.3-4"; sha256="0aymwh1lrjalravqf6nfz716v4r805aw82dsi0sn2nlb00fi8w2x"; depends=[MASS]; };
-gamlss_mx = derive { name="gamlss.mx"; version="4.3-1"; sha256="1sjm8a44nh88mvscpspyqsp2agjhwibi4kbyizyi78dmzf2sakiq"; depends=[gamlss gamlss_dist nnet]; };
+gamlss_add = derive { name="gamlss.add"; version="4.3-4"; sha256="1sbs6jc7ashmkv8qz953v8paq4783rzw3m82b8ils4qm53ni8m01"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
+gamlss_cens = derive { name="gamlss.cens"; version="4.3-2"; sha256="0kakgvlx7g8v6wdlnjyganmvpnv8zqr1ml6n2saz913ykn3mkc77"; depends=[gamlss gamlss_dist survival]; };
+gamlss_data = derive { name="gamlss.data"; version="4.3-0"; sha256="072mgyalaspc5x099n6cc16k5ll1ry8f736114ffirf89yvinn0n"; depends=[]; };
+gamlss_demo = derive { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; };
+gamlss_dist = derive { name="gamlss.dist"; version="4.3-5"; sha256="0qq4nvcbh7s675bk3afv3wm0xdnzcbabdsbln8n16xgyvsiyr4pl"; depends=[MASS]; };
+gamlss_mx = derive { name="gamlss.mx"; version="4.3-2"; sha256="1hq0nv4l8z1iwbldf9vhdsgr0sd6jans90dvjgdvf2z66bvmc9i0"; depends=[gamlss gamlss_dist nnet]; };
 gamlss_nl = derive { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
-gamlss_spatial = derive { name="gamlss.spatial"; version="0.2"; sha256="0sjb47gnzrab4y23c0z7cxqq5k46k2rb31lmqws2c9zgf4n7aqbi"; depends=[gamlss gamlss_dist mgcv spam]; };
+gamlss_spatial = derive { name="gamlss.spatial"; version="1.3"; sha256="0mbvllgr5szrxwrr40jbn2c57hplkgpbnbr2v6pszjjygjcys6ga"; depends=[gamlss gamlss_dist mgcv spam]; };
 gamlss_tr = derive { name="gamlss.tr"; version="4.3-1"; sha256="1fdy61i2dmz2qafk92kl9acjbxx5gm8s9kkc8k9nnx6230qg8iq6"; depends=[gamlss gamlss_dist]; };
 gamlss_util = derive { name="gamlss.util"; version="4.3-2"; sha256="13facgyd14jl4j09d446jjzs91zwmv85g22gkyyi1hl4i5v5nfc4"; depends=[gamlss gamlss_dist zoo]; };
 gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[lme4 Matrix mgcv]; };
@@ -3725,7 +3808,7 @@ gee = derive { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxh
 geeM = derive { name="geeM"; version="0.7.4"; sha256="0vxgwx6qx2xhhj217d6x7m5y89r0b9xxdd4k3sw0zgfga133ij7w"; depends=[Matrix]; };
 geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; };
 geesmv = derive { name="geesmv"; version="1.1"; sha256="1xijdjmkg6nw2y1556zbaic969dg23np0wrb9ncknsrhq4aa28pa"; depends=[gee MASS matrixcalc nlme]; };
-geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3r8fvlgikrvi064ysvj2fqwh7jnq1"; depends=[]; };
+geigen = derive { name="geigen"; version="1.6"; sha256="1pw5ncnf4a4ckgrhfhh4nvji9i85sjg9q53258ng2w15j37fglic"; depends=[]; };
 geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape coda deSolve digest MASS mvtnorm Rcpp subplex]; };
 gelnet = derive { name="gelnet"; version="1.1"; sha256="1d77v44azqpk6hzi7fl2ba6z3nyzh33xn0yp7ydp86nmf1gcgwlh"; depends=[]; };
 gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[data_table MASS msm plyr]; };
@@ -3739,6 +3822,7 @@ genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1j
 gendata = derive { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
 gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; };
 genderizeR = derive { name="genderizeR"; version="1.2.0"; sha256="1a7vafspdd64wr47k1z391ff1ri5f8bynlgn876khcxzhm2vwdva"; depends=[data_table httr magrittr stringr tm]; };
+gendist = derive { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; };
 geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
 geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; };
 genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
@@ -3753,7 +3837,7 @@ geoBayes = derive { name="geoBayes"; version="0.2.150402"; sha256="123b2xds69clk
 geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; };
 geoR = derive { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS RandomFields sp splancs]; };
 geoRglm = derive { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; };
-geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi0rncjcf0aydda68wnsrbmqzsgc1f1has2rb1g9p0"; depends=[httr]; };
+geocodeHERE = derive { name="geocodeHERE"; version="0.1.3"; sha256="10b1fgclv3199cglnip5xy0kgi3gi41q9npv7w3kajkrdknnxms4"; depends=[httr]; };
 geojsonio = derive { name="geojsonio"; version="0.1.0"; sha256="17nv7xn80sf2nn6fvmlbnbcgg66n6bh8x725wdfnhk3gg1rb64g5"; depends=[httr jsonlite magrittr maptools rgdal rgeos sp V8]; };
 geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
 geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; };
@@ -3774,7 +3858,7 @@ getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz
 gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; };
 gettingtothebottom = derive { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
 gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
-ggExtra = derive { name="ggExtra"; version="0.1.5.2"; sha256="0lad58245x5gn1yqx65rqpbjwy17yrisns6lqnaw5w1ff5bh7s9i"; depends=[ggplot2]; };
+ggExtra = derive { name="ggExtra"; version="0.2.0"; sha256="15h8ijys5fpz1d42d2pcwvwkc4sffdl36g4yavly1skng0k3gc7c"; depends=[ggplot2]; };
 ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
 ggRandomForests = derive { name="ggRandomForests"; version="1.1.4"; sha256="0h55593mr2x0kvp97rrm1spj17zbr1p9pqrpngsxmp11iahhccqh"; depends=[ggplot2 randomForestSRC reshape2 survival]; };
 ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[ggplot2 MASS]; };
@@ -3782,12 +3866,12 @@ ggenealogy = derive { name="ggenealogy"; version="0.1.0"; sha256="0shy6ylrx49ycc
 gglasso = derive { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; };
 ggm = derive { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; };
 ggmap = derive { name="ggmap"; version="2.4"; sha256="06mdczacjnlzyr5sm1d099sqyf6anhlnn2bnjxni8h36100m5nm2"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; };
-ggmcmc = derive { name="ggmcmc"; version="0.6"; sha256="12z0six1swpmisbm8x9a9dk19cd0f9yvzm92gc9qs484ihpcscvq"; depends=[dplyr ggplot2 tidyr]; };
+ggmcmc = derive { name="ggmcmc"; version="0.7.1"; sha256="00knrahhl1bbhgz04qyc9bk992k9x4axdd25kpx39jrr5rzz9b2r"; depends=[dplyr GGally ggplot2 tidyr]; };
 ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 plyr reshape2]; };
 ggplot2 = derive { name="ggplot2"; version="1.0.1"; sha256="0794kjqi3lrxb33lr1mykd58959hlgkhdn259vj8fxrh65mqw920"; depends=[digest gtable MASS plyr proto reshape2 scales]; };
 ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; };
 ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; };
-ggtern = derive { name="ggtern"; version="1.0.5.0"; sha256="0ykgz3268381glkrv1gbn9qnyrkxsmihc3srv8zrldbq18zbr0a8"; depends=[ggplot2 gtable MASS plyr proto reshape2 scales sp]; };
+ggtern = derive { name="ggtern"; version="1.0.6.0"; sha256="10aiicvr2vklajmcacpa9ki30hvqjr8y9150mfx6fyqhk8c2r6kl"; depends=[ggplot2 gtable MASS plyr polyclip proto reshape2 scales sp]; };
 ggthemes = derive { name="ggthemes"; version="2.2.1"; sha256="0d6h3ymxwxcii95wggxmyvihnwsl85nlqja2ac34dsfwlv75cc16"; depends=[colorspace ggplot2 proto scales]; };
 ggvis = derive { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
 ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[gplots numDeriv]; };
@@ -3802,16 +3886,16 @@ glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf
 glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
 glba = derive { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; };
 glcm = derive { name="glcm"; version="1.2"; sha256="00bkhd4arvg7ahdr5kfvran46b2sywv9i0rlwalx9pmyvjwnzm5b"; depends=[Rcpp RcppArmadillo]; };
-gld = derive { name="gld"; version="2.3"; sha256="072q79aisvygi1pjndvvn2xaczi1xlpd9sjc4f1xspavy567z09d"; depends=[]; };
+gld = derive { name="gld"; version="2.3.1"; sha256="0zk192wp8q1v4ilwj9wilx9bgl1fcp92hgwqw2qb1c67bacfwy7a"; depends=[]; };
 gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
 glinternet = derive { name="glinternet"; version="1.0.0"; sha256="0aa75xq2w64iknbyl6qw9ckk8v64a96xz0ar1mbqd8zhx0xvibyy"; depends=[]; };
 gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
 glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; };
 glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
 glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
-glmgraph = derive { name="glmgraph"; version="1.0.1"; sha256="1jzkz2lri7nbxxkryhf95503wd651ic59h6iafkx9ahwpmibyv4l"; depends=[Rcpp RcppArmadillo]; };
+glmgraph = derive { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; };
 glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
-glmm = derive { name="glmm"; version="1.0.3"; sha256="0bs543x9czg8mbgpy0zhgnfll2nrmj8xz5kwkddf3k6hp859h0v8"; depends=[Matrix mvtnorm trust]; };
+glmm = derive { name="glmm"; version="1.0.4"; sha256="0mcdy8aa5dlscrdahnd7jn9ip28jzipp4imv6cyk8fkkmiy60qhx"; depends=[Matrix mvtnorm trust]; };
 glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[abind MASS]; };
 glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; };
 glmmLasso = derive { name="glmmLasso"; version="1.3.4"; sha256="14x74640vvyrg72pq19gqb8db7wq97xhc30iakh84fdh1llyykpn"; depends=[minqa]; };
@@ -3821,7 +3905,7 @@ glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrs
 glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; };
 glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; };
 glmulti = derive { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; };
-glmvsd = derive { name="glmvsd"; version="1.2"; sha256="0p99sanr95vcjfyjx7khwd1l59d319j1i49iv3isgsh3fwikhpgf"; depends=[glmnet MASS ncvreg]; };
+glmvsd = derive { name="glmvsd"; version="1.3"; sha256="0grcncw7wisvy3sr7x7w67n30sa6pasvn4869q7bfd0jwbsr3l7k"; depends=[glmnet MASS ncvreg]; };
 glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnbq7yyzmi577pb7igwvi3hjn7g7k"; depends=[Formula lmtest MASS sandwich]; };
 globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
 globalOptTests = derive { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
@@ -3834,7 +3918,7 @@ gmailr = derive { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm
 gmatrix = derive { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; };
 gmm = derive { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; };
 gmnl = derive { name="gmnl"; version="1.1"; sha256="1dz7fhacys88hpf13pbqc9ba37qhwspq7j5zqfy1bg4py1hsx1q7"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
-gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[gdata MASS]; };
+gmodels = derive { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; };
 gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; };
 gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; };
 gnm = derive { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; };
@@ -3845,6 +3929,7 @@ gof = derive { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp
 goft = derive { name="goft"; version="1.1"; sha256="19mb2i2iri09v2dgkyl1ral2m7bzyizncnz24niwg13afpwbq12h"; depends=[gPdtest mvShapiroTest]; };
 goftest = derive { name="goftest"; version="1.0-3"; sha256="0rwz8y23dsklwvmd4sxq0bcklsa7l47lbs5lkcdn58jsdzm7bfrq"; depends=[]; };
 gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; };
+googlePublicData = derive { name="googlePublicData"; version="0.15.7.28"; sha256="1bkfj88rn8ai0kbjbd0s3zih6iz018xybr13w2h9i6wdi3dhs75s"; depends=[XLConnect XML]; };
 googleVis = derive { name="googleVis"; version="0.5.9"; sha256="0r182x6ccpdqkgqmqf26lvajhw954vqzm4bnyvpqif57nnzw4zpx"; depends=[RJSONIO]; };
 googlesheets = derive { name="googlesheets"; version="0.1.0"; sha256="0c3a521i2nw5v6ydz0ci7vbxlzfv3bh39yi7njah25zfbxjgm751"; depends=[cellranger dplyr ggplot2 httr plyr stringr tidyr XML xml2]; };
 goric = derive { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
@@ -3871,7 +3956,7 @@ greport = derive { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva
 greyzoneSurv = derive { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
 gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
 gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; };
-gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; };
+gridExtra = derive { name="gridExtra"; version="2.0.0"; sha256="19yyrfd37c5hxlavb9lca9l26wjhc80rlqhgmfj9k3xhbvvpdp17"; depends=[gtable]; };
 gridGraphics = derive { name="gridGraphics"; version="0.1-3"; sha256="09ml9vy4lz0q235xy2m5l8qd3rb3r73gf3bwz35dgn7qcxps8jjp"; depends=[]; };
 gridGraphviz = derive { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; };
 gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkkiw9glhdljwxlc8kkr1fgkbrwmsi053iwk"; depends=[RJSONIO XML]; };
@@ -3910,17 +3995,17 @@ gte = derive { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rd
 gtools = derive { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; };
 gtop = derive { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
 gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
-gumbel = derive { name="gumbel"; version="1.05"; sha256="0d7isx7bhvryhaa25kxb4fm58ph81xaqscj19aaqzs8yg79ac2ar"; depends=[]; };
+gumbel = derive { name="gumbel"; version="1.10-1"; sha256="12rkri8bvgjn0ylf1i4k9vpb8mvbasidvx2479kmis2rc1p07qq7"; depends=[]; };
 gvc = derive { name="gvc"; version="0.2.0"; sha256="0d7plcd5yy6xw1i6dvh2df8jg6fcyfd6kjypbflppnbl5n1zab12"; depends=[decompr]; };
 gvcm_cat = derive { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; };
 gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; };
 gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
 gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
-h2o = derive { name="h2o"; version="3.0.0.22"; sha256="0vgm0dn0jgwpg0ak4x62ib8ai891vqqah0fx8sb3kxr0kxy1q0hw"; depends=[RCurl rjson statmod]; };
-h5 = derive { name="h5"; version="0.9.1"; sha256="1q20i5hnfzr88kb63yvvgn7z39cvk514fj2770i29lm71jdph00q"; depends=[Rcpp]; };
+h2o = derive { name="h2o"; version="3.0.0.30"; sha256="052m7ba4wgmvbx7bc1d449896ipj7gsgvw2lr07xlbs1zlqadak2"; depends=[RCurl rjson statmod]; };
+h5 = derive { name="h5"; version="0.9.2"; sha256="1fsd4wgks9xlyyrmfc8pcs81a7b6wpfcshyf41lr7sncsvbzs0cd"; depends=[Rcpp]; };
 hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
 haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
-hamlet = derive { name="hamlet"; version="0.7"; sha256="0f3gl5xvgdksaxk76dyv46hahc41f2j3pf9wp0rc0q7wpp5nfsjl"; depends=[]; };
+hamlet = derive { name="hamlet"; version="0.9.4"; sha256="0x8g7fxbns41zrlr4cmq6d523bajyny9kd4846lx2lma1q2jrn4s"; depends=[]; };
 hapassoc = derive { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
 haplo_ccs = derive { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
 haplo_stats = derive { name="haplo.stats"; version="1.6.11"; sha256="0j3zh4n2rly8dij8srm8ck6fl63haw6d27m3nfnrxywr87pljg14"; depends=[]; };
@@ -3953,7 +4038,7 @@ heatmapFit = derive { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrx
 heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d130vj578nyv5wacivikgfifyy0y39"; depends=[]; };
 helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
 helsinki = derive { name="helsinki"; version="0.9.27"; sha256="1vhzlxjkk2hgzjlin9ksvjk3bi2ly5nm4361777m49lb84ncs7dr"; depends=[maptools RCurl rjson sp]; };
-heplots = derive { name="heplots"; version="1.0-15"; sha256="0sl5pqc57lhhh8s8hym0l874saq974hms6vsq7ll6g60rifx4lbq"; depends=[car MASS]; };
+heplots = derive { name="heplots"; version="1.0-16"; sha256="00aj3x864zlzyj52yya7wajjnpwmpgicqvgyx71gnxdkqmv64x40"; depends=[car MASS]; };
 hergm = derive { name="hergm"; version="2.2-2"; sha256="0jshhf57kybrayk94vv7p1sjvhlfcdya6jllaj9kgn46kkvci54p"; depends=[ergm latentnet network sna]; };
 heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; };
 hermite = derive { name="hermite"; version="1.1.0"; sha256="184f7iixsmpli5hp4f0frjxfwpxpicjn1yrk6sf8y4il49cx0s4v"; depends=[maxLik]; };
@@ -3982,6 +4067,7 @@ highTtest = derive { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqm
 highfrequency = derive { name="highfrequency"; version="0.4"; sha256="0kzadnkvmxcrb8flsxlx8vd9c2yad7hh1pij05dhdcpaidrc9acq"; depends=[xts zoo]; };
 highlight = derive { name="highlight"; version="0.4.7"; sha256="1gpwj4phq45hhx4x6r8rf6wc6ak6y4fkbad9v23fl8wldb4a8dyg"; depends=[]; };
 highr = derive { name="highr"; version="0.5"; sha256="0jnab5pk5sg4f5krsg5jdamr4y40z2pzxhp5h6fb6wys3m75hzny"; depends=[]; };
+highriskzone = derive { name="highriskzone"; version="1.2"; sha256="1kv8w1p3d8p9asigcpc713qwy91hiqb2qsw592sr9zy1nr5ax6gc"; depends=[deldir fields ks Matrix rgeos spatstat]; };
 hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
 hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
 hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[fda Iso Matrix]; };
@@ -3989,16 +4075,16 @@ hisse = derive { name="hisse"; version="1.1"; sha256="1f35an1zfsy9ziqqb02fss2kss
 histmdl = derive { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf8n9k35s30pshc5nymif88gjik9gvrxd0"; depends=[]; };
 histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
 historydata = derive { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
-hitandrun = derive { name="hitandrun"; version="0.5-1"; sha256="0qgja0xw6687hr9qw4cwl9gq1vbv8gdnh6fkq2wx5cahgjz1p3bj"; depends=[rcdd]; };
+hitandrun = derive { name="hitandrun"; version="0.5-2"; sha256="0451rdnp3b4fcdv4wwdxv3wplkxqmidxh4v5n1jjxinnzvl5dv9a"; depends=[rcdd]; };
 hive = derive { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; };
 hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
 hmm_discnp = derive { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; };
 hmmm = derive { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; };
 hnp = derive { name="hnp"; version="1.0"; sha256="1sxbgz57js1vxhz309dnj6jhw4y6c0pzk0a9xk8avacicnv0bxhr"; depends=[MASS]; };
-hoa = derive { name="hoa"; version="2.1.1"; sha256="0ph83z28200q488nj5zbprzxxh7nskp0rx62s1qngai2iy4zfnj8"; depends=[statmod survival]; };
+hoa = derive { name="hoa"; version="2.1.2"; sha256="1y3fg19k8naysbkpg5cxivk9xcck9l1ws27virbdacblc4xfqmpc"; depends=[statmod survival]; };
 hoardeR = derive { name="hoardeR"; version="0.1"; sha256="1a3kf676mchrla9g0b619dx09ihxvlmahgwlbwqny6zwr49w7vzl"; depends=[httr MASS R_utils stringr XML]; };
 holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; };
-homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[ape rgl scatterplot3d]; };
+homals = derive { name="homals"; version="1.0-6"; sha256="1xfpb6mxfk18ad2fggljr2g01gy4c290axc3vgwngmmimmcvh4cy"; depends=[ape rgl scatterplot3d]; };
 homeR = derive { name="homeR"; version="0.1"; sha256="0yq93b3wkgbnwzpyhx9c73sb9xgz7m3z4p5rflk3lmc0p53h81g5"; depends=[]; };
 homtest = derive { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
 hornpa = derive { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; };
@@ -4010,17 +4096,18 @@ hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wk
 hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
 hqreg = derive { name="hqreg"; version="0.9"; sha256="1091qrs31iabnms0z15f1mliaq69k9snxsscfizh8rws2vqhrjvr"; depends=[]; };
 hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
-hsdar = derive { name="hsdar"; version="0.2.1"; sha256="0353601af5n8dkz7adxzqig30pwbli2yvb5lx5lb5ihaq706yr51"; depends=[raster rgdal rootSolve signal sp]; };
+hsdar = derive { name="hsdar"; version="0.3.0"; sha256="1bv7bw27ybw9fkbzk3q0scs8y19maj7321mlcwhgp91xykcp01wg"; depends=[raster rgdal rootSolve signal sp]; };
 hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
 hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
 hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; };
 htmlTable = derive { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[knitr magrittr stringr]; };
+htmltab = derive { name="htmltab"; version="0.6.0"; sha256="00171fsdgv3rks6j4i5w8rbk2kar2rbmqqpqrr2xdxkjqxsf6k4b"; depends=[httr XML]; };
 htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; };
 htmlwidgets = derive { name="htmlwidgets"; version="0.5"; sha256="1d583kk7g29r4sq0y1scri7fs48z6q17c051nyjywcvnpy4lvi8j"; depends=[htmltools jsonlite yaml]; };
 hts = derive { name="hts"; version="4.5"; sha256="1bjribmfczkx139z73b0cl3lzlw5n2byyyc5inqv9qgayz0dc6cp"; depends=[forecast Matrix Rcpp RcppEigen SparseM]; };
 httk = derive { name="httk"; version="1.2"; sha256="016njh1cm21bmdrn94cbsmf36gzcwfg21bqp8nl100qb16d6yqq6"; depends=[deSolve msm]; };
 httpRequest = derive { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
-httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp]; };
+httpuv = derive { name="httpuv"; version="1.3.3"; sha256="0aibs0hf38n8f6xxx4g2i2lzd6l5h92m5pscx2z834sdvhnladxv"; depends=[Rcpp]; };
 httr = derive { name="httr"; version="1.0.0"; sha256="1yprw8p4g8026jhravgg1hdwj1g51cpdgycyr5a58jwm4i5f79cq"; depends=[curl digest jsonlite mime R6 stringr]; };
 huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[igraph lattice MASS Matrix]; };
 humanFormat = derive { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
@@ -4029,7 +4116,7 @@ hwriter = derive { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqb
 hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; };
 hwwntest = derive { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
 hybridEnsemble = derive { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; };
-hybridHclust = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; };
+hybridHclust = derive { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; };
 hydroApps = derive { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
 hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[hydroTSM xts zoo]; };
 hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc lattice lhs sp zoo]; };
@@ -4061,7 +4148,7 @@ iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6q
 ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[car lpSolve lsmeans MASS multcompView]; };
 ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
 ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; };
-ibelief = derive { name="ibelief"; version="1.1"; sha256="164cd68qq0z68n5j0b192krpk73y8cy15wr5wnb52rzxv5k7rfd4"; depends=[]; };
+ibelief = derive { name="ibelief"; version="1.2"; sha256="1zh6bpg0gaybslr1p05qd5p2y5kxbgyhgha4j4v5d69d78jwgah9"; depends=[]; };
 ibmdbR = derive { name="ibmdbR"; version="1.36.7"; sha256="0v6l8cm0sww2gm8yal4ffk2wcxfnvfsd76i92f2khank7bhga06r"; depends=[MASS RODBC]; };
 ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; };
 ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[boot kappalab mvtnorm quadprog]; };
@@ -4072,7 +4159,7 @@ icamix = derive { name="icamix"; version="1.0.2"; sha256="0rpqx9q5p3nb5gd76zlkql
 icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
 iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp RcppArmadillo]; };
 icd9 = derive { name="icd9"; version="1.2"; sha256="0d0dgd5951chyfimzjb00cphdvqzml8p8wr7sad3qfhv44dsypn7"; depends=[checkmate Rcpp]; };
-icenReg = derive { name="icenReg"; version="1.2.5"; sha256="1qw0c0y0hykb79p55lnvjk9zbxr0gva299i46cj8clcwyh2ivfga"; depends=[foreach survival]; };
+icenReg = derive { name="icenReg"; version="1.2.7"; sha256="0rhsqbnpfd8zbc3mvnb5qlsvvgwfp1jd9mc0k78c76avj1inchbi"; depends=[foreach survival]; };
 icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp]; };
 icsw = derive { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; };
 idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
@@ -4081,12 +4168,13 @@ idm = derive { name="idm"; version="1.0"; sha256="001zvhw38qgq1l66yxz5kchvjspijd
 idr = derive { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
 ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; };
 ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
+ifaTools = derive { name="ifaTools"; version="0.6"; sha256="0yzwz5dq4plhqkd699wrfgas9rsk0qj799bay9vkxh3cgbs73gbi"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
 ifctools = derive { name="ifctools"; version="0.3.1"; sha256="0lr1d4z2gzninqchfzmmmymd0ngywrjpbh7bvd6qgxkzabf9yxxx"; depends=[]; };
 ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; };
 ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[MASS splus2R]; };
 ig_vancouver_2014_topcolour = derive { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
 igraph = derive { name="igraph"; version="1.0.1"; sha256="00jnm8v3kvxpxav5klld2z2nnkcpj4sdwv4ksipddy5mp04ysr6w"; depends=[irlba magrittr Matrix NMF]; };
-igraphdata = derive { name="igraphdata"; version="1.0.0"; sha256="1b8almybmsgmjhp6lhxqqbv34kn2hpw9b08g911ip89hmlypd97s"; depends=[]; };
+igraphdata = derive { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; };
 igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
 ihs = derive { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
 iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
@@ -4097,7 +4185,8 @@ imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b7
 imputeLCMD = derive { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; };
 imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
 imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; };
-in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; };
+imputeTS = derive { name="imputeTS"; version="0.1"; sha256="0sq2qkvzvzk4iglzhm802b3fmvm1iqvc3g32pld6qs0pv5b6n04q"; depends=[]; };
+in2extRemes = derive { name="in2extRemes"; version="1.0-2"; sha256="10ngxv4zsh78gm3xwb22m681nhl2qbnzi4fkqwgjj2iz46ychzvy"; depends=[extRemes]; };
 inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; };
 inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
 indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7iq95wfnlv9rj46cyp9xy68bzqkbwdi3m"; depends=[httr png rjson stringr]; };
@@ -4106,7 +4195,7 @@ ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy
 inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
 inferference = derive { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[Formula lme4 numDeriv]; };
 inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; };
-influence_ME = derive { name="influence.ME"; version="0.9-5"; sha256="0sjrajhc198g391xa78l4gicmpyq4h7dnrnncji3qpgbqi772pkn"; depends=[lattice lme4 Matrix]; };
+influence_ME = derive { name="influence.ME"; version="0.9-6"; sha256="1pfp26dmqs6abb2djf9yn5jk4249vi8ldahpc2xrr0mr3l17g06g"; depends=[lattice lme4 Matrix]; };
 influence_SEM = derive { name="influence.SEM"; version="1.5"; sha256="0h920pxa3sk6y7ipkihxm78i06alm5rmlmn5pr937j7abgypkk3p"; depends=[lavaan]; };
 infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; };
 informR = derive { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; };
@@ -4129,26 +4218,27 @@ interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm
 interferenceCI = derive { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
 intergraph = derive { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
 internetarchive = derive { name="internetarchive"; version="0.1.2"; sha256="08gbkqbzx963c1jy3a540fsd0ff9ylr7la1clwjn46lp4cc4yv1h"; depends=[dplyr httr jsonlite]; };
-interplot = derive { name="interplot"; version="0.1.0.1"; sha256="0a5n4s35v4vxfcynq9dpymc9dfwr0p1zf2974yljgsh5az6iarjk"; depends=[abind arm ggplot2]; };
+interplot = derive { name="interplot"; version="0.1.0.2"; sha256="031zpni88akhdjwrava9xf3k9x7vsldsi3dxjaj5x6q48a6gh19x"; depends=[abind arm ggplot2]; };
 interpretR = derive { name="interpretR"; version="0.2.3"; sha256="1y2j91dm0p6yy9qwkllmlmk8n2b9ics4d40cmq8b0fk3rk61vh59"; depends=[AUC randomForest]; };
 interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
 intervals = derive { name="intervals"; version="0.15.0"; sha256="0lvxaq5ia7hj65n00awz454a2vdxpskxjw45wsakgh0sc60hk8yz"; depends=[]; };
 interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
 intpoint = derive { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; };
 introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; };
-intsvy = derive { name="intsvy"; version="1.6"; sha256="1bv8qap3d8yssfm80ilrn6wg3207hiy34sd92wl64bwpvqyi6i7p"; depends=[foreign ggplot2 memisc plyr reshape]; };
+intsvy = derive { name="intsvy"; version="1.7"; sha256="1q3z8wk809ixnqmhfy4l075km0flsdp3x1m8xqg5ccgwnvdi9igf"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
 invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; };
 investr = derive { name="investr"; version="1.3.0"; sha256="057wq6c5r7hrg1nz7460alsjsk83cvac2d1d4mjjx160q3m0zcvj"; depends=[nlme]; };
 io = derive { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmnnsq3hcs2pyphws6hgdmwwh"; depends=[filenamer stringr]; };
 ionflows = derive { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; };
 iosmooth = derive { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; };
+iotools = derive { name="iotools"; version="0.1-12"; sha256="1b2crnhx84h1gp10sy2mkhi9vylp9z97ld16jijddzlf4v23bmlx"; depends=[]; };
 ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
 ipdw = derive { name="ipdw"; version="0.2-2"; sha256="1mvxs1039hv9m36jhi11qvjysmpmh7ms522q9phwmljv2nnl7ylz"; depends=[gdistance raster sp]; };
 ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; };
 iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; };
-ipred = derive { name="ipred"; version="0.9-4"; sha256="0rig1sj0jqv2rrkgcr6fhr8477wxirxwnwk533l7rn6qr90prjwp"; depends=[class MASS nnet prodlim rpart survival]; };
+ipred = derive { name="ipred"; version="0.9-5"; sha256="193bdx5y4xlb5as5h59lkakrsp9m0xs5faqgrp3c85wfh0bn8iis"; depends=[class MASS nnet prodlim rpart survival]; };
 ips = derive { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
-iptools = derive { name="iptools"; version="0.2.0"; sha256="010vqz8rnaljjk0prcbsx25aqkrr78x32vcbx8589vwlvy10ka0f"; depends=[BH Rcpp]; };
+iptools = derive { name="iptools"; version="0.2.1"; sha256="1754i1pqs18x2as2vlfn6vi6j7q4s6n25k2bizv8h83bc316cjp2"; depends=[BH Rcpp]; };
 iqLearn = derive { name="iqLearn"; version="1.3"; sha256="05f2spnzyqzbbgwz9llf4x5r6fsz5gxa1ckykv6wxg4sirdqccm1"; depends=[]; };
 irace = derive { name="irace"; version="1.06"; sha256="10dizzjds1aszvyh0fn6ahqvgn2x6sg3lwb7rca8zhgphrjg92bl"; depends=[]; };
 irlba = derive { name="irlba"; version="1.0.3"; sha256="1h2ymk9hg9xj2075w715742j23jl7kqa4cgzl1jvr48gcysq5byy"; depends=[Matrix]; };
@@ -4163,7 +4253,7 @@ ismev = derive { name="ismev"; version="1.40"; sha256="1isxgq62q6dk50c3w1l0j4nfg
 isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; };
 isopam = derive { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
 isopat = derive { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
-isotone = derive { name="isotone"; version="1.0-2"; sha256="0qcad691c1dk61a75813hxbc61jllvfc3j21gn85f0kcf4hn6dnz"; depends=[]; };
+isotone = derive { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
 isotonic_pen = derive { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
 isva = derive { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA qvalue]; };
 iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
@@ -4179,7 +4269,7 @@ itsmr = derive { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8
 ivbma = derive { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; };
 ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
 ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm lmtest plyr]; };
-ivmodel = derive { name="ivmodel"; version="1.0"; sha256="14ic49vyikx5fiz2ccjmd53f0vcg3jh3fs6fqhl8w3hm9z9x4qvz"; depends=[Matrix]; };
+ivmodel = derive { name="ivmodel"; version="1.1"; sha256="18hq667ls552vq59dhirx5q9ky252p3cjvkhm3d017bdpi3m1hq5"; depends=[Matrix]; };
 ivpack = derive { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; };
 ivpanel = derive { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
 ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; };
@@ -4188,6 +4278,7 @@ jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0b
 jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
 jagsUI = derive { name="jagsUI"; version="1.3.7"; sha256="1zdrqxzjip4lgf99b4z76gvlhbmh0gcbkpghrlrj3j25wqzgn5y0"; depends=[coda lattice rjags]; };
 james_analysis = derive { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
+jetset = derive { name="jetset"; version="3.1.3"; sha256="1m19p99ghh3rb0kgbwnyg0aaq011xcsrcf0llnbs9j5l2ziwvg4x"; depends=[AnnotationDbi]; };
 jiebaR = derive { name="jiebaR"; version="0.5"; sha256="1x41jqc1ai3v1fn9f65dk7k4g2llf3pk9z3bwqihb95qf80mhd4v"; depends=[jiebaRD Rcpp]; };
 jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
 jmetrik = derive { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
@@ -4202,10 +4293,10 @@ jsonlite = derive { name="jsonlite"; version="0.9.16"; sha256="12whrj9shnf8wd3a5
 jtrans = derive { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
 kSamples = derive { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; };
 kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
-kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[kernlab lpSolve quadprog]; };
+kappalab = derive { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; };
 kaps = derive { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; };
 kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
-kdecopula = derive { name="kdecopula"; version="0.0.2"; sha256="11cg9avdsdrkffbapxm9qskr0xplvs1djzrpk8gp5wknvmlg483z"; depends=[cubature lattice locfit Rcpp RcppArmadillo VineCopula]; };
+kdecopula = derive { name="kdecopula"; version="0.0.3"; sha256="14n8hf1y49582p8dgmw7qj71nl9m75bjgjp7jxirj6azm8nfdx7z"; depends=[cubature lattice locfit Rcpp RcppArmadillo VineCopula]; };
 kdetrees = derive { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
 kedd = derive { name="kedd"; version="1.0.2"; sha256="11mfgjr1pl56y4rcychs8xjgazy3vhg1xasr37fd0g32g7w3lxqg"; depends=[]; };
 kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; };
@@ -4213,18 +4304,18 @@ kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53
 kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
 kergp = derive { name="kergp"; version="0.1.0"; sha256="00p3iziz6kjm1v7rpqa2lls1xgp2w3q754mj1x6bj24kx69xpc7g"; depends=[MASS numDeriv Rcpp testthat]; };
 kernelFactory = derive { name="kernelFactory"; version="0.2.2"; sha256="1ms6732s17vx120xr2l423qmj0h880r522zsgp474pq3fxc0mr48"; depends=[AUC genalg kernlab randomForest]; };
-kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; depends=[]; };
+kernlab = derive { name="kernlab"; version="0.9-22"; sha256="1k0f8kwc3rncdfccqfs42670lkxx53vrcal0jk3nybsyl37jza8x"; depends=[]; };
 keypress = derive { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; };
-kfigr = derive { name="kfigr"; version="1.1.0"; sha256="1mnnd603s741h1vp99q6d8lwvc46k9hmbhylng66wc7a5j6k8psz"; depends=[knitr]; };
+kfigr = derive { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
 kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; };
 kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; };
 kineticF = derive { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
 kinfit = derive { name="kinfit"; version="1.1.14"; sha256="0gb43pghgllb9gzh8jzzpfmc46snv02ln4g3yqsdah3cyqnck0ih"; depends=[]; };
-kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; };
+kinship2 = derive { name="kinship2"; version="1.6.4"; sha256="19r3y5as83nzk922hi4fkpp86gbqxdg1bgng798g1b073bp6m9yj"; depends=[Matrix quadprog]; };
 kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; };
 kissmig = derive { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
 kitagawa = derive { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
-kknn = derive { name="kknn"; version="1.2-5"; sha256="0c1qnn1lnypjybk2p0dpfrg6hzxflzbwmjb5biq45r57bzji7im7"; depends=[igraph Matrix]; };
+kknn = derive { name="kknn"; version="1.3.0"; sha256="17lg3dy5b4vs7g6d83ai9chz94sm6bla9rk42gzyqlf9n341cji4"; depends=[igraph Matrix]; };
 klaR = derive { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[combinat MASS]; };
 klausuR = derive { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
 klin = derive { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; };
@@ -4280,6 +4371,7 @@ lambda_r = derive { name="lambda.r"; version="1.1.7"; sha256="1lxzrwyminc3dfb07p
 lambda_tools = derive { name="lambda.tools"; version="1.0.7"; sha256="1hskmsd51lvfc634r6bb23vfz1vdkpbs9zac3a022cgqvhvnbmxb"; depends=[lambda_r]; };
 landpred = derive { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; };
 landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; };
+landsat8 = derive { name="landsat8"; version="0.1-9"; sha256="027p4cpxnx25m77z0n5kl4rs0zywwskv7ncfky0fldffg7mqaq42"; depends=[rgdal sp]; };
 languageR = derive { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
 lar = derive { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
 lars = derive { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
@@ -4289,8 +4381,8 @@ lassoscore = derive { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47r
 lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
 latdiag = derive { name="latdiag"; version="0.2-1"; sha256="1xjy6as3wjrl2y1lc5fgrbhqqcvrhdan89mpgvk9cpx71wxv95vc"; depends=[]; };
 latentnet = derive { name="latentnet"; version="2.7.1"; sha256="0bjac9cid11pmhmi2gb4h3p4h9m57ngxx7p73a07afmfjk9p7h5m"; depends=[abind coda ergm mvtnorm network sna statnet_common]; };
-latex2exp = derive { name="latex2exp"; version="0.3.1"; sha256="09sk3zs5ip4xm3q7pzhmp7nnwjkwr5x1v4y1afccl6px04qdkd6j"; depends=[magrittr stringr]; };
-lattice = derive { name="lattice"; version="0.20-31"; sha256="1b3m3rg1zd8ssk5jjswk5y93js89vh6939kfajh6i6wphndxigb1"; depends=[]; };
+latex2exp = derive { name="latex2exp"; version="0.3.2"; sha256="1k5np32a71x1yc363dnvnb960j995j3bji8qvlskkfcnzrd3wckg"; depends=[magrittr stringr]; };
+lattice = derive { name="lattice"; version="0.20-33"; sha256="0car12x5vl9k180i9pc86lq3cvwqakdpqn3lgdf98k9n2h52cilg"; depends=[]; };
 latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
 latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[lattice RColorBrewer]; };
 lava = derive { name="lava"; version="1.4.1"; sha256="1xwyfn31nr8sppxy25a7p8yhf5isq4ah0dd45plhfclnlwrycr1l"; depends=[numDeriv]; };
@@ -4301,6 +4393,7 @@ lawn = derive { name="lawn"; version="0.1.0"; sha256="0vv2qmz6a692ammh3jxnpq3b66
 lawstat = derive { name="lawstat"; version="3.0"; sha256="0398bf4jv0gnq54v6m7zl5sixspnvfwc3x3z492i38l215pc38kx"; depends=[Hmisc Kendall mvtnorm VGAM]; };
 lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
 lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; };
+lazyWeave = derive { name="lazyWeave"; version="3.0.0"; sha256="1ic05ph55krmzg34fx1gnp1l0198chj0lpm8pnaml36ng7ashwd9"; depends=[Hmisc]; };
 lazyeval = derive { name="lazyeval"; version="0.1.10"; sha256="02qfpn2fmy78vx4jxr7g7rhqzcm1kcivfwai7lbh0vvpawia0qwh"; depends=[]; };
 lba = derive { name="lba"; version="1.2"; sha256="0zfln5dc4v3yaqgdbg22nq3z2by7jnbbi9mwwwvkr4j1z70knpqg"; depends=[alabama ca MASS plotrix]; };
 lbfgs = derive { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; };
@@ -4323,7 +4416,7 @@ learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0p
 learnstats = derive { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; };
 lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
 leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
-lessR = derive { name="lessR"; version="3.3.1"; sha256="1nwvkxi9q7fsjgrfpa16ry54cyk2ja5cy4cq0xzqya6wn04mbicg"; depends=[car foreign gdata leaps MBESS triangle]; };
+lessR = derive { name="lessR"; version="3.3.3"; sha256="19044vgjhcsgmmxidgbc7r43d7fg4dg5q3qyf3yzza3iy681wgrn"; depends=[car foreign leaps MBESS readxl sas7bdat triangle]; };
 lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
 letsR = derive { name="letsR"; version="2.1"; sha256="0jgc6k2hbpbr7kl42n01mff7pzjz60zd8mchrfhzgd797pwcqlbq"; depends=[fields geosphere maps maptools raster rgdal sp XML]; };
 lfactors = derive { name="lfactors"; version="0.4.0"; sha256="1f4p5mp6m11njrj421vjl5398laicgyg8m04srshfmpi74hf1nb9"; depends=[]; };
@@ -4336,7 +4429,8 @@ lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0
 lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
 lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
 libamtrack = derive { name="libamtrack"; version="0.6.2"; sha256="1wmy3baqbmmzc4w1b3w2z3qvsi61khl6a6rlc22i58gnprmgzrph"; depends=[]; };
-lifecontingencies = derive { name="lifecontingencies"; version="1.1.6"; sha256="07gvq93p2f8s4a43h596xmzifnx1jwnfyg5giqhlfvxnq6wdbvrr"; depends=[markovchain Rcpp]; };
+lifecontingencies = derive { name="lifecontingencies"; version="1.1.9"; sha256="1cl1jv0a9016vpqa5an3fh716hciyk7knbfg4gd7hvixg1y1avgd"; depends=[markovchain Rcpp]; };
+liftr = derive { name="liftr"; version="0.2"; sha256="019q619fy7l81d68bk8pwf4x6073zzvhvngkw636k28mqi9qiphj"; depends=[knitr rmarkdown stringr yaml]; };
 likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
 likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
 likelihoodAsy = derive { name="likelihoodAsy"; version="0.40"; sha256="1zgqs9pcsb45s414kqbhvsb9cxag0imla682981lqvrbli13p2kg"; depends=[alabama cond nleqslv pracma Rsolnp]; };
@@ -4345,7 +4439,7 @@ limSolve = derive { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj
 limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
 linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
 linbin = derive { name="linbin"; version="0.1.0"; sha256="0812m19kfscb0d23rv0llziapd269r7zlm2yq8h3yp8c8jl8gdb1"; depends=[]; };
-lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[class qtl]; };
+lineup = derive { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; };
 linkR = derive { name="linkR"; version="1.0.1"; sha256="0ayscl0i4flh31l5j8730h5lpqi30p8f2l3nvbd3i2mhp54gpcdx"; depends=[svgViewR]; };
 linkcomm = derive { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
 linkim = derive { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
@@ -4361,7 +4455,7 @@ llama = derive { name="llama"; version="0.8.1"; sha256="0pv411kj4n3pi2yg35jzjd4z
 lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; };
 lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; };
 lm_beta = derive { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
-lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp]; };
+lm_br = derive { name="lm.br"; version="2.7"; sha256="09b9f6c7gkkmznypr74f4fdhkkdw7fzpa9gdyx2cl7pj6sg4fvjy"; depends=[Rcpp]; };
 lmSupport = derive { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[AICcmodavg car gvlma lme4 pbkrtest psych]; };
 lme4 = derive { name="lme4"; version="1.1-8"; sha256="0ag9rhdb7q3rsmd8qc7iq88cc0lbmkng2q0pfvdp9cg6lczi0zr0"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
 lmeNB = derive { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
@@ -4369,14 +4463,14 @@ lmeNBBayes = derive { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151x
 lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
 lmeVarComp = derive { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; };
 lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
-lmenssp = derive { name="lmenssp"; version="1.0"; sha256="0a1q9ax0pnz9gcv4nzgay9lznaz9gp27jj6vp6la7vfhrfg5qcg6"; depends=[MASS nlme]; };
-lmerTest = derive { name="lmerTest"; version="2.0-25"; sha256="13psyrll5srxahyk4fhp77fds9mxgnargpv2wxjpy3cv8f5b1vpm"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; };
+lmenssp = derive { name="lmenssp"; version="1.1"; sha256="1s0v5fmzmiq271d3x8l83ni7rl7ikw40mqwhhd2xh21a3nrcdw6l"; depends=[geoR MASS mvtnorm nlme]; };
+lmerTest = derive { name="lmerTest"; version="2.0-29"; sha256="01xx4ddy5qgw4ipj4yvqawz33wg71crw02m6kdg75lh7mizq60fm"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; };
 lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
 lmfor = derive { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[MASS nlme]; };
 lmm = derive { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; };
 lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
 lmmot = derive { name="lmmot"; version="0.1.2"; sha256="1c7cn1g1fl8nwjzm78a8qgw9da170f1q0z5vxl446f167ix5ppkp"; depends=[MASS maxLik]; };
-lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93grwrv9n7vpgp5wp1hj4d1s8c"; depends=[gdata ggplot2 gplots lmeSplines nlme reshape]; };
+lmms = derive { name="lmms"; version="1.3"; sha256="1qmyblvifz7ix04lga6sgpyzyjrf59sxkiyanixmp1zmf50i6ng7"; depends=[gdata ggplot2 gplots gridExtra lmeSplines nlme reshape2]; };
 lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; };
 lmom = derive { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; };
 lmomRFA = derive { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; };
@@ -4386,6 +4480,7 @@ loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy
 localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; };
 localgauss = derive { name="localgauss"; version="0.34"; sha256="04bn777kcxaa5s4zf0r9gclar32y9wpzqnx2rxxhqrxyy419gw37"; depends=[foreach ggplot2 MASS matrixStats]; };
 localsolver = derive { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
+locfdr = derive { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; };
 locfit = derive { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; };
 locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[igraph wavethresh]; };
 locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; };
@@ -4414,13 +4509,14 @@ longitudinalData = derive { name="longitudinalData"; version="2.3"; sha256="0ld2
 longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
 longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[lme4 Matrix nlme]; };
 longurl = derive { name="longurl"; version="0.1.0"; sha256="1iz25m583gmzl8rkrrikydm3a8g67whzxp9lwysrjpnpqsly82vz"; depends=[dplyr httr pbapply]; };
-loo = derive { name="loo"; version="0.1.0"; sha256="1j471ihvqkc4f7l2aaw9k50qg80617njg72wiavbqmw8skp1gs2a"; depends=[matrixStats]; };
+loo = derive { name="loo"; version="0.1.2"; sha256="0gjawzfgv11mzdr3vfg955bxxd56z31jl4pysh3ksihafhvk04y7"; depends=[matrixStats]; };
 loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
 loopr = derive { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
 lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[Hmisc ltm MASS msm mvtnorm polycor rms sfsmisc]; };
 lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
 lpSolve = derive { name="lpSolve"; version="5.6.11"; sha256="0mgpns9wflqaz9ynwxwkvmc1694yhf275wgrqfjfy3qxz1hxq7s0"; depends=[]; };
 lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-14"; sha256="1ffmb9xv6m25ii4n7v576g8xw31qlsxd99ka8cjdhqs7fbr4ng5x"; depends=[]; };
+lpbrim = derive { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; };
 lpc = derive { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
 lpint = derive { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
 lpme = derive { name="lpme"; version="1.0.1"; sha256="0f0xphlxl0ma3s2miadl74cb1l20cikqgk3nc1dg5ml05cqzhyxr"; depends=[Rcpp RcppArmadillo]; };
@@ -4434,7 +4530,8 @@ lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb
 lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
 lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
 lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
-lsmeans = derive { name="lsmeans"; version="2.18"; sha256="1wnpn4hngjcfr44apsw85g3x4wm3ma7msg2n4dnadj0w0zbf0fq4"; depends=[coda estimability multcomp mvtnorm plyr]; };
+lsl = derive { name="lsl"; version="0.5.0"; sha256="1656bv7j1312m2yq9q7dvxqh4z9i9j50pl07spfa6z5waiy3xda6"; depends=[ggplot2 reshape2]; };
+lsmeans = derive { name="lsmeans"; version="2.19"; sha256="1cnzbk25vy1a3arixhcp45fdlgrskpkmf3gd839vmiis97x2a7ji"; depends=[coda estimability multcomp mvtnorm nlme plyr]; };
 lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
 lsr = derive { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
 lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
@@ -4447,6 +4544,7 @@ ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6g
 lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[memoise plyr stringr]; };
 luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; };
 lucid = derive { name="lucid"; version="1.3"; sha256="018vp4xibxr7aanffcvhmppsh7vjsjrqqc41iavyasjbamj3hyck"; depends=[nlme]; };
+lulcc = derive { name="lulcc"; version="1.0.0"; sha256="0a7j08211831hddnngm83lz3a8gr2bq5azadgsdv7cwabg79msk2"; depends=[lattice raster rasterVis ROCR]; };
 lunar = derive { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
 lvm4net = derive { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
 lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; };
@@ -4455,6 +4553,7 @@ m4fe = derive { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1
 mAr = derive { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; };
 mFilter = derive { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; };
 mGSZ = derive { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; };
+mHG = derive { name="mHG"; version="1.0"; sha256="18hj9chp9dy6nmi5w0808nivqbyni117darvdpf03kzq5ym8dlm6"; depends=[]; };
 mQTL = derive { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; };
 mRMRe = derive { name="mRMRe"; version="2.0.5"; sha256="1lhpamjy8dbk3lzjj0wj041cg99rw6925i9fq297c93jxq562414"; depends=[igraph survival]; };
 mRm = derive { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; };
@@ -4472,16 +4571,16 @@ mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslp
 makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
 mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
 managelocalrepo = derive { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
-manifestoR = derive { name="manifestoR"; version="1.0-3"; sha256="0p048ly4rkz08952s6d9cxwvxghba0g5xwx4v04kvjw3p8v9b7cq"; depends=[dplyr functional httr jsonlite NLP psych tm zoo]; };
+manifestoR = derive { name="manifestoR"; version="1.0-4"; sha256="0c908d35hja6fb0wscgpr156nqyw9xj2al3rw6w4dxyy84imdzpf"; depends=[dplyr functional httr jsonlite NLP psych tm zoo]; };
 manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
 mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; };
 mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
-mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; };
+mapdata = derive { name="mapdata"; version="2.2-5"; sha256="0pl4k7lxmyg96h2i8mwdqgwq5ff1v08g54dig5zmqn9wi71y6nl9"; depends=[maps]; };
 mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
-mapmisc = derive { name="mapmisc"; version="1.3.1"; sha256="0ijxy42k5j85mz2pm0g8fs0fliy0pjkfd2jmisfxgrn1h4sz2d3p"; depends=[raster sp]; };
+mapmisc = derive { name="mapmisc"; version="1.3.2"; sha256="1da2mqjwr4fb1gapd575fg2yjidddqqkra2ki9iqlkanh9jn4iwi"; depends=[raster sp]; };
 mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
-mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
-maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; };
+mapproj = derive { name="mapproj"; version="1.2-4"; sha256="1sywwzdikpnkzygb2jx9c67sgrykgbkm39dkf45clz3yylsib2ng"; depends=[maps]; };
+maps = derive { name="maps"; version="2.3-11"; sha256="0752dh646bngw726941p0xd3p9chxlg4mdyns3jc23h68w7da0kc"; depends=[]; };
 maptools = derive { name="maptools"; version="0.8-36"; sha256="0064b9qqv7241298dswv5kkkqf6y2iyn7dhjcyvfkqn4kvc9g2m8"; depends=[foreign lattice sp]; };
 maptpx = derive { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
 maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
@@ -4491,7 +4590,7 @@ marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9p
 markdown = derive { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; };
 marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[coda expm ggplot2 lme4 Matrix numDeriv optimx plyr R2admb Rcpp truncnorm]; };
 markophylo = derive { name="markophylo"; version="1.0.1"; sha256="17lzmjb34ky0y5hjijfxhxnry0b3vrmfs0q9iyd293wngmjs6r0s"; depends=[Rcpp RcppArmadillo]; };
-markovchain = derive { name="markovchain"; version="0.3.1"; sha256="067rib4sxcqq8wwf139x6k4b37caw1wslv0lbss9nzwhv50bxgvd"; depends=[expm igraph matlab Matrix MultinomialCI Rcpp RcppArmadillo RcppParallel]; };
+markovchain = derive { name="markovchain"; version="0.4"; sha256="0pg51inyp9b62dnw3855hvvcn1svapdxc5wfgf2zz9ysyzvcipfy"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
 marl = derive { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
 marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf plotrix raster reshape2 RSQLite shape sp]; };
 marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
@@ -4526,9 +4625,9 @@ mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38
 mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
 mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; };
 mclust = derive { name="mclust"; version="5.0.2"; sha256="1ilhgiigrnvw5l85vk54xdvlirqhp5wb404i0mh2jyzccr9pjml5"; depends=[]; };
-mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; };
+mcmc = derive { name="mcmc"; version="0.9-4"; sha256="1ws80j64df8inzz0a6k8r51wf44zwjnpvp591pxwah2jbi6j6kna"; depends=[]; };
 mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
-mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; };
+mcmcse = derive { name="mcmcse"; version="1.1-1"; sha256="0swbdp444ixg0lda8f0az612573md53vj4xg156zdb612gf8x4dv"; depends=[ellipse Rcpp RcppArmadillo]; };
 mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
 mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 mvtnorm quadprog]; };
 mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
@@ -4543,7 +4642,7 @@ meboot = derive { name="meboot"; version="1.4-6"; sha256="17wjvc375vnya1lhkj10ns
 medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
 mederrRank = derive { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
 medflex = derive { name="medflex"; version="0.5-1"; sha256="0ljqg7bf2zicyc1qbr5d6lvsdppilmsqv6blrdg2vf1zyz3xyfxx"; depends=[boot Matrix multcomp sandwich]; };
-mediation = derive { name="mediation"; version="4.4.4"; sha256="00w4c51v0xvc8pfpxqn73l8r2j12sv1wf5kj3yjq8g08dgzynham"; depends=[Hmisc lpSolve MASS Matrix mvtnorm sandwich]; };
+mediation = derive { name="mediation"; version="4.4.5"; sha256="0jq0gg5ydqvy0vv8m7xk609ljw7p31jppgwgin3y3mvd32wapgk3"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; };
 medicalrisk = derive { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[hash plyr reshape2]; };
 mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; };
 mefa4 = derive { name="mefa4"; version="0.3-1"; sha256="0zyjhq80krnb11wh8p8006qz0znrps3qsd2qnhkw7zwl5282i1zp"; depends=[Matrix]; };
@@ -4581,7 +4680,7 @@ mets = derive { name="mets"; version="1.1.1"; sha256="1myqcds9glsy3fwzr7v711xzk7
 mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
 mfp = derive { name="mfp"; version="1.5.1"; sha256="0flqrvicgks7nxxijhndshpf541drlgqjidm3nql1bg5hnpc5fcq"; depends=[survival]; };
 mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; };
-mgcv = derive { name="mgcv"; version="1.8-6"; sha256="0605cqrbk26zg8s8qdd8kqwq56wihx7r6hfzr4x0xzk4y1g0m2rq"; depends=[Matrix nlme]; };
+mgcv = derive { name="mgcv"; version="1.8-7"; sha256="0c3cdqrfpjxclbw9fhd87d14ms1ibc6c8csbg737axfvlk29mlgy"; depends=[Matrix nlme]; };
 mglmn = derive { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
 mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
 mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
@@ -4596,12 +4695,12 @@ micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwp
 micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; };
 micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
 mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[lattice MASS nnet randomForest Rcpp rpart]; };
-miceadds = derive { name="miceadds"; version="1.2-0"; sha256="01gbkpmmd81v5yhj3jparp7li1jzq91f5zk65dhcd8g3a0k0952m"; depends=[bayesm car foreign inline lme4 MASS MBESS mice mitools multiwayvcov mvtnorm pan pls Rcpp RcppArmadillo sirt sjmisc TAM]; };
+miceadds = derive { name="miceadds"; version="1.3-0"; sha256="0fhx787chl8gnb5p2fnil2z5jdvnjwhfi3lrqhmshb2rilhak2w5"; depends=[bayesm car foreign grouped inline lme4 MASS MBESS mice mitools multiwayvcov mvtnorm pls Rcpp RcppArmadillo sirt sjmisc TAM]; };
 microbenchmark = derive { name="microbenchmark"; version="1.4-2"; sha256="05yxvdnkxr2ll94h6f2m5sn3gg7vrlm9nbdxgmj2g8cp8gfxpfkg"; depends=[ggplot2]; };
 micromap = derive { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
 micromapST = derive { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; };
 micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; };
-midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3ch7nf5b8p90iywp8qkaav5r8rcdy"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
+midasr = derive { name="midasr"; version="0.5"; sha256="1w3rxsxkcjy30sjxv4cxvqzfw7k278s6mrrjm4pbz7cydbiws2vp"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
 migest = derive { name="migest"; version="1.7"; sha256="13yzdkikxy0mq60zjbc4wq69ja7dps10bwxzsp8v3awr1r75zpaz"; depends=[]; };
 migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
 migui = derive { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; };
@@ -4616,7 +4715,7 @@ minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3d
 minqa = derive { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; };
 minque = derive { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
 minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
-mipfp = derive { name="mipfp"; version="2.0"; sha256="1sh33lgvq31nk8vkl9p195v4z3whv2c1fc7bnhc8wxgglm6vc126"; depends=[cmm numDeriv Rsolnp]; };
+mipfp = derive { name="mipfp"; version="2.2"; sha256="02jy32kbrfjb38q1jwm07yp0irsbq5hk3r3bsqrvwm6vlg6rxalz"; depends=[cmm numDeriv Rsolnp]; };
 mirt = derive { name="mirt"; version="1.10"; sha256="0bylba0z8g9kx3idfpzf3qbw7pgjvpd8d1vx930nr02vhv3c3cms"; depends=[GPArotation lattice mgcv numDeriv Rcpp sfsmisc]; };
 mirtCAT = derive { name="mirtCAT"; version="0.5"; sha256="0lv4dxpby3izmh3avl70i0iiaj8rz1fpb666cwga5590ks7rq4lr"; depends=[lattice markdown mirt Rcpp RcppArmadillo shiny]; };
 misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
@@ -4629,20 +4728,19 @@ missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfka
 missMDA = derive { name="missMDA"; version="1.8.2"; sha256="0rb48psaffvlp3i2d1xv9fk949gpnck85v4ysfzw203r2r4rdhmm"; depends=[FactoMineR]; };
 mistat = derive { name="mistat"; version="1.0-3"; sha256="12fykqkcqfxn8m8wwpw69f7h2f24c5yhg4fw50jsifhcj40kk29q"; depends=[]; };
 mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; };
-mitml = derive { name="mitml"; version="0.2-2"; sha256="11pgwa1cxf1i2qkm8gyzxsjkhg40r75gk2k1lwaqpqgi7vs3drbs"; depends=[haven pan]; };
+mitml = derive { name="mitml"; version="0.2-3"; sha256="063nc32sgzg2q85fbxmxqch7yyf0fhl8rng83mnqbr9fjy1gxdnm"; depends=[haven pan]; };
 mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
 mix = derive { name="mix"; version="1.0-9"; sha256="08729y6ih3yixcc4a6m8fszg6pjc0s02iq47339b9gj16p82b74z"; depends=[]; };
-mixAK = derive { name="mixAK"; version="4.0-5"; sha256="1kdcia6j2dw4q1rbrswx9h8ivzrnw8hrg5a206jykmsdbngbifx5"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
-mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[igraph lattice MASS pheatmap RGCCA rgl]; };
-mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[lattice survival]; };
+mixAK = derive { name="mixAK"; version="4.2"; sha256="0z96ddlvkpr4y2chi929ik81snsr0f03a0k4cnh0q1lx0lr51p1z"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
+mixOmics = derive { name="mixOmics"; version="5.1.1"; sha256="1kkpww3x782h3zklfspzc8dkr40qnk4wrp0yqkx803svynsdr83a"; depends=[ellipse ggplot2 igraph lattice MASS pheatmap rgl]; };
+mixPHM = derive { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
 mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
 mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
 mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
 mixedMem = derive { name="mixedMem"; version="1.0.2"; sha256="1nlnlww2xbmlifcp9l293041csnh38hvr686sczyqpb7c5jf39g3"; depends=[BH gtools Rcpp RcppArmadillo]; };
 mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; };
 mixexp = derive { name="mixexp"; version="1.2.1"; sha256="0yjsngr2akj2hhl1hav2kkp8w0g4775qvnbzypa3c1fmx8kf1xvw"; depends=[daewr gdata lattice]; };
-mixlm = derive { name="mixlm"; version="1.0.8.5"; sha256="1xbkh6aaw4j57vkn6ng7i5wkpz2clhvj3sx0mhfmpwhg13rpdkaj"; depends=[car leaps lme4 multcomp pls pracma]; };
-mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; };
+mixlm = derive { name="mixlm"; version="1.0.9.2"; sha256="1rh2sj5h9h4rmv7vqa87jbbln1mz6h0hb3gv3g99zcmazbd18k75"; depends=[car leaps lme4 multcomp pls pracma]; };
 mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88iz4nkv7sykxaygjq7zfcdrdivxz6n"; depends=[]; };
 mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
 mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
@@ -4653,13 +4751,13 @@ mixtox = derive { name="mixtox"; version="1.0"; sha256="059vjrz9isyrdqk2ij4b11da
 mixture = derive { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; };
 mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; };
 mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
-mkin = derive { name="mkin"; version="0.9-39"; sha256="14yya9fkslk9vplszdxxfa2q1di42nnly67irpl5ry4sgl21nnfp"; depends=[deSolve FME inline minpack_lm rootSolve]; };
+mkin = derive { name="mkin"; version="0.9-40"; sha256="0k037pp7rvwwhmciz4h723hqizw4iajamqvwxqza4sh4b2d3pcrw"; depends=[deSolve FME inline minpack_lm rootSolve]; };
 mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
 mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; };
 mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
 mlVAR = derive { name="mlVAR"; version="0.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[arm lme4 plyr qgraph]; };
 mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
-mldr = derive { name="mldr"; version="0.2.25"; sha256="0rwh7gs5qw08x1bx03156qf8bav3yacwi0vzz4yk722gd0wzi88j"; depends=[circlize shiny XML]; };
+mldr = derive { name="mldr"; version="0.2.33"; sha256="0an9kh2gangcwm7csp9k4shjrn2fpr82g7ni5144l5k3lkvza3xh"; depends=[circlize shiny XML]; };
 mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
 mlegp = derive { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; };
 mleur = derive { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
@@ -4681,13 +4779,13 @@ mmeln = derive { name="mmeln"; version="1.1"; sha256="06bxp157cdab6ghx3yrsn8l2gi
 mmeta = derive { name="mmeta"; version="2.2"; sha256="06zkazi97f3il2vlx4f8c7zz4kxs9ylhscd06j31h504c1w96ddf"; depends=[aod HI]; };
 mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
 mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
-mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxankjp0k34zfnw8q02ahzwd26ds0z7"; depends=[adegenet pegas]; };
+mmod = derive { name="mmod"; version="1.3.0"; sha256="1rcvqvqmpl5ks1pwb0z2iq3ng2x7fhsihyihnwx05k5pkhyrfsj5"; depends=[adegenet pegas]; };
 mmpp = derive { name="mmpp"; version="0.1"; sha256="1m2079vz4h3h90ikh268jwh20ink5n1mri8n7aj50xkfspmwsmpg"; depends=[]; };
 mmtfa = derive { name="mmtfa"; version="0.1"; sha256="113bpcb05i78y78byrdn9j45dfcar7q8z7qmlid8cl6b8cjv1vfz"; depends=[matrixStats mvnfast]; };
 mnlogit = derive { name="mnlogit"; version="1.2.2"; sha256="01wvlmkf9ddcmsb8pw08j05r7kfn8zr76zaaa3mv92h967v79grp"; depends=[Formula lmtest mlogit]; };
 mnormpow = derive { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
 mnormt = derive { name="mnormt"; version="1.5-3"; sha256="1mw5fk4q5cnj2x2938di58179fr51l396qd61i6y5vwmcccj0kn9"; depends=[]; };
-modMax = derive { name="modMax"; version="1.0"; sha256="0p8vnlbw53lqbaq3819jhixq6ns2lwxf56w2md7y98rshf92h474"; depends=[gtools igraph]; };
+modMax = derive { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; };
 modQR = derive { name="modQR"; version="0.1.0"; sha256="0k9rqwi0amq8cln1a6i58xb19cpkjq0qca4vsgq1r2x1370hf9fq"; depends=[geometry lpSolve]; };
 modTempEff = derive { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
 modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; };
@@ -4698,13 +4796,15 @@ modeltools = derive { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv
 modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
 moduleColor = derive { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
 mokken = derive { name="mokken"; version="2.7.7"; sha256="1v0khh1bb2h7j2x54mdw8vqlimhw25r2ps89hw4l88qfaz05ir77"; depends=[poLCA]; };
-mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dpnps7w0ld35lav19ff86kccspw1rg"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
+mombf = derive { name="mombf"; version="1.6.0"; sha256="10bik14x322mcw1yx74haizxm5sx50ll6fz35fx16j8g7fy2k17f"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
 momentchi2 = derive { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; };
 moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
+momr = derive { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
 mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
-mongolite = derive { name="mongolite"; version="0.4"; sha256="0jrjf9sh8y7n4lgy54y5pl9dw6z4c5qb903l0907finm749cb2w1"; depends=[jsonlite]; };
+mongolite = derive { name="mongolite"; version="0.5"; sha256="1rd8q5asa24q8c14swd88rq02bqvvkp63sssdlmrcj736fjr4a4x"; depends=[jsonlite]; };
 monitoR = derive { name="monitoR"; version="1.0.3"; sha256="0g2dhyz3411pa6kcsmmi9x77ygvdrvas3k9ps0w2r69mfab785c6"; depends=[tuneR]; };
-monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; };
+monmlp = derive { name="monmlp"; version="1.1.3"; sha256="1f42d8j6jxz8x3yy02ppimbza3b3dn8402373qhj4yizrfk9wkz9"; depends=[]; };
+monogeneaGM = derive { name="monogeneaGM"; version="1.0"; sha256="10rnc3ipnf8j85kfgfssmdd9578mnx74694r5jsrj2yvbvzm67vq"; depends=[ape circular cluster geomorph gplots phytools rgl]; };
 monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[lars MASS pls]; };
 monreg = derive { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
 moonBook = derive { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; };
@@ -4722,7 +4822,7 @@ move = derive { name="move"; version="1.5.514"; sha256="18rf9d0xxs48l0bk9vvr2sxn
 mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[Rcpp RcppArmadillo svd]; };
 mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata qtl seriation wgaim]; };
 mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
-mpath = derive { name="mpath"; version="0.1-18"; sha256="04d6lbsqjmr6pkyfpr2vw3rhv5hi044rx1n1isgw96j2c0f7dgzv"; depends=[glmnet MASS numDeriv pscl]; };
+mpath = derive { name="mpath"; version="0.1-19"; sha256="12w6ihr1ggr877agj0jlbsspmikjvp7xpvvn8xa4mav3vcrccyhc"; depends=[glmnet MASS numDeriv pscl]; };
 mpcv = derive { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; };
 mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; };
 mplot = derive { name="mplot"; version="0.6.2"; sha256="0lnslv471abhfr245wx24ps3c97qs54i43ybpc1f8mqsxh0vxz3s"; depends=[bestglm doParallel foreach googleVis leaps plyr shiny shinydashboard]; };
@@ -4734,8 +4834,9 @@ mppa = derive { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrc
 mpt = derive { name="mpt"; version="0.5-1"; sha256="1b6n7kivkj4ndcc27jmznx9dh40kvjjk7hfxh21kmnknl5ap4ffb"; depends=[]; };
 mra = derive { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; };
 mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
-mrds = derive { name="mrds"; version="2.1.12"; sha256="1v7lv3ssg9m8bx2gskzf31lkg3sxsdkvknrdx9aawdh3mzxwcys7"; depends=[mgcv optimx Rsolnp]; };
+mrds = derive { name="mrds"; version="2.1.14"; sha256="0lvr9zqyi45a100w31k228b03plna24rzgamsvfa34inyd8q4y9m"; depends=[mgcv numDeriv optimx Rsolnp]; };
 mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
+mri = derive { name="mri"; version="0.1.1"; sha256="07lqr9fv0nqd626jpqa6x1qxf85r1j4r5brv760dll1p2kl060gw"; depends=[]; };
 mritc = derive { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; };
 msBP = derive { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0ny1r49kaj3i04fspi3was2md2qbzd"; depends=[DPpackage]; };
 msSurv = derive { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; };
@@ -4754,11 +4855,12 @@ msr = derive { name="msr"; version="0.4.1"; sha256="1kfj6xq7l32ligc53akiym3s9if8
 mstate = derive { name="mstate"; version="0.2.7"; sha256="0rys25cwr814k8z65206s12yv18dala66b3nlfq882dw5cfpaybl"; depends=[RColorBrewer survival]; };
 mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; };
 mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
+muRL = derive { name="muRL"; version="0.1-10"; sha256="0411vqijsida63jq63qwflr6lvv0rr777z0xba6pn0gpi6khjqqz"; depends=[maps]; };
 muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
 muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
 muir = derive { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
-multcomp = derive { name="multcomp"; version="1.4-0"; sha256="1n1qbg7amk385ryni97qdbzcinpwpxldl3r477r1kfgv8csynxhj"; depends=[codetools mvtnorm sandwich survival TH_data]; };
-multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; };
+multcomp = derive { name="multcomp"; version="1.4-1"; sha256="07zvpdiphn9ndvhvblnd2li2a70j8igscd685s5mslbx5rqppv3k"; depends=[codetools mvtnorm sandwich survival TH_data]; };
+multcompView = derive { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; };
 multgee = derive { name="multgee"; version="1.5.1"; sha256="1ycbbri26hahbi3q4mrsyhrh9bwj89dyv6gvrpx58ghrlsnakjy1"; depends=[gnm VGAM]; };
 multiAssetOptions = derive { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
 multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 MASS misc3d pcaMethods RColorBrewer]; };
@@ -4771,7 +4873,7 @@ multicool = derive { name="multicool"; version="0.1-6"; sha256="0hzwxrcsz7dm4ilv
 multigroup = derive { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
 multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[MASS nlme]; };
 multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 party plyr proto PSAgraphics psych reshape xtable]; };
-multimark = derive { name="multimark"; version="1.2.0"; sha256="0gc8dla4npgf1g17k7cqphkm82lywh12zvc82ga5446w3ihpvllg"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; };
+multimark = derive { name="multimark"; version="1.3.0"; sha256="0dw5s1znv83hs5m1d8721n35cabml0s2a26zgc8x0ngnf3zkspny"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; };
 multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
 multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
 multipleNCC = derive { name="multipleNCC"; version="1.1"; sha256="134a8zm0xz2h9yclc9v2linx881gb3n5x51msifpnm641giamzfd"; depends=[mgcv survival]; };
@@ -4789,19 +4891,20 @@ multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4z
 muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; };
 munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb4x538sbczrblb70a3ysxf4q8c1ihmly9"; depends=[MASS memisc]; };
 munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; };
+munsellinterpol = derive { name="munsellinterpol"; version="1.0.2"; sha256="1c4m9fhggczy3wk51m8qxiahkic1f1lq3r8b0x0mk34pd5wap48a"; depends=[geometry]; };
 musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; };
 mutoss = derive { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; };
 mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
 mvMORPH = derive { name="mvMORPH"; version="1.0.5"; sha256="184ywvgi2dz77ivl2g7spx065wh1ap2lpmvbrhik9sgysygkijs2"; depends=[ape corpcor phytools spam subplex]; };
 mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
-mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
+mvSLOUCH = derive { name="mvSLOUCH"; version="1.2"; sha256="0hr31j8gppg5mfifvlmv962bc06s21byyy3gz0pkary15pzy5xg8"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
 mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
 mvabund = derive { name="mvabund"; version="3.10.4"; sha256="1hza09nghgz0iyfayqabf5d0yb6zqnvhwmprif6y9qix8jscilwl"; depends=[MASS Rcpp statmod tweedie]; };
 mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
 mvc = derive { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
 mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula MNM nlme quantreg Rfit]; };
 mvcwt = derive { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
-mvglmmRank = derive { name="mvglmmRank"; version="1.0-2"; sha256="0gpp0ibgji86pxscqzcws0d1qn1ciqqvyfb0x2v18580r4cx8jv7"; depends=[Matrix numDeriv]; };
+mvglmmRank = derive { name="mvglmmRank"; version="1.1-1"; sha256="1n02bhpljvpfiycnmyw18dxp6pvll5014vl58n9hrdkccmhkm6jm"; depends=[Matrix numDeriv]; };
 mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; };
 mvmesh = derive { name="mvmesh"; version="1.0"; sha256="168s3n3ibiwdk0wys4kjj1xdpkz891rq5dv3lqf4pil83kbw8jw9"; depends=[rcdd rgl]; };
 mvmeta = derive { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; };
@@ -4815,13 +4918,14 @@ mvoutlier = derive { name="mvoutlier"; version="2.0.6"; sha256="00kim5i8xdbaqc0l
 mvprpb = derive { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; };
 mvrtn = derive { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; };
 mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; };
+mvtboost = derive { name="mvtboost"; version="0.2.1"; sha256="02gankqhcidgii99qqdrw8y9d923d0yphln162rd0x72axn91cz2"; depends=[gbm RColorBrewer]; };
 mvtmeta = derive { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
-mvtnorm = derive { name="mvtnorm"; version="1.0-2"; sha256="0v4a05i92g70vf8xkh6as7566zgjcnpzr1ghhyszqk1f0maw9gxc"; depends=[]; };
+mvtnorm = derive { name="mvtnorm"; version="1.0-3"; sha256="107p5s3vvwfx51r1wsy8214y3ci00dl7l4jymk702w9mxsb3nc7i"; depends=[]; };
 mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
 mwa = derive { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
 mwaved = derive { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny]; };
 mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-myTAI = derive { name="myTAI"; version="0.1.0"; sha256="0qz2mm3ca5i93kz3pg8llpniix3vdy7mxz1n8k36iap09rbsrgmi"; depends=[doParallel dplyr fitdistrplus foreach nortest Rcpp]; };
+myTAI = derive { name="myTAI"; version="0.3.0"; sha256="0j0wdc7p98h14l51f0mgl6k7ns8fb93y12z7mjik4dpakzsanl68"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 nortest RColorBrewer Rcpp reshape2 taxize]; };
 mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
 mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; };
 myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
@@ -4832,7 +4936,7 @@ nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w
 nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
 nLTT = derive { name="nLTT"; version="1.1"; sha256="0hrrwil7vcym7zjbnzviw13p60y14w660vndvc2lm5lmhbb8nhcn"; depends=[ape coda deSolve]; };
 nabor = derive { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[BH Rcpp RcppEigen]; };
-nadiv = derive { name="nadiv"; version="2.14.0"; sha256="07wrzj5vkz7hgxmlpl4d39crs5bz1xylpq0w13r5w95rwnmn6jzm"; depends=[Matrix]; };
+nadiv = derive { name="nadiv"; version="2.14.1"; sha256="1k94shkcdylaqm2j7yp23nx0c7c6n0a9im3afmfkws2ax6bf2yjf"; depends=[Matrix]; };
 namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
 nanop = derive { name="nanop"; version="2.0-5"; sha256="0zdn2hgp516hcqpc2w2vzhhalcr05dlw539zj3afzi75w8rwb71z"; depends=[distrEx rgl]; };
 nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
@@ -4841,9 +4945,9 @@ nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3
 nat_templatebrains = derive { name="nat.templatebrains"; version="0.6"; sha256="1qhkpvfpzyzf9qcfdc2a53fqhlxqcrvbb08glwkxmjs49is3fy3k"; depends=[digest igraph nat rappdirs rgl]; };
 nat_utils = derive { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; };
 naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
-nbconvertR = derive { name="nbconvertR"; version="1.0.1"; sha256="1wj8kj7zs6ldy5jc1dh7r637hyllnqk4qns5q767s72zj35kq6s4"; depends=[]; };
+nbconvertR = derive { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
 nbpMatching = derive { name="nbpMatching"; version="1.4.5"; sha256="1bglrzhap9rar6c8c2c5009l1ljq44mys66jpafw4xyw2pq7djqg"; depends=[Hmisc MASS]; };
-ncappc = derive { name="ncappc"; version="0.1"; sha256="1145y9k718245mzs8q33mjwcln79dmiyawy771zrk3kpxhfb5985"; depends=[ggplot2 gridExtra gtable knitr lattice PerformanceAnalytics reshape2 scales xtable]; };
+ncappc = derive { name="ncappc"; version="0.2"; sha256="0s1yx1bnahq5a5lryf23rzd8cyvk1q1psqkl9x5nr71by0j9jbs6"; depends=[ggplot2 gridExtra gtable knitr reshape2 scales testthat xtable]; };
 ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
 ncdf = derive { name="ncdf"; version="1.6.8"; sha256="1vrbrrqij7p712wfrki09749yryzr9lg4p95yqvb0zzggqpw2snm"; depends=[]; };
 ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
@@ -4858,7 +4962,7 @@ neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y
 needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
 negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; };
 neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
-neotoma = derive { name="neotoma"; version="1.3.0"; sha256="0a5fmas441zl479vfndgyhanp5iivzdp5zqrpnr3pvgf3wfdnppd"; depends=[plyr RCurl reshape2 RJSONIO]; };
+neotoma = derive { name="neotoma"; version="1.3.2"; sha256="0c62bawr2zw937ics45hvs8dicjzrhsjk0mf8kxx3h1cw42q9ayb"; depends=[plyr RCurl reshape2 RJSONIO]; };
 nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
 nestedRanksTest = derive { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
 netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[AnnotationDbi graph igraph kernlab Matrix ROCR samr]; };
@@ -4870,7 +4974,7 @@ nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq
 nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; };
 netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[Biobase BiocGenerics igraph limma]; };
 network = derive { name="network"; version="1.12.0"; sha256="04n634ia6m86zkmjdla8v6j4x11kdrx72gaj4am7iwv1ha14nfks"; depends=[]; };
-networkD3 = derive { name="networkD3"; version="0.1.7"; sha256="08jazv4mf2h4jdwrlpjr6k1dfcj99rs3nabgqw7x8pi3zb9l6m99"; depends=[htmlwidgets plyr rjson]; };
+networkD3 = derive { name="networkD3"; version="0.1.8"; sha256="1hn52x4dwc6mizyqxjk4id6xai8bx5zp100b05hmjpd3q73mq97h"; depends=[htmlwidgets plyr rjson]; };
 networkDynamic = derive { name="networkDynamic"; version="0.7.1"; sha256="0iv4lyfxmjllxk0cx09gdrg7zf2myf57wd3a2gqymids5gvpsy2d"; depends=[network statnet_common]; };
 networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[network networkDynamic]; };
 networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
@@ -4898,9 +5002,9 @@ nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrb
 nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; };
 nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
 nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; };
-nlsem = derive { name="nlsem"; version="0.3"; sha256="1lpp6f6nby1rzxv7hrqnm4qbwj406g9ls9jmidb8rqgy177sk4w6"; depends=[gaussquad mvtnorm nlme]; };
+nlsem = derive { name="nlsem"; version="0.4.1"; sha256="11i1dma87bx55dhqb8j9ccc7cg3qc9ppmg6g0a61xdkw2nlg42vm"; depends=[gaussquad mvtnorm nlme]; };
 nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
-nlstools = derive { name="nlstools"; version="1.0-1"; sha256="00m2x587gvrbgs7wdkz2n54ylp0rnrs76rb6xmi3pf9xlbmnplr2"; depends=[]; };
+nlstools = derive { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; };
 nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; };
 nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[acepack locfit]; };
 nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; };
@@ -4912,19 +5016,20 @@ nodiv = derive { name="nodiv"; version="1.1.0"; sha256="16c7xm46jnzcsd5gyj72krjy
 noia = derive { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
 nomclust = derive { name="nomclust"; version="0.91.1010"; sha256="02jpzcjclm22bjg59wj4490vh2rp9ma1vqxdnwmppyb478558fz1"; depends=[cluster dummies]; };
 noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
-nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.2"; sha256="1p78a9nqn53v9r885p4lg47vqlryw7335pxrid191xqabxxs3ba7"; depends=[Matrix Rcpp rgl TSA tseries]; };
+nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; };
 nonnest2 = derive { name="nonnest2"; version="0.2"; sha256="0z2ihnhphf6c9cklj1l81kqgyz1h9wl2ziwx7s0ssn3dfgw4fnp7"; depends=[CompQuadForm mvtnorm sandwich]; };
 nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; };
 nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
 nontarget = derive { name="nontarget"; version="1.7"; sha256="1hnqkb8bpp89y42gjrfh7m3lxhif9dyhcmr6yfss8x3lzf018gk2"; depends=[enviPat mgcv nontargetData]; };
 nontargetData = derive { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; };
 nopp = derive { name="nopp"; version="1.0.4"; sha256="00wn0pnqpy9xll0aa8ah45ldgk1ziw464x8zkc8iq4l2a22lgn4v"; depends=[mlogit]; };
-nor1mix = derive { name="nor1mix"; version="1.2-0"; sha256="1s92bwpwq9p0d06adclm43yqq0k7ifv8lknn1scxg8nj4g03qjhs"; depends=[]; };
+nor1mix = derive { name="nor1mix"; version="1.2-1"; sha256="1sh7373w8z1mqkk8wvwzxab57pg1s3wcs6y6sx0sng7pf429x2m3"; depends=[]; };
+nordklimdata1 = derive { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; };
 norm = derive { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; };
 normalp = derive { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; };
 normtest = derive { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
 normwhn_test = derive { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
-nortest = derive { name="nortest"; version="1.0-3"; sha256="0kih1r703hjw2vha2hx13vm3fvbyra7v229khgv3hxxfppb7jis8"; depends=[]; };
+nortest = derive { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; };
 nose = derive { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; };
 notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
 novelist = derive { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
@@ -4933,11 +5038,11 @@ np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6
 npIntFactRep = derive { name="npIntFactRep"; version="1.2"; sha256="0fx5923wdzz6122bbyil5imwbhgwlm50wcrscy78qdx8n4n07rv8"; depends=[ez plyr]; };
 nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
 nparcomp = derive { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; };
-npbr = derive { name="npbr"; version="1.1"; sha256="011zmz1s6kkdgylkl6dc79dpardgpc5dlh6g6y2l84hgax1rbdl6"; depends=[Benchmarking np quadprog Rglpk]; };
-npcp = derive { name="npcp"; version="0.1-1"; sha256="0b2mqx0zrvai5aw6b47qpi4bwcfjrv0bh8ahrgx7n1sf045grm3a"; depends=[]; };
+npbr = derive { name="npbr"; version="1.2"; sha256="0l6r9cwrhbi37p8prrjcli7rpvlxgzma2m1wqck5y97wx1fnh4h3"; depends=[Benchmarking np quadprog Rglpk]; };
+npcp = derive { name="npcp"; version="0.1-6"; sha256="1ki9q49nyw21c6x3iwpd8aa152jc30idl0xx8f803j72yl21j47c"; depends=[]; };
 npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
 nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
-nplr = derive { name="nplr"; version="0.1-2"; sha256="1xs02i14kgggf1gfs612l2jk37z60dxqgrxs6rswzchvlyzwcxd0"; depends=[]; };
+nplr = derive { name="nplr"; version="0.1-4"; sha256="03yq8f2bfdyi21d8kqcca0byjrw9a7pgp0c6fwpk1lnniaabzn2d"; depends=[]; };
 npmlreg = derive { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; };
 npmv = derive { name="npmv"; version="2.2"; sha256="1aqlx1y3bxbqp13q0vajwffj8srb6s04d5r2h08m9fk5hhp9l3jf"; depends=[Formula]; };
 nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
@@ -4952,13 +5057,13 @@ nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd
 nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[dplyr fpc ggplot2 MASS moments plyr]; };
 numDeriv = derive { name="numDeriv"; version="2014.2-1"; sha256="114wd0hwn2mwlyh84hh3yd2bvcy63f166ihbpnp6xn6fqp019skd"; depends=[]; };
 numOSL = derive { name="numOSL"; version="1.8"; sha256="0md55gfxjvdmjy4hy58wp11c788xy7kq9wl32m1r76ja6g03wwbl"; depends=[]; };
-numbers = derive { name="numbers"; version="0.5-6"; sha256="17v7by1gvqg2mdm5vrmf05kfrbvc2yz8ldb7bd0lrhcyrm5bbbwa"; depends=[gmp]; };
+numbers = derive { name="numbers"; version="0.6-1"; sha256="1mqcps33az5a7vd2czx7nll87yciwmxngnilf16iz4yf9p59gny5"; depends=[]; };
 nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; };
 nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
 nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
 nws = derive { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
 nycflights13 = derive { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; };
-oapackage = derive { name="oapackage"; version="2.0.22"; sha256="0qskkzb4xlxz2qkxapcckxfwc5fv0s80kbndsvzcy3pqjzrykvys"; depends=[RcppEigen]; };
+oapackage = derive { name="oapackage"; version="2.0.23"; sha256="1kkwxwgb23i4m8dlh1ybskardwf8ql0m18cv9c5zi1qd2vkk5dx0"; depends=[RcppEigen]; };
 oaxaca = derive { name="oaxaca"; version="0.1.2"; sha256="1ghdrpjp2p4nlwskvs8n8d8ixzf3cdq9k9q49zvq8ag0dhwyswzd"; depends=[Formula ggplot2 reshape2]; };
 objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; };
 objectSignals = derive { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
@@ -4977,7 +5082,7 @@ odeintr = derive { name="odeintr"; version="1.3"; sha256="12y5hr6f7bj3aqj4gd0hlj
 odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
 odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
 oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp RcppArmadillo]; };
-oglmx = derive { name="oglmx"; version="1.0.2"; sha256="1yln1ysk19mxnb0aq74xgqj0qqipqg3qbczyhdygakjd4v4ndvhg"; depends=[maxLik]; };
+oglmx = derive { name="oglmx"; version="1.0.3"; sha256="01r0j7d2l4pf61x2q4pa6pnkv2yzsk2jb62cvh0jz2rhkpvqjniq"; depends=[maxLik]; };
 okmesonet = derive { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
 omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
 oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
@@ -4988,14 +5093,14 @@ onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89r
 opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; };
 openNLP = derive { name="openNLP"; version="0.2-5"; sha256="0jc4ii6zsj0pf6nlx3l0db18p6whp047gzvc7q0dbwpa8q4il2mb"; depends=[NLP openNLPdata rJava]; };
 openNLPdata = derive { name="openNLPdata"; version="1.5.3-2"; sha256="1472gg651cdd5d9xjxrzl3k7np77liqnh6ysv1kjrf4sfx13pp9q"; depends=[rJava]; };
-openair = derive { name="openair"; version="1.5"; sha256="0swhaldfhz6zgs50aws18kypilv15k7w99nqcmb7y0wgvkkwda2h"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; };
+openair = derive { name="openair"; version="1.6"; sha256="0pmwibwhi44zd4yr6vaqgfa9sz7b60w3aqr8j1pn5cxqnzznwfp9"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; };
 opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl]; };
 openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
 openssl = derive { name="openssl"; version="0.4"; sha256="1gfhzxjjssid2z8xmw3vnnd4gj2f6a3zzazkhpg9b1ymmcp9b288"; depends=[]; };
 opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
 openxlsx = derive { name="openxlsx"; version="3.0.0"; sha256="1vx5qmhlyrlwrswbhd95jjcsldcdpdp7gs341dmham26sdzdx658"; depends=[Rcpp]; };
 operator_tools = derive { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; };
-operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; };
+operators = derive { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; };
 ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
 optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
 optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; };
@@ -5008,7 +5113,7 @@ optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5b
 optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; };
 optimx = derive { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[BB dfoptim minqa numDeriv Rcgmin Rvmmin setRNG svUnit ucminf]; };
 optiscale = derive { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
-optmatch = derive { name="optmatch"; version="0.9-3"; sha256="16mhrhdpyqrj1g24mwc3fl0qyqq1kna8z6cj239fpbjhqb1mirjb"; depends=[digest]; };
+optmatch = derive { name="optmatch"; version="0.9-5"; sha256="1dgsxd6w2fgy07yzihbrg30ya0lmy146m70cfaaxr6pnr8d0rszr"; depends=[digest Rcpp RItools survival]; };
 optparse = derive { name="optparse"; version="1.3.0"; sha256="02sy28imvssr49pngdbg9qbx1h1fyjl11j7nql55m10a7cdzhwd4"; depends=[getopt]; };
 optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c37grx9g20dld2f26g0xzbj16wz7whgp02"; depends=[cluster labdsv MASS plotrix]; };
 optrees = derive { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
@@ -5025,7 +5130,7 @@ orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8
 ordinal = derive { name="ordinal"; version="2015.6-28"; sha256="0lckjzjq2k8rlibrjf5s0ccf17vcvns5pgzvjjnl3wibr2ff4czs"; depends=[MASS Matrix ucminf]; };
 ordinalCont = derive { name="ordinalCont"; version="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[boot fastGHQuad ucminf]; };
 ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; };
-ore = derive { name="ore"; version="1.1.0"; sha256="1khgjd5fl8vi9n9pj4nbai6fbfbiwzc121a0gf7dfk727iid8whq"; depends=[]; };
+ore = derive { name="ore"; version="1.2.0"; sha256="1q7jvbpjwx56h62hpi0lh0b154hcdzb6d5x1ic69mam7ml4lza80"; depends=[]; };
 orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
 orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
 orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; };
@@ -5038,7 +5143,7 @@ orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.6";
 orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
 osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
 osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; };
-ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; };
+ouch = derive { name="ouch"; version="2.9-2"; sha256="05c3bdxpjcgmimk0zl9744f0gmchhpm7myzjrx5fhpbp5h6jayaf"; depends=[subplex]; };
 outbreaker = derive { name="outbreaker"; version="1.1-5"; sha256="1k39pzqbjah4dwwjyaccb13c1aww8i4kdfjanxc4hzkl8av7s8db"; depends=[adegenet ape igraph]; };
 outliers = derive { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
 overlap = derive { name="overlap"; version="0.2.4"; sha256="1pp3fggkbhif52i5lpihy7syhq2qp56mjvsxgbgwlcfbzy27ph1c"; depends=[]; };
@@ -5057,9 +5162,11 @@ pack = derive { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwh
 packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; };
 packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; };
 packS4 = derive { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; };
+packcircles = derive { name="packcircles"; version="0.1.1"; sha256="0xvw283gyjak3j66g8x5jy2jdrkcxwhfzck2wdq2q6a6nxbyb0i1"; depends=[Rcpp]; };
 packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; };
 packrat = derive { name="packrat"; version="0.4.4"; sha256="1yxcj9jc1cswimirnxxzir1ac0xva57w57365k8406a8dwx1v650"; depends=[]; };
 pacman = derive { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb96swxizhdqhvzgb5crymrafxqvg00c7"; depends=[devtools]; };
+paco = derive { name="paco"; version="0.2.1"; sha256="0vkky4jm8hsq5axmvay3z4cs4l019lprwh9344knn27s95k3x2cb"; depends=[plyr vegan]; };
 paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
 pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
 pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
@@ -5089,6 +5196,7 @@ parallelMap = derive { name="parallelMap"; version="1.3"; sha256="026d018fr2a43c
 parallelSVM = derive { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
 parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
 paramlink = derive { name="paramlink"; version="0.9-7"; sha256="02h7znac93v8ibra3ni2psxc9lpfhiiw4q8asfyrx400345ifk5b"; depends=[kinship2 maxLik]; };
+params = derive { name="params"; version="0.2"; sha256="1q750ivgnsf6sfi1apr2wgnr94fnkak1im07vkan565n8wiac0lr"; depends=[knitr whisker]; };
 paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
 parboost = derive { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; };
 parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
@@ -5104,10 +5212,10 @@ partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpx
 partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
 partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
 partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; };
-partools = derive { name="partools"; version="1.0.1"; sha256="0id6fw582ag0zwkp0yjm5vfcd2gv1bsa3zzhfx2fgiaarhnhzmda"; depends=[]; };
+partools = derive { name="partools"; version="1.1.3"; sha256="07bvhs6a53cm0gvmxbibg8rhzvjxrhjgl65ib348a4q43pgap2v1"; depends=[]; };
 partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-party = derive { name="party"; version="1.0-21"; sha256="10kk3mw9kbkzhh5qacmq404d1r0scin2vc33wsf152lgc9fhs1xx"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
-partykit = derive { name="partykit"; version="1.0-1"; sha256="12ja72nginkzl9zrpiidqwrih2zgwxksdkhbw7hbdjbsr4zb7q62"; depends=[survival]; };
+party = derive { name="party"; version="1.0-22"; sha256="16wk9nsjjh8f464xx2izyymqwl89aygiyqir7h1kawm7flw9mrmv"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
+partykit = derive { name="partykit"; version="1.0-2"; sha256="1v1ykha642cgrj8hwj8gmz3860nmr1brgdjgal732dprzm3lg4hl"; depends=[survival]; };
 parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
 pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; };
 pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
@@ -5135,19 +5243,20 @@ pbivnorm = derive { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245h
 pbkrtest = derive { name="pbkrtest"; version="0.4-2"; sha256="1yppp24a8rl36x6sn1jjhhgs41irbf0z5nrv454g9qwhbvfgiay5"; depends=[lme4 MASS Matrix]; };
 pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
 pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
-pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; };
+pcIRT = derive { name="pcIRT"; version="0.2"; sha256="18rqyhkzjaqjvsyh3vr3dv9jwqvsa28d0vhnnzj72na6h6rx31w4"; depends=[combinat Rcpp]; };
 pca3d = derive { name="pca3d"; version="0.8"; sha256="03ghncfpma1fwby8kxm0v90l795mknz8s4y81l24f3n7mmhighn6"; depends=[ellipse rgl]; };
 pcaBootPlot = derive { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
 pcaL1 = derive { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; };
 pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; };
-pcalg = derive { name="pcalg"; version="2.2-2"; sha256="1cfjzknrlykxs42kyjjy4b09d8qkpl7kjivx0w8dxbgs03r6cmkl"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+pcalg = derive { name="pcalg"; version="2.2-4"; sha256="0qx0impxh6pzbgdhpkbl13qfql4zpsa3xiy4hc640d15zxprv6zw"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
 pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
 pcnetmeta = derive { name="pcnetmeta"; version="2.2.1"; sha256="0y4sn1aby38c458667fsy2ndq64i8kknmzdc32mbvzd530p1yxai"; depends=[coda rjags]; };
+pco = derive { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; };
 pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
 pdR = derive { name="pdR"; version="1.3"; sha256="0y81nlvq5vwf6021m5ns6j4l44c5456jkbs2x9y7jfkw6r3v2ddf"; depends=[]; };
 pdc = derive { name="pdc"; version="1.0.2"; sha256="0d7p65rkwrh39njhszdrbv25z4jz27746y1qyhqmhkxmvkx6g1fl"; depends=[]; };
 pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
-pdfetch = derive { name="pdfetch"; version="0.1.6"; sha256="1j3fdjnmfj84pfd5bc37ssbs83ya3ma0hj5iy1a0bg9wb5xqap13"; depends=[httr jsonlite lubridate reshape2 XML xts zoo]; };
+pdfetch = derive { name="pdfetch"; version="0.1.7"; sha256="12ddf3kyw9pppjn6haq7a3k27vl17016s4h2mc31mbb9fn6h4cjz"; depends=[httr jsonlite lubridate reshape2 XML xts zoo]; };
 pdist = derive { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
 pdmod = derive { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; };
 peacots = derive { name="peacots"; version="1.2"; sha256="1qrg6rzdnj0ba6igj4k9m1kc2q7gbwg8kwnmzhkjfza8jl8fqkf2"; depends=[]; };
@@ -5155,15 +5264,15 @@ pear = derive { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1
 pearson7 = derive { name="pearson7"; version="1.0-1"; sha256="0li32my02gv5yaf4q1w48pjbmij2njkpd15135n9mzjc5ibvf5kh"; depends=[]; };
 pec = derive { name="pec"; version="2.4.4"; sha256="110v8jb6l79prbkm8vp1qgrdks598q3ygmqj2yyv1d5plmsj9dh6"; depends=[foreach prodlim rms survival]; };
 pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[kinship2 MasterBayes MCMCglmm]; };
-pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[CompQuadForm kinship2 Matrix survey]; };
+pedgene = derive { name="pedgene"; version="2.7"; sha256="1qgk8a601ynvbk94zl81a94pa4iw3l3bwjf19dlgkfs30nkq5p9x"; depends=[CompQuadForm kinship2 Matrix survey]; };
 pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
 pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
-pedometrics = derive { name="pedometrics"; version="0.6-2"; sha256="137685gyd7k9vpjnsy6h280cdbl15bchrizfnalnz6nizi0q85lj"; depends=[car gstat Hmisc lattice latticeExtra MASS moments pbapply plyr Rcpp sp spsurvey xtable]; };
+pedometrics = derive { name="pedometrics"; version="0.6-3"; sha256="00jv9v3hrvh9jfl5vzkjh7frym9m6d9di4zv5ybwww2ba9rq2xaf"; depends=[lattice latticeExtra Rcpp]; };
 pegas = derive { name="pegas"; version="0.8-1"; sha256="116r709qp9hcvmvfn6xsis13284nl429sfc9d91p1c7fy8fl46q5"; depends=[adegenet ape]; };
-penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[fda lattice Matrix quadprog TSP]; };
+penDvine = derive { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; };
 penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
 penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; };
-penalizedLDA = derive { name="penalizedLDA"; version="1.0"; sha256="1ib33l5nqmvi6qn9ykybkdpc0pp55k1b6x4vqpklzp3dgckg0lp6"; depends=[flsa]; };
+penalizedLDA = derive { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; };
 penalizedSVM = derive { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
 pencopula = derive { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; };
 pendensity = derive { name="pendensity"; version="0.2.8"; sha256="18mnpsmfnqkbhg75lnqvs0iigx3mk9zr923wpygqviw5qxlwk5km"; depends=[fda lattice]; };
@@ -5189,7 +5298,7 @@ pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7ad
 pgmm = derive { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; };
 pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
 phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
-phangorn = derive { name="phangorn"; version="1.99-13"; sha256="1d6awphvzkznqvp30bxdi6j6chlakfxrvmkk9a4by21fxa29xmp9"; depends=[ape igraph Matrix nnls quadprog]; };
+phangorn = derive { name="phangorn"; version="1.99.14"; sha256="03llgrpmb443gxp73xj744g1zf9lklzfj01j4ifc5q5p8vq4q3a1"; depends=[ape igraph Matrix nnls quadprog]; };
 phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
 phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
 pheatmap = derive { name="pheatmap"; version="1.0.7"; sha256="0dvflwkwvnlh36w5z3ai1q2rgclrgs1qzh01nxgz9kd23imqp0q8"; depends=[gtable RColorBrewer scales]; };
@@ -5202,13 +5311,15 @@ phenology = derive { name="phenology"; version="4.2.4"; sha256="1074sr1p3bjz4f2z
 phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; };
 phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[lattice Matrix survival]; };
 phonR = derive { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[deldir plotrix splancs]; };
-phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; };
+phonTools = derive { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; };
+phonenumber = derive { name="phonenumber"; version="0.2.0"; sha256="0dsdf87lys52pb3sc1z21fbqswrz5n89pcgxp9fak9flb9b51jky"; depends=[]; };
 phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; };
 phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
 phyclust = derive { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; };
+phyext2 = derive { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; };
 phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m55sl1w7ifmc98v74iq9p8xa15sdci"; depends=[]; };
 phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[ape igraph NHPoisson phylobase]; };
-phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp]; };
+phylobase = derive { name="phylobase"; version="0.8.0"; sha256="1zpypg6qrc39nl96k02qishw61sq4b62qw0mq3inmkrwf7w031m6"; depends=[ade4 ape Rcpp rncl RNeXML]; };
 phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
 phylocurve = derive { name="phylocurve"; version="1.3.0"; sha256="014y7l2q3yjzj2iq9a6aspnd7dkvjfwnz46rs7x6l45jy41494wb"; depends=[abind ape drc dtw geiger GPfit phylolm phytools]; };
 phyloland = derive { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
@@ -5216,25 +5327,27 @@ phylolm = derive { name="phylolm"; version="2.2"; sha256="1x1mi1mcq3ijbqhr0951sc
 phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[ape fields picante seqRFLP spaa]; };
 phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
 physiology = derive { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
-phytools = derive { name="phytools"; version="0.4-56"; sha256="18cib7yjlbzdpfs5piwx5cw0h7fk26s04wsb2vdfiybr306a9jk2"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
+phytools = derive { name="phytools"; version="0.4-60"; sha256="1la0pjsb2jwr1ygj520vy15aq1fhhdnc5h1dzavbwcdcd9vl13n7"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
 phytotools = derive { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
 pi0 = derive { name="pi0"; version="1.4-0"; sha256="0qwyfan21k23q4dilnl7hqjghzm8n2qfw21wbvnidr6n9hf2fjjs"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; };
 picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; };
 picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[igraph lattice MASS Matrix]; };
-pid = derive { name="pid"; version="0.13"; sha256="1cn8pc86xkb4dngashglfwlj7sjj4xaamfgglxkcsp0wxaiy9rfg"; depends=[ggplot2]; };
+pid = derive { name="pid"; version="0.32"; sha256="0lyxml25wk2sxjxg90c3mbrh4sg8ms2yk5wrznzb8k6lpgak4zqr"; depends=[DoE_base FrF2 ggplot2 png]; };
 pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; };
-pipe_design = derive { name="pipe.design"; version="0.2"; sha256="1hmc4g3bnpwicjr53xz8yhhshnfhd2fqx9c6v4af8wvnqpy7mlpq"; depends=[ggplot2 gtools]; };
+pipe_design = derive { name="pipe.design"; version="0.3"; sha256="1idgy7s6fnydcda51yj1rjil2pd1r2y6g0m5dmn8sw7wmaq2n3h6"; depends=[ggplot2 gtools]; };
 pipeR = derive { name="pipeR"; version="0.6.0.6"; sha256="1d7vmccvh5ir26cv26mk0ay69rqmwmp0mgwjal9avfn9vrxq1fq3"; depends=[]; };
 pitchRx = derive { name="pitchRx"; version="1.7"; sha256="0mx948bahw0zr0915hz9lcws7iq2l0ikgx4gjnnfhhpiii86xs57"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
+pixiedust = derive { name="pixiedust"; version="0.1.1"; sha256="1vzkv9hs4vxamrn8prn0plhvqfdgy4lq6vk4sm8il5w6qyxzbadq"; depends=[ArgumentCheck broom dplyr knitr lazyWeave magrittr tidyr]; };
 pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
 pkgKitten = derive { name="pkgKitten"; version="0.1.3"; sha256="1f7jkriib1f19mc5mdrymg5xzdcyclfvh1220agy4lpyprxgza0f"; depends=[]; };
+pkgconfig = derive { name="pkgconfig"; version="2.0.0"; sha256="1wdi86qyaxq1mwkr3nrax3ab7hhj2gp1lbsyqnbcc9vzg230nh0r"; depends=[]; };
 pkgmaker = derive { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; };
 pks = derive { name="pks"; version="0.3-1"; sha256="1nr36k960yv71yfxkzchjk814sf921hdiiakxvv5f9dxpf00hxp4"; depends=[sets]; };
 plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
 plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
 planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[cubature dielectric plyr Rcpp RcppArmadillo reshape2 statmod]; };
 planor = derive { name="planor"; version="0.2-4"; sha256="0k5rhrnv2spsj2a94msgw03yyv0hzrf8kvlnbhfj1dl7sb1l92a1"; depends=[conf_design]; };
-plantecophys = derive { name="plantecophys"; version="0.6"; sha256="1gxc84njpii82p6n04djbp4n9wni49lxfvmljqz48r643hv48a7h"; depends=[]; };
+plantecophys = derive { name="plantecophys"; version="0.6-3"; sha256="021jycr8jffry38r1d59r20wghmsbdqr354fkjrraq9c3b469ipz"; depends=[]; };
 plaqr = derive { name="plaqr"; version="1.0"; sha256="1vv15zqnmir5hi9ivyifzrc1rkn1sn5qj61by66iczmlmhqh17h8"; depends=[quantreg]; };
 playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
 plfm = derive { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[abind sfsmisc]; };
@@ -5247,11 +5360,11 @@ plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inl
 plot3D = derive { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; };
 plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[plot3D rgl]; };
 plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
-plotKML = derive { name="plotKML"; version="0.5-2"; sha256="006f6j3k2yb20zcmx2lq9d4yy5awpsaxkcp17r6q42bdrffkc0m9"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
+plotKML = derive { name="plotKML"; version="0.5-3"; sha256="1s33a3lq8zi11hzqcvkcb3g9a91jkskxpyg8fyw7d0cwjmflfpfi"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
 plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
 plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; };
 plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
-plotmo = derive { name="plotmo"; version="3.1.3"; sha256="0jdam773azxi5pv2ix4gc0zl3xji0rdlb7v5m51z1j0l93z50mk6"; depends=[plotrix TeachingDemos]; };
+plotmo = derive { name="plotmo"; version="3.1.4"; sha256="0b12w6sg317vgmhyn4gh9jcnyps1pyqnh5ai15y1dfajsf2zjhca"; depends=[plotrix TeachingDemos]; };
 plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; };
 plotrix = derive { name="plotrix"; version="3.5-12"; sha256="13gffp7zp46wal83609652x48i63zb5i20x6ycmgc97l4nanhrfi"; depends=[]; };
 pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; };
@@ -5272,8 +5385,8 @@ pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x
 pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[MASS pbdMPI rlecuyer]; };
 pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[foreign gWidgets gWidgetsRGtk2 lattice MASS proto]; };
 pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; };
-pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[survival XML]; };
-pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; };
+pmml = derive { name="pmml"; version="1.5.0"; sha256="192jffh9xb7zfvx4crpynrbdrx1fpiq303c2xz1wjqnq7wjmb3qw"; depends=[survival XML]; };
+pmmlTransformations = derive { name="pmmlTransformations"; version="1.3.0"; sha256="17dhgpldwadsvm25p8xwqsamcn1ypsqdijy2jia048qqmsy4ky86"; depends=[]; };
 pmr = derive { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
 pnf = derive { name="pnf"; version="0.1.1"; sha256="0kasq27dnjwqzlzybc8m3wv9jwyag6z38ayv88msa7lxcnibr34i"; depends=[]; };
 png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
@@ -5281,7 +5394,7 @@ pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0
 pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
 poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; };
 pocrm = derive { name="pocrm"; version="0.9"; sha256="0p7a7xm1iyyjgzyi7ik2n34gqc3lsnallrijzdakghb8k5cybm4m"; depends=[dfcrm nnet]; };
-pogit = derive { name="pogit"; version="1.0.0"; sha256="0lgvf4d7b2ycz9wryjrd7qymbx1jmj4mw8jl95ax2jylz4li48zf"; depends=[BayesLogit ggplot2 logistf plyr]; };
+pogit = derive { name="pogit"; version="1.0.1"; sha256="19sawm7j5fa9s1nlz4hvhpgjj7n3rrnsh2m5a6scxis4brnaa98n"; depends=[BayesLogit ggplot2 logistf plyr]; };
 poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
 poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
 pointRes = derive { name="pointRes"; version="1.0.2"; sha256="1q9vjvmxs1f5g8f2aj674wk8piqzjqxzdrvxnawgw1pfi66adnms"; depends=[ggplot2 gridExtra plyr TripleR]; };
@@ -5291,7 +5404,7 @@ poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m2
 poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
 polidata = derive { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; };
 pollstR = derive { name="pollstR"; version="1.2.1"; sha256="0sny330a0d8jicsgyc1qa2mwhxgxng50w2fv3ml1nncml8b88k40"; depends=[httr jsonlite plyr]; };
-polspline = derive { name="polspline"; version="1.1.11"; sha256="000b8mb7q5614pxrrfkbwyl39lqj3rbf13ghgkn0234v9y2i6j76"; depends=[]; };
+polspline = derive { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; };
 polyCub = derive { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; };
 polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
 polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; };
@@ -5314,8 +5427,9 @@ popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7d
 popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; };
 popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS Matrix sampling sp]; };
 poplite = derive { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
-poppr = derive { name="poppr"; version="2.0.0"; sha256="1n3vdrfcwfjrxa9fff39g59kdyxs3lhykg24vppy4ngjv2yhph3y"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; };
-popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[fields som]; };
+poppr = derive { name="poppr"; version="2.0.2"; sha256="1ccxjmnqixv59600gn1jknhs00yaq2mfdas6s9rwzywz1m515ff5"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; };
+popprxl = derive { name="popprxl"; version="0.1"; sha256="08gfbwlacbpnkb4q99rbxxbg17qg4alzhjn3blpfls8rnasryca4"; depends=[poppr readxl]; };
+popsom = derive { name="popsom"; version="3.0.1"; sha256="0qj4l5cdzrhiaq1q6q7wv75jnbfvw1rrms2v6ffw34wz4fs1w6is"; depends=[fields som]; };
 portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; };
 portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
 portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
@@ -5325,17 +5439,17 @@ powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshql
 powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; };
 powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; };
 powerMediation = derive { name="powerMediation"; version="0.2.4"; sha256="1b4hzai52fb0kk04az3rdbfk2vldfkhsa4gx7g98lbsvw4gh9imb"; depends=[]; };
-powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; };
+powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.9"; sha256="0f8i867zc1yjdp66rjb1cp92fcfrlq167z3d0c4iv355wv4s35az"; depends=[survival]; };
 powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
 ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; };
-ppiPre = derive { name="ppiPre"; version="1.8"; sha256="030jgpm91vjrjas93avxfvs0hrvdzw79p6ghfn81lakc06jjv5j8"; depends=[AnnotationDbi e1071 GOSemSim igraph]; };
+ppiPre = derive { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GOSemSim igraph]; };
 ppls = derive { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
 ppmlasso = derive { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
 pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
 pqantimalarials = derive { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; };
 prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; };
 prabclus = derive { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; };
-pracma = derive { name="pracma"; version="1.8.3"; sha256="06711w5451gb22667i5dx27ysi4pfagkxdfzg270lxwbymcii6pp"; depends=[]; };
+pracma = derive { name="pracma"; version="1.8.6"; sha256="0gwdg6hz186sxanxssinz392l07p4zkyrj1p46agm130hql9a2c8"; depends=[]; };
 pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
 prais = derive { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; };
 praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
@@ -5348,7 +5462,7 @@ presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k6
 preseqR = derive { name="preseqR"; version="1.2.1"; sha256="1izfykccybnr2pnw043g680wg78hbds6hcfqirqhy1sfn6sf8lz1"; depends=[]; };
 prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
 prettyR = derive { name="prettyR"; version="2.1-1"; sha256="173n0cp0mq00y1ydba9m7l3izz04czg9vvadbflfinpi86wvcgq6"; depends=[]; };
-prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[assertthat magrittr]; };
+prettyunits = derive { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; };
 prevR = derive { name="prevR"; version="3.1"; sha256="1x8ssz1k8vdq3zx1qhfhyq371i8s3bam2rd6bm3biha5i8icglh6"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
 prevalence = derive { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
 prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[misc3d rgl]; };
@@ -5418,13 +5532,15 @@ pvclass = derive { name="pvclass"; version="1.2"; sha256="099lk0x24h7g77lpr22mzp
 pvclust = derive { name="pvclust"; version="1.3-2"; sha256="0w9cxr0bc591icbyn8239f76ypb2nwv9fa5b1ix05wh55d1h0rgc"; depends=[]; };
 pvrank = derive { name="pvrank"; version="1.0"; sha256="0kvy0b1x7q23pjw2ckyqzyh3ihqnbrd067v85l9rvf0pxyycqyhx"; depends=[Rmpfr]; };
 pvsR = derive { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; };
+pweight = derive { name="pweight"; version="0.0.1"; sha256="0pxxfrap1bmnhbfbmkddfbqwkpw42hq37s0y26zmkxqlx4wblira"; depends=[qqman]; };
 pwr = derive { name="pwr"; version="1.1-2"; sha256="1czganj70qszz32yx2jprhr8h9a2lpg67gwfwfjf8kpk97qvkalj"; depends=[]; };
 pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
 pwt8 = derive { name="pwt8"; version="8.1-0"; sha256="0jvskkn3c4m2lfxm9ivm8g96kcd7ynlmjpjqbrd6sqivas0z46r2"; depends=[]; };
 pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[plyr reshape2 RJSONIO stringr]; };
-pxweb = derive { name="pxweb"; version="0.5.54"; sha256="17vg480b54mcv9jbkci1rrn6zi90zzw098xzrcw3kvp583as9mar"; depends=[data_table httr plyr RJSONIO stringr]; };
+pxweb = derive { name="pxweb"; version="0.5.57"; sha256="0qvafshxrxz2cvipz4rvj1rpmqmh264w78dk8jvyqvyl9qyg2724"; depends=[data_table httr plyr RJSONIO stringr]; };
 pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
 pyramid = derive { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
+pystr = derive { name="pystr"; version="1.0.0"; sha256="1my0prvil8l2lqc9x8qi0j1zfzxl0ism5v2581himp5n5bcv8gkk"; depends=[]; };
 qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
 qPCR_CT = derive { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; };
 qVarSel = derive { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; };
@@ -5434,12 +5550,12 @@ qclust = derive { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm
 qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
 qdap = derive { name="qdap"; version="2.2.2"; sha256="06y4a35ki7cml5sgr5q8cc8wh6rwv4xcrd7rki18ykyjhq4y4gc6"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
 qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; };
-qdapRegex = derive { name="qdapRegex"; version="0.3.2"; sha256="1hygkck4wilm2f2cg5q82a867608j3dqp7wqj3kbnh5a970lw41y"; depends=[stringi]; };
+qdapRegex = derive { name="qdapRegex"; version="0.4.0"; sha256="0i2mh1xbm1g9vxdp744g23b2lcjwn7may2cn4ijfw3qpi2bf2axl"; depends=[stringi]; };
 qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8jm2z02zmrpgjpwbpcaanmp2vlykqzacsrl52"; depends=[chron data_table RCurl XML]; };
 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
 qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
 qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
-qicharts = derive { name="qicharts"; version="0.2.0"; sha256="0dinkcaz3dgi4r8nxzy57czi7b0192c4b9y5wbiqqf1l7b1zjqlp"; depends=[lattice latticeExtra]; };
+qicharts = derive { name="qicharts"; version="0.3.1"; sha256="1h2hf6psz5rkbg4s29576mz6cp9vyynw30sy999dx4yyriw3c3yb"; depends=[lattice latticeExtra]; };
 qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; };
 qlcMatrix = derive { name="qlcMatrix"; version="0.9.4"; sha256="1nkk712h9nnaqshw766mvk72w6gq9abyry4q1a0ghn0naq3gyl0s"; depends=[Matrix slam]; };
 qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; };
@@ -5450,11 +5566,13 @@ qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6
 qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgvlpxgk5lngfp989hq2a830kyxz1ds"; depends=[MASS]; };
 qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[ghyp matrixcalc mvtnorm nlme psych quantreg]; };
 qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
+qrage = derive { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; };
 qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[cluster maptools mgraph mvoutlier pvclust]; };
+qrjoint = derive { name="qrjoint"; version="0.1-1"; sha256="0q39n4y7cdmim88na3pw05w15n95bpqnxknvh6fzz9mpbbjkxqx5"; depends=[coda kernlab Matrix quantreg]; };
 qrmtools = derive { name="qrmtools"; version="0.0-1"; sha256="0xjgb8clyhlrl4qdbhi85m97cbhab5q5sy2zr87gamz2y365alpr"; depends=[xts]; };
 qrng = derive { name="qrng"; version="0.0-2"; sha256="0rs4dggvrlc3bi0wgkjw8lhv4b3jpckcfkqzsaz0j46kf6vfgfw1"; depends=[]; };
-qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; };
-qtbase = derive { name="qtbase"; version="1.0.9"; sha256="1jffdkv6jwxqljx6jd5n27wk9r5sg0llpf34nlr29h4shi3f2f8z"; depends=[]; };
+qrnn = derive { name="qrnn"; version="1.1.3"; sha256="0phbazi47pzhvg7k3az958rk5dv7nk2wvbxqsanppxsvyxl0ykwf"; depends=[]; };
+qtbase = derive { name="qtbase"; version="1.0.11"; sha256="01fx8yabvk2rsb0mdx9f59a9qf981sl88s56iy58w5dd6r2ag6gc"; depends=[]; };
 qte = derive { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; };
 qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; };
 qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
@@ -5471,9 +5589,9 @@ qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cp
 qualV = derive { name="qualV"; version="0.3-1"; sha256="0p4yfgq2wxwis2w28mdb61x6hzm6sb9bczjdm9bc05ga5srr3sdd"; depends=[KernSmooth]; };
 qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; };
 quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-quanteda = derive { name="quanteda"; version="0.7.2-1"; sha256="1j6hjcr3sd1xymzznvz1r2z6rs3m6vp3ji5y6dqq5qr18g1bi4cm"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC wordcloud]; };
+quanteda = derive { name="quanteda"; version="0.8.2-0"; sha256="17v1xilcivj57p7w562bj4224cqi5hap4lw7h12c29n26x2b33l3"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC stringi wordcloud]; };
 quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; };
-quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[TTR xts zoo]; };
+quantmod = derive { name="quantmod"; version="0.4-5"; sha256="14y8xra36cg5zam2cmxzvkb8n2jafdpc8hhjv9xnwa91basrx267"; depends=[TTR xts zoo]; };
 quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; };
 quantregForest = derive { name="quantregForest"; version="1.0"; sha256="11mnb32vz6m2g7nggip2y251rkwn6wr7jwdh0hqvl0pgalmipb84"; depends=[randomForest]; };
 quantregGrowth = derive { name="quantregGrowth"; version="0.3-1"; sha256="0cm4ac9rn5vhqhi7f5qiilym1vp7x6bglwghw22b70nf9zvcap9h"; depends=[quantreg]; };
@@ -5500,17 +5618,17 @@ rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5
 rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; };
 rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
 rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; };
-rDEA = derive { name="rDEA"; version="1.2-1"; sha256="0zm9vnysj5j3kq8n8ljgxqn45jf1c6cg7mcvpd36bs75kz03bwig"; depends=[maxLik slam truncnorm truncreg]; };
+rDEA = derive { name="rDEA"; version="1.2-2"; sha256="05adyzj9cyviz5dy0c86m9hkb8k13qkjxrw9xkk1710z50i427jd"; depends=[maxLik slam truncnorm truncreg]; };
 rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
 rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
-rEMM = derive { name="rEMM"; version="1.0-10"; sha256="0yngddddrc8fwqda79vc3sz58c1amns69ycn7rbyfzqwiifsvdjk"; depends=[clusterGeneration igraph MASS proxy]; };
+rEMM = derive { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
 rFDSN = derive { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
 rFerns = derive { name="rFerns"; version="1.1.0"; sha256="00ddb9zwf4hqkx9qmrndz182mg69mb5fyg0v0v4b32sy4sixnps5"; depends=[]; };
 rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
 rHealthDataGov = derive { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
 rHpcc = derive { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; };
 rJPSGCS = derive { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8mqa6q822rpfphj00dlmj50rgwk02pfc69"; depends=[chopsticks rJava]; };
-rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; };
+rJava = derive { name="rJava"; version="0.9-7"; sha256="14wlcq9bcccs9a2kimsllgi9d0hsgnjc5q2xlc0qz8w5rffi54iw"; depends=[]; };
 rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
 rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
 rLTP = derive { name="rLTP"; version="0.1.2"; sha256="1cr0r3v7d09bss16fxls341l71i9wkg91hr2hiyr4cl5fg35zzgb"; depends=[RCurl]; };
@@ -5541,7 +5659,7 @@ raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rar
 rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
 ramify = derive { name="ramify"; version="0.3.1"; sha256="1anma8kwfhm4k74fakpifrymnrjxmmk48jf1apxkg3406xcxy020"; depends=[]; };
 ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda fields maps Matrix nlme]; };
-randNames = derive { name="randNames"; version="0.2"; sha256="0mgfwdbadfvxg1dp8aqp2c24lkhz3bi9ssmym4ns6xjq088l3ldh"; depends=[dplyr httr jsonlite]; };
+randNames = derive { name="randNames"; version="0.2.1"; sha256="177xdgrikvfcgjag382v5d1j72322ihnbggzxp9ip6p48ib4p3qg"; depends=[dplyr httr jsonlite]; };
 randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
 random = derive { name="random"; version="0.2.5"; sha256="0n96zv3b95msahpzdwfqsd9i9bq2z94flxxm8ghnqb0b75qcsdg0"; depends=[curl]; };
 random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
@@ -5549,15 +5667,16 @@ randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6s
 randomForestSRC = derive { name="randomForestSRC"; version="1.6.1"; sha256="174ky1wwdpq6wkn8hanfpfgy55jf6v1hlm6k688gjs0515y5490r"; depends=[]; };
 randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
 randomLCA = derive { name="randomLCA"; version="1.0-2"; sha256="14v6jmsbyzmavxjdwh9nb0lljhc7kdly4p1v2a9jypjil6kk5ibc"; depends=[boot fastGHQuad lattice]; };
-randomNames = derive { name="randomNames"; version="0.0-8"; sha256="10fhqxnnw6gk5g8jnb83hh2nvvj65g8mwy7rfln8yzq93gjxnykm"; depends=[data_table]; };
+randomNames = derive { name="randomNames"; version="0.1-0"; sha256="0v92w0z0dsdp6hhyyq764nlky8vmbs6vcnrna5ls47fj80f9cqa4"; depends=[data_table]; };
 randomUniformForest = derive { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
 randomizationInference = derive { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
 randomizeBE = derive { name="randomizeBE"; version="0.3-2"; sha256="1mkq1fpr7bwlk01246qy6w175jcc94q8sb3pyjkdr8yms6iqk8i7"; depends=[]; };
 randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3ay14kd6v6jg2qw86w2wcdzr8f201xy5i1fgr"; depends=[]; };
 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
-randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; };
+randtoolbox = derive { name="randtoolbox"; version="1.17"; sha256="107kckva43xpqncak8ll4h0mjm8lcks4jpf7dffgw5ggcc77ycrb"; depends=[rngWELL]; };
 rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[classInt lattice maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
-rankdist = derive { name="rankdist"; version="0.4.1"; sha256="11lc7ggi5bv836f3bwk8gb5pry4fw4qwbj95bzg34xdascaapw59"; depends=[hash optimx Rcpp]; };
+ranger = derive { name="ranger"; version="0.2.7"; sha256="0ajzbbawhxmlcpy1vyka82xwfpgx07ng432w3s9xy8h58s12yljc"; depends=[Rcpp]; };
+rankdist = derive { name="rankdist"; version="1.0.0"; sha256="1hzrm21s9zlmhkxl3zqbdizhi8256cvw2l5gwx24azq7gf87mh57"; depends=[hash optimx permute Rcpp]; };
 rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; };
 rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; };
 rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice pander plyr reshape yaml]; };
@@ -5570,34 +5689,35 @@ rasterVis = derive { name="rasterVis"; version="0.35"; sha256="0kdpng32b3l0hsf24
 rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
 raters = derive { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
 rationalfun = derive { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
-rattle = derive { name="rattle"; version="3.4.1"; sha256="1ql7zppca6p9cph0wca5wxhhn5f8spzpxa8r65372mvigg0iw6k3"; depends=[]; };
+rattle = derive { name="rattle"; version="3.5.0"; sha256="09v9q5wkmiyvym99kxw0pirzfq3jxp55gfnqlb93jvwjv8k91xy7"; depends=[RGtk2]; };
 rawFasta = derive { name="rawFasta"; version="1.0.0"; sha256="0krvs8d1r8hggjg84n7g3ncdkifa3hipbma98f49kf81fzn2npip"; depends=[]; };
-rbamtools = derive { name="rbamtools"; version="2.10.0"; sha256="00y5393nac4x1vz9m5li0053cr679dj29v7ss6njgph8q27mv19c"; depends=[]; };
+rbamtools = derive { name="rbamtools"; version="2.12.3"; sha256="0vh6kal5r5v708d3a4lsmgbssjb0b9l1iypibkd9v97j00cbk6rr"; depends=[]; };
 rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
 rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
-rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr plyr RJSONIO XML]; };
+rbhl = derive { name="rbhl"; version="0.2.0"; sha256="169nrbpi9ijzb5qk1b1dwjayfnsjq8r67dc7bis9aicyp4hpjyzw"; depends=[httr jsonlite plyr XML]; };
 rbison = derive { name="rbison"; version="0.4.8"; sha256="10kwlf7vrzw2rhsdwih5lcvjw0bz0n88mp74ayc9331d8j226214"; depends=[dplyr ggplot2 httr jsonlite mapproj plyr sp]; };
 rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; };
 rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
 rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
 rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
-rcbalance = derive { name="rcbalance"; version="1.6"; sha256="0nbwsisx4ajdccywwvpg2xcaf8b4b25zij2qcb39yzmlz0yk6jjz"; depends=[MASS plyr]; };
+rcbalance = derive { name="rcbalance"; version="1.7"; sha256="0k95dkig6m9g04skz2s6iqrldmzkz3w0pcyvi1dq20h6rz9a4ic0"; depends=[MASS plyr]; };
 rcdd = derive { name="rcdd"; version="1.1-9"; sha256="1mwg9prf7196b7r262ggdqsfq1i7czm1a0apk4j5014cxzyb6j5s"; depends=[]; };
 rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint iterators png rcdklibs rJava]; };
 rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
 rchallenge = derive { name="rchallenge"; version="1.1"; sha256="1qad0mcadr3zw5r37rgwnqf4ic9brlw3zl5n4jcxyaj324fj4pa3"; depends=[knitr rmarkdown]; };
-rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[aspace jpeg matlab]; };
+rcicr = derive { name="rcicr"; version="0.3.2"; sha256="153d6wl0grnfc842hpc5zd9m5xkybkmy1mpkw8wba4xy0mgppgjd"; depends=[aspace dplyr jpeg matlab]; };
 rclinicaltrials = derive { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr plyr XML]; };
-rcorpora = derive { name="rcorpora"; version="1.1.0"; sha256="05i9zqvgg5fxgscqzmbsi84baq9cxs14k70agjy95h61fndaaarf"; depends=[jsonlite]; };
+rcorpora = derive { name="rcorpora"; version="1.1.1"; sha256="14lnfn9armb6rz1wcs7hdrb4j2vzh6b8pi9lsj83l3zixkxx5izk"; depends=[jsonlite]; };
 rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[BH Rcpp RcppArmadillo]; };
-rcrossref = derive { name="rcrossref"; version="0.3.0"; sha256="1w822n6mlld7fa92iy38xjvgnkhyns3mvy7vaqabgr2bikcz6545"; depends=[bibtex dplyr httr jsonlite plyr XML]; };
+rcrossref = derive { name="rcrossref"; version="0.3.4"; sha256="1glgcclc4zqipccmdniqy4ajsh32y3azwkd7cc75i855gbk8vdmn"; depends=[bibtex dplyr httr jsonlite plyr XML]; };
 rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
 rdatamarket = derive { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; };
 rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[AER Formula lmtest sandwich]; };
+rddtools = derive { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; };
 rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
 rdrobust = derive { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; };
-rdrop2 = derive { name="rdrop2"; version="0.6"; sha256="1yxg38v7r34f9rid5q6q1g9f30q3zc4dnkziyps3514l5dnbvk3j"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
+rdrop2 = derive { name="rdrop2"; version="0.7.0"; sha256="03r3iqi796y7s8bnyca6nya2ys7s1rdxm00sy9c7l7sh0z6npcq4"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
 rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[ape gdata OAIHarvester plyr RCurl RJSONIO stringr XML]; };
 reGenotyper = derive { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
 readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; };
@@ -5611,20 +5731,21 @@ readr = derive { name="readr"; version="0.1.1"; sha256="1raw3kihksqr274p0mdigfxp
 readstata13 = derive { name="readstata13"; version="0.7"; sha256="14il790jgn8l9c8gxgl2s11vzff5xz77jsgdgjs044r407a72wkb"; depends=[Rcpp]; };
 readxl = derive { name="readxl"; version="0.1.0"; sha256="0a0mjcn70a0nz1bkrdjwq495000kswxvyq1nlad9k3ayni2ixjkd"; depends=[Rcpp]; };
 reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
-rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[httr plyr RCurl RJSONIO]; };
+rebird = derive { name="rebird"; version="0.2"; sha256="11x8db6gq9qkv9skslda4j6zgzmkmiap78rlwnlvkjvk1gzz13bf"; depends=[dplyr httr jsonlite]; };
 rebmix = derive { name="rebmix"; version="2.7.1"; sha256="1m3mmqi4kfai0hx2khkblqairp59fgh0japg23rgib1djmdcqb4n"; depends=[]; };
 rebus = derive { name="rebus"; version="0.0-5"; sha256="06rl6knnk93k537hhjx4r55hq6hssij7xc426ilki329vwfi5kyf"; depends=[]; };
 recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; };
 recluster = derive { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
-recommenderlab = derive { name="recommenderlab"; version="0.1-6"; sha256="1ds1zvjgn3k7pha8pf3x7q0403zjf45b9hjsw3ixfzd747kwkaw0"; depends=[arules Matrix proxy registry]; };
-recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; };
-recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; };
+recoder = derive { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
+recommenderlab = derive { name="recommenderlab"; version="0.1-7"; sha256="1qysw4522wmgrzwdmbmfa2ll689kllrwjrxialpwggq8raccrsqd"; depends=[arules Matrix proxy registry]; };
+recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; };
+recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-1"; sha256="1ygdq7wd970yi7298i62r22fg657bswwkmqjabph7if6b13fjyfb"; depends=[recommenderlab]; };
 reconstructr = derive { name="reconstructr"; version="1.1.0"; sha256="1kswvpmhk3zzwm4nv6pjb80ww95n9bd4q9j7bhk9kql8v5mnfg5m"; depends=[Rcpp]; };
 recosystem = derive { name="recosystem"; version="0.3"; sha256="064rnnz4m85mwq3084m0ldj8sb5z6jwzqzkh22fagsq2xyqri15l"; depends=[Rcpp]; };
 redcapAPI = derive { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; };
 redist = derive { name="redist"; version="1.1"; sha256="0ddwvmzmqv5nm3azia1g0x0icj1jcd7s34f1kv01phky2pmz5wy4"; depends=[coda Rcpp RcppArmadillo sp spdep]; };
 ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
-refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[DBI doBy RSQLite]; };
+refGenome = derive { name="refGenome"; version="1.5.8"; sha256="12dnf6lbwmxb9zkzfv1s7ivc22z5fvdzf3glb83svyfcbw3fcmqf"; depends=[DBI doBy RSQLite]; };
 referenceIntervals = derive { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; };
 refset = derive { name="refset"; version="0.1.0"; sha256="0yj87sp6ghxv20hz5knmw3d7way1hsggk759wqxsbfprd38y6khd"; depends=[]; };
 refund = derive { name="refund"; version="0.1-11"; sha256="1afsxab1jivs4vj6diqh7352v98divna6az1dxsdn7lvw6cmph6y"; depends=[boot fda gamm4 glmnet lattice lme4 magic MASS Matrix matrixStats mgcv nlme RLRsim wavethresh]; };
@@ -5659,17 +5780,19 @@ repijson = derive { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6n
 replicatedpp2w = derive { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; };
 replicationInterval = derive { name="replicationInterval"; version="1.0.0"; sha256="1ll6gyibd41kasc3sn6hvydc6xaacx6h5q5nhj09ha36x4lgr0gb"; depends=[MBESS]; };
 repmis = derive { name="repmis"; version="0.4.4"; sha256="12sw9l2nifkvri5kvgf0br7yqqmjlq5rj58g6yik8gh7wwy5157z"; depends=[data_table digest httr plyr R_cache]; };
+repo = derive { name="repo"; version="1.0"; sha256="103bjd880hd76qpipryl17l9972hwj5c3dxicjq0dcbdfmdk7q7h"; depends=[digest]; };
 repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
 reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
 reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
 reports = derive { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
 reporttools = derive { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
-repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[assertthat data_table dplyr ggplot2 Rcpp reshape2]; };
+repra = derive { name="repra"; version="0.4.4"; sha256="02345sx89d9h37fwh5mh7925jjkcf3kmwxnwb27zhr2wfijv9kfn"; depends=[assertthat data_table dplyr ggplot2 Rcpp reshape2]; };
 represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
 reproducer = derive { name="reproducer"; version="0.1.3"; sha256="1pz2l123xc16m1pqi95khg9r267s25igcyjgr7hn9gy623cqgzah"; depends=[ggplot2 gridExtra metafor openxlsx RColorBrewer tm wordcloud xtable]; };
 rerddap = derive { name="rerddap"; version="0.2.0"; sha256="15p3nh421k7pavjgpmj7lah8mnld3g3zmqima4v2vs81yrg72s24"; depends=[data_table digest dplyr httr jsonlite ncdf xml2]; };
 resample = derive { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
 resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[foreach iterators pls Rcpp RcppArmadillo]; };
+reservoir = derive { name="reservoir"; version="1.0.0"; sha256="178yb8wp82acbn76dg6kz9cn5hnxkkfpnkasj7pfz00l1jakn7li"; depends=[gtools]; };
 reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
 reshape2 = derive { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr Rcpp stringr]; };
 reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; };
@@ -5685,7 +5808,7 @@ revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkj
 reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
 rex = derive { name="rex"; version="1.0.1"; sha256="1k1s5rx3lpyh6apakaf4mw94y72zkxf14c2kj0d9njhf5j6g1sdj"; depends=[lazyeval magrittr]; };
 rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[Rcpp SparseM]; };
-rfPermute = derive { name="rfPermute"; version="1.7"; sha256="1nnnrbznig7hkdg9hkpw1yfvn2rbgbshjmssz1afk8c1w3q9knsi"; depends=[ggplot2 gridExtra randomForest]; };
+rfPermute = derive { name="rfPermute"; version="1.9.2"; sha256="1rn61vscxgb0lq86id5sy56sjnfnpapzrpz363cl5x13j7028sjm"; depends=[ggplot2 gridExtra randomForest]; };
 rfUtilities = derive { name="rfUtilities"; version="1.0-1"; sha256="0y0jn4c5dpr9drjyjg2vsgsb37s0l284hvh35zm53hs8f881ycx3"; depends=[randomForest]; };
 rfigshare = derive { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; };
 rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[RCurl XML]; };
@@ -5696,10 +5819,11 @@ rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4
 rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
 rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; };
 rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[data_table ggplot2 gridExtra httr lubridate plyr reshape2 scales]; };
-rgbif = derive { name="rgbif"; version="0.8.6"; sha256="03pbqg82xqwzi0x86qpcgznxwvivrai16j5bpv8y21ipxv6dy3xw"; depends=[data_table ggplot2 httr jsonlite magrittr V8 whisker XML]; };
+rgbif = derive { name="rgbif"; version="0.8.8"; sha256="1flabwa0fjwa38idyddbag9a7cyifpdc66nap25pw061a886jndd"; depends=[data_table ggplot2 httr jsonlite magrittr V8 whisker XML]; };
 rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
 rgdal = derive { name="rgdal"; version="1.0-4"; sha256="0c0fwq11ql1spw3791x7yd8fcmi0rlsxvk2bhf0951kvc99vbyv9"; depends=[sp]; };
-rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
+rgenoud = derive { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; };
+rgeolocate = derive { name="rgeolocate"; version="0.4.1"; sha256="1xrgk8nzd0j2zhq6m4jlck5vg151bynwjswkqav38iljh9087wv2"; depends=[httr Rcpp]; };
 rgeos = derive { name="rgeos"; version="0.3-11"; sha256="1x5fna4n5ck0wfdrplj5q5cvv289fzsmlr95q86na78lvwn14fzl"; depends=[sp]; };
 rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
 rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
@@ -5710,12 +5834,12 @@ rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89
 rgr = derive { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[fastICA MASS]; };
 rgrass7 = derive { name="rgrass7"; version="0.1-0"; sha256="19fwf3gaq25x3imj9kc1112cf9dhafp0d1gjly2xh2gz1kam5wl6"; depends=[sp XML]; };
 rhandsontable = derive { name="rhandsontable"; version="0.1"; sha256="0nssb7gqx3rsc2mbic2mlzldq5vpmp97qv9c62d7pkbxxwxlm1f0"; depends=[htmlwidgets jsonlite magrittr]; };
-rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; };
+rhosp = derive { name="rhosp"; version="1.07"; sha256="09wq96micv9wpr3sx8ir7frkanpy3zi3mwn6rbixw2kxvn5wkkfn"; depends=[]; };
 ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
 riceware = derive { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
 rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot permute vegan]; };
 ridge = derive { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid2x7hzl1j80yqqshbraladszyfpwk"; depends=[]; };
-ridigbio = derive { name="ridigbio"; version="0.2.2"; sha256="065pad7pprax1mgqikjrl4nygyw5mjr80j21072zb7qcki9ag2k5"; depends=[httr jsonlite]; };
+ridigbio = derive { name="ridigbio"; version="0.3"; sha256="0f2jqmm2gpq4inipmmzbhgv1a417czrycqsha5q3h16rqz6jzcfq"; depends=[httr jsonlite plyr]; };
 rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[ggplot2 httr jsonlite maps plyr]; };
 rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
 rio = derive { name="rio"; version="0.2"; sha256="0v64zkxcs2bajdh9hqlhacc6msy7l3h31cvcxpj6in5hb3m1wfv3"; depends=[curl data_table foreign haven jsonlite openxlsx readODS readxl XML]; };
@@ -5741,7 +5865,7 @@ rknn = derive { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjz
 rkt = derive { name="rkt"; version="1.4"; sha256="01c8fwnml1n0sw5lw9p2nz15i1zhxirr0kh39qvjmdiw97c1v1yq"; depends=[]; };
 rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
 rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; };
-rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fhr3q1k9sqih4pnvbb0maxlzgn7g"; depends=[jsonlite yaml]; };
+rlist = derive { name="rlist"; version="0.4.2.3"; sha256="1p35l7zslhid0913hga7cw240ra43skcgwwdp5fwhclhd89ay9rj"; depends=[data_table jsonlite XML yaml]; };
 rlm = derive { name="rlm"; version="1.1"; sha256="147hn780hjbp8ly3mc5q05g36b080ndq0z0r0vq75c2qfkhybvdc"; depends=[]; };
 rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; };
 rmaf = derive { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
@@ -5750,7 +5874,7 @@ rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j4
 rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
 rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ade4 ape gtools]; };
 rmgarch = derive { name="rmgarch"; version="1.2-9"; sha256="0nwhjypcfzaamg5kdmlx2lp5pr2xpjxdx15j5vs5ki8kvy65hzqj"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
-rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1xx6dwia1ms4hrcpnpz3kb8f6ydda"; depends=[adabag Cubist e1071 kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart]; };
+rminer = derive { name="rminer"; version="1.4.1"; sha256="1rbs5k3jxjbxr3pdlg03591h8yy9nrg8zjq1kcnvmzgza2a25613"; depends=[adabag Cubist e1071 kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart]; };
 rmngb = derive { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
 rmongodb = derive { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; };
 rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; };
@@ -5758,10 +5882,10 @@ rms = derive { name="rms"; version="4.3-1"; sha256="07198lzk3yzl9vnqcfxqgp5kpb50
 rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
 rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
 rnbn = derive { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; };
-rncl = derive { name="rncl"; version="0.2.2"; sha256="1l9g7mylj4ip15x4985i27n42fhi9vyi1ii23dc9k27s84b274y7"; depends=[ape Rcpp]; };
+rncl = derive { name="rncl"; version="0.6.0"; sha256="067x05xg7bs271zjhylz3dcd9zan1ycmsh771gn06k9905rr2y71"; depends=[Rcpp]; };
 rneos = derive { name="rneos"; version="0.2-8"; sha256="0cg88l1irqkx7d72sa5bfqcn5fb5rapvimi1gw15klci39w0s43q"; depends=[RCurl XML]; };
 rngSetSeed = derive { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; };
-rngWELL = derive { name="rngWELL"; version="0.10-3"; sha256="1wijscc0s6h1ipc1r8h179y94s1bzf409xlpiyr1njaxvvvpwvw1"; depends=[]; };
+rngWELL = derive { name="rngWELL"; version="0.10-4"; sha256="0ayrkd2yllsgl7iqqbhiyrnyyqk13f4wh1np23iz0zj650yjqdq8"; depends=[]; };
 rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[digest pkgmaker stringr]; };
 rngwell19937 = derive { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
 rnoaa = derive { name="rnoaa"; version="0.4.2"; sha256="14fd1mp7ydpqj0wqr3nyysks36dj7bmcyirpsbrn6pjjdasn6a0s"; depends=[dplyr ggplot2 httr jsonlite lubridate rgdal scales tidyr XML]; };
@@ -5775,12 +5899,12 @@ robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7
 robustDA = derive { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; };
 robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
 robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; };
-robustbase = derive { name="robustbase"; version="0.92-4"; sha256="0dyz2wwfjq8bjjwi4fhm6v3sxmlh34bawppakl4l6dv7vpjsv85k"; depends=[DEoptimR]; };
+robustbase = derive { name="robustbase"; version="0.92-5"; sha256="0wsdgqbkr0amid71q52cij9wnyss2sh1fm75g8cp4d6dndh327rl"; depends=[DEoptimR]; };
 robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
 robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; };
-robustlmm = derive { name="robustlmm"; version="1.7-2"; sha256="0cwr5fsl3m78xvfv3cy6n82zsdwsyq2zrlnzdppba9ja6hnh32wm"; depends=[ggplot2 lattice lme4 Matrix nlme robustbase xtable]; };
+robustlmm = derive { name="robustlmm"; version="1.7-4"; sha256="0c9syqz1hbwwc9kfnsc1f321zy76q9c0rxgb9j1ac33sp5w5g88c"; depends=[ggplot2 lattice lme4 Matrix nlme robustbase xtable]; };
 robustloggamma = derive { name="robustloggamma"; version="0.4-31"; sha256="19ycdvpzns46gjnkddwznnszs0941blpss7l0cqligv91cz7bkjc"; depends=[robustbase]; };
-robustreg = derive { name="robustreg"; version="0.1-7"; sha256="1nrz10065mwccil78c74vmkhinskpnk1vyp1ikrdw23vyk2l00nc"; depends=[Matrix Rcpp RcppArmadillo]; };
+robustreg = derive { name="robustreg"; version="0.1-8"; sha256="0ankpqdnjl5w3w73h6gp78klkjk43xjzhv8wv3vffdsr2fbpl8js"; depends=[Matrix Rcpp RcppArmadillo]; };
 robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; };
 rocc = derive { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
 rockchalk = derive { name="rockchalk"; version="1.8.92"; sha256="1mi1w8323m4q0s17cnafnlswgnlxqb5c9nq3rv8fq77k7klmq5rz"; depends=[car lme4 MASS tables]; };
@@ -5792,6 +5916,7 @@ ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177
 rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[ggplot2 gridExtra Rglpk]; };
 rotationForest = derive { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; };
 rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
+rotl = derive { name="rotl"; version="0.4.1"; sha256="1f5x2adlv7fbz0w4bwc7q69wq20rlx5scyzl1immkxgs27was4l1"; depends=[ape httr jsonlite rncl]; };
 roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; };
 rowr = derive { name="rowr"; version="1.1.2"; sha256="1hvj17n3fy1jaaz551s1icjv1kgr2s22xvg4fllzs8hpgdsybp1j"; depends=[]; };
 roxygen2 = derive { name="roxygen2"; version="4.1.1"; sha256="0qr562p3jb9kqim6mj344956pikmq1137gv1p086b4k90h5c3wyd"; depends=[brew digest Rcpp stringr]; };
@@ -5802,11 +5927,12 @@ rpart_plot = derive { name="rpart.plot"; version="1.5.2"; sha256="0aw0bhd0bliih7
 rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
 rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
 rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
+rpca = derive { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; };
 rpf = derive { name="rpf"; version="0.45"; sha256="1d22wjhv14rl16kljn42j4hba30x28zd5svddrpxp1kraxjq5mn7"; depends=[mvtnorm RcppEigen]; };
 rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[RApiSerialize Rcpp uuid]; };
 rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
-rplexos = derive { name="rplexos"; version="1.1.1"; sha256="1s3srk5f1ciy43vblwsy7wrwp2k2j5q52dfl4vjg69i63bh9yrpf"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
-rplos = derive { name="rplos"; version="0.5.0"; sha256="1ajwm413w7p41ifrp4flskgaqilrs3shzjbb2wnmwgwcnnkw43h9"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; };
+rplexos = derive { name="rplexos"; version="1.1.4"; sha256="1q9vlxhglmrwxh9g4wq98nc321kq7jhgkykp9hwl3bd26a1jcfjp"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
+rplos = derive { name="rplos"; version="0.5.2"; sha256="0h8i6payk5yg0sxn07zw10jrbkf9pac6ljmkj6jsy681wirp20gg"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; };
 rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
 rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
 rprime = derive { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; };
@@ -5830,7 +5956,7 @@ rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl
 rscala = derive { name="rscala"; version="1.0.6"; sha256="065ll2xza09hi05w4hq35jl6y1nvwrv93ld983nxaji81z9pfgzx"; depends=[]; };
 rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
 rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
-rsdmx = derive { name="rsdmx"; version="0.4-6"; sha256="0hsf0jkp31qfvl4pxaqxwz1fvwgmqld3rnbk9g29g5bqwld40syc"; depends=[plyr RCurl XML]; };
+rsdmx = derive { name="rsdmx"; version="0.4-7"; sha256="1k4imwcw720hwqshmnl6kx9p9rd7yvh3i85hhc3nr62g1i6ckzww"; depends=[plyr RCurl XML]; };
 rseedcalc = derive { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
 rsem = derive { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
 rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
@@ -5838,11 +5964,13 @@ rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k
 rsm = derive { name="rsm"; version="2.7-2"; sha256="0pn018n36h1xhhlsimggbfgfgl9nh5a49x8amkqy3drrnamjl577"; depends=[]; };
 rsml = derive { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr59cq5kczjsssw3yvc8a8lr39x"; depends=[rgl XML]; };
 rsnps = derive { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[httr jsonlite plyr RCurl stringr XML]; };
-rspa = derive { name="rspa"; version="0.1-7"; sha256="0hmdfj1cgy9fjfbrs8qvx79fkv5v1xr6vrwjp89lq0blhsnzn5k2"; depends=[editrules]; };
+rspa = derive { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; };
 rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; };
 rstackdeque = derive { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
+rstan = derive { name="rstan"; version="2.7.0-1"; sha256="0b26wp91rkzkpp50jv5n87nqxi8hvhkzy8zphsr10il98k3l52dq"; depends=[BH inline Rcpp RcppEigen StanHeaders]; };
 rstiefel = derive { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
-rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; };
+rstpm2 = derive { name="rstpm2"; version="1.2.2"; sha256="0mmawy16b8yvzm8d5rx3dbchs7ybr2s5v6clqg88jkrff7141i7m"; depends=[bbmle mgcv numDeriv Rcpp RcppArmadillo survival]; };
+rstream = derive { name="rstream"; version="1.3.3"; sha256="1fw9bm4ilrgbbgpwy4v483g1w1ag2yzh2p820vni14y649hi5r3f"; depends=[]; };
 rstudioapi = derive { name="rstudioapi"; version="0.3.1"; sha256="0q7671d924nzqsqhs8d9p7l907bcam56wjwm7vvz44xgj0saj8bs"; depends=[]; };
 rsubgroup = derive { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; };
 rsunlight = derive { name="rsunlight"; version="0.4.0"; sha256="0hmpmf0ma0bycb65bq18q4y78187y9rq0vsj2d8hdmkksvyqjviy"; depends=[httr jsonlite plyr stringr]; };
@@ -5852,21 +5980,21 @@ rtdists = derive { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk
 rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; };
 rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_methodsS3 R_oo]; };
 rtfbs = derive { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricxdmp1p59jl8fxawrh5jr83qpcxsks"; depends=[rphast]; };
-rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; };
+rtiff = derive { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
 rtkpp = derive { name="rtkpp"; version="0.8.6"; sha256="0alg3002q8mcqd55prmsa6hfwg0qfrv30aq5p85v094l8cl7qd8l"; depends=[Rcpp]; };
-rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[gstat sp]; };
-rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; };
+rtop = derive { name="rtop"; version="0.5-5"; sha256="05yygg85f981x2amf9y8nr4ymya3pkwlig8i1rf9b49jx11h5w8j"; depends=[gstat sp]; };
+rts = derive { name="rts"; version="1.0-10"; sha256="0fvs82n8lxbm4n8w22ahx7j38xhaafwvr3sqr3lrfni2cs346pzs"; depends=[raster sp xts zoo]; };
 rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
 rucm = derive { name="rucm"; version="0.4"; sha256="1s3q6wfp9nb50rqsaq6h2wb48qvxncmlf8l4gm18pr25wkangfxq"; depends=[KFAS]; };
 rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
 runittotestthat = derive { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; };
 runjags = derive { name="runjags"; version="2.0.1-4"; sha256="1any5f7paf8a8yyvk594iixvh1l1dc87pil292sd1pq1lh2510lw"; depends=[coda lattice]; };
-ruv = derive { name="ruv"; version="0.9.5"; sha256="19n2zrbfg6kzks395iiv1wbz2zf1j25aap3iy3d8yspmasqxi93x"; depends=[]; };
+ruv = derive { name="ruv"; version="0.9.6"; sha256="12zi775nx6k1j9sz691x6r9r0arfnhwddf5nxbr1xk25dj9qa210"; depends=[]; };
 rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
 rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
 rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
 rvalues = derive { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; };
-rversions = derive { name="rversions"; version="1.0.1"; sha256="1qqar1cg8218dr4hp09629jx6yvwcnwxzp8grnqcmhbc5xyx76ch"; depends=[curl xml2]; };
+rversions = derive { name="rversions"; version="1.0.2"; sha256="0xmi461g1rf5ngb7r1sri798jn6icld1xq25wj9jii2ca8j8xv68"; depends=[curl xml2]; };
 rvertnet = derive { name="rvertnet"; version="0.3.0"; sha256="12gsd9p5v0kqdzrjksz10s54h3v3a79njahgajpz6qf3sm6f3jmj"; depends=[dplyr ggplot2 httr jsonlite maps plyr]; };
 rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr magrittr selectr XML]; };
 rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
@@ -5877,7 +6005,7 @@ ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3
 rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
 rzmq = derive { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; };
 s20x = derive { name="s20x"; version="3.1-16"; sha256="10z19q28wv3jnrs8lhban4a6hxqxgivcalq633p3hpa4zhw7nsj7"; depends=[]; };
-s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata mapproj maps]; };
+s2dverification = derive { name="s2dverification"; version="2.4.0"; sha256="18jj1b2a20x2yzcldjl571m42swrbj8md9hxlkdbgmv4w0zj27d1"; depends=[abind bigmemory GEOmap geomapdata mapproj maps ncdf4 plyr SpecsVerification]; };
 s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; };
 sBF = derive { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; };
 sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
@@ -5886,7 +6014,7 @@ sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrl
 sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
 saccades = derive { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
 sadists = derive { name="sadists"; version="0.2.1"; sha256="0m3rlbhgzl0xvx8bcaswbi9nsrgfhdmkywx7ynayl6q0lmslhk6a"; depends=[hypergeo orthopolynom PDQutils]; };
-sads = derive { name="sads"; version="0.2.1"; sha256="08rr3ixz6phrpdwpqk08sk8a5znggd84d7wc1zpm62kfppy0d2hc"; depends=[bbmle GUILDS MASS poilog VGAM]; };
+sads = derive { name="sads"; version="0.2.2"; sha256="03z404jn809cyhi2ybrhmxa7xhsygrjz9hal9s5ya1jkzc4261z4"; depends=[bbmle GUILDS MASS poilog VGAM]; };
 sae = derive { name="sae"; version="1.1"; sha256="1izww27cqd94yrfbszbzy44plznxsirzn0752ag7xw7qzm5ywp3d"; depends=[MASS nlme]; };
 sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
 saeSim = derive { name="saeSim"; version="0.7.0"; sha256="03zfw18fvx8blh9iijh3rnglg8zbsvd9dq3kqv6ajz3hwr90z29g"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
@@ -5909,7 +6037,8 @@ sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq
 sanon = derive { name="sanon"; version="1.4"; sha256="0zg0paiz3rb0fk2mgi8rlzqy9vq3afy5vx6s15k1xqz8rjgsbd1x"; depends=[]; };
 sapa = derive { name="sapa"; version="2.0-1"; sha256="11xgd2ijfz5yn0zyl5gfy97h2cxi1vyxkrijy2s9b78wm7fzpnkv"; depends=[ifultools splus2R]; };
 sas7bdat = derive { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
-saturnin = derive { name="saturnin"; version="1.0"; sha256="0686c0y6dcnr8jcx26pd4g08hmlalbid6idg465pngshr57kl79k"; depends=[]; };
+satellite = derive { name="satellite"; version="0.1.0"; sha256="0dfbxa7y5jbd1gcpdk0ahkfsfn1cpjfy58wnwk257j4c460inafl"; depends=[plyr raster Rcpp]; };
+saturnin = derive { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; };
 saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
 saws = derive { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
 sbgcop = derive { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
@@ -5924,7 +6053,7 @@ scam = derive { name="scam"; version="1.1-9"; sha256="1hx8y324bgwvv888d34wq0nnmq
 scape = derive { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; };
 scar = derive { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
 scatterD3 = derive { name="scatterD3"; version="0.1.1"; sha256="1xrs1a68x29fyzg6a3frr3nlapi1k6nk3ndg54fm6f54k8hvxdf3"; depends=[htmlwidgets]; };
-scatterplot3d = derive { name="scatterplot3d"; version="0.3-35"; sha256="1w0r7cyz01rzmgcf2x7wa4xs88ga6fd67wksyjyzrh2pdcbc56yx"; depends=[]; };
+scatterplot3d = derive { name="scatterplot3d"; version="0.3-36"; sha256="0bdxfdw23921h3rbpq0y4aixplzpkk95wgm2932kh0x7a4bnhswh"; depends=[]; };
 schoRsch = derive { name="schoRsch"; version="1.2"; sha256="1dz4mws227a5h3kkmpnz06liy9n3k01ihvcxxwnj8283w3b23bci"; depends=[]; };
 scholar = derive { name="scholar"; version="0.1.2"; sha256="1h1a6psgmiifi7p87ar3fr0mcfmg44yh4683dmqxrxrfcvgaxvca"; depends=[plyr R_cache stringr XML]; };
 schoolmath = derive { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
@@ -5933,19 +6062,20 @@ scidb = derive { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj
 scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
 sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; };
 score = derive { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
+scorer = derive { name="scorer"; version="0.1.0"; sha256="1qbcbhymagaqpcbysj33ncjz1kxg9ig0anrv7pl8s8m2kpqn4vmb"; depends=[]; };
 scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; };
-scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; };
+scout = derive { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; };
 scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; };
 scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
 scriptests = derive { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; };
 scrm = derive { name="scrm"; version="1.6.0-2"; sha256="1a3m56j4ca526mjhc7h0967k5bja336dw1bpna119l5yic6hkc1n"; depends=[Rcpp]; };
 scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp]; };
 scuba = derive { name="scuba"; version="1.8-0"; sha256="1hlgvbcx7xmpaaszyqvhdwvwmf8z209jkf6aap205l3xkkc692c4"; depends=[]; };
-sdPrior = derive { name="sdPrior"; version="0.2"; sha256="12aiddnwhlvvnh9f5jivrs4ml0g6hm9pg828xk39d8kzz43alwzg"; depends=[caTools GB2 MASS]; };
+sdPrior = derive { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; };
 sda = derive { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
 sdcMicro = derive { name="sdcMicro"; version="4.5.0"; sha256="1cz34g6si7f8kgybcvcsr0lkcspqp3vrkvfqsfdjd0mb8lv5pbjj"; depends=[brew car cluster data_table e1071 knitr MASS Rcpp robustbase sets xtable]; };
 sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[cairoDevice foreign gWidgets gWidgetsRGtk2 Hmisc sdcMicro vcd]; };
-sdcTable = derive { name="sdcTable"; version="0.18.1"; sha256="18l6d6q6pawvswj1v9mfmcg4m94dkp38yd2mnndz9l7qmvf6n7kx"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; };
+sdcTable = derive { name="sdcTable"; version="0.19.1"; sha256="00d2fi9z4n39waq90f6r4hpvhmz0w55nzaj9w0hmnmc9mr4z4p4p"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; };
 sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
 sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
 sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[fda MASS zoo]; };
@@ -5954,8 +6084,8 @@ sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj5559886
 sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; };
 sdprisk = derive { name="sdprisk"; version="1.1-3"; sha256="1rwzi112fjckzxmhagpg60qm9a35fqx8g8xaypxsmnml6q00ysiq"; depends=[numDeriv PolynomF rootSolve]; };
 sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
-sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; };
-seacarb = derive { name="seacarb"; version="3.0.6"; sha256="0xhyy8nd20f29j9y3x250fq8qp57gdv61gg4ck24v4jbl8qvwhla"; depends=[oce]; };
+sdwd = derive { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; };
+seacarb = derive { name="seacarb"; version="3.0.8"; sha256="0fhf5wqazhxahillgg2xpncb4n5yjvr02251wpb2v4s39v88a5yd"; depends=[oce]; };
 sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
 searchable = derive { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
 seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
@@ -5968,7 +6098,7 @@ secrlinear = derive { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1
 seedy = derive { name="seedy"; version="1.2"; sha256="1m800b2faaih4xjsl3jwrqd177jjygbvrf9mb1h84hdzy095b5c0"; depends=[]; };
 seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car sgeostat spatstat]; };
 seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; };
-seewave = derive { name="seewave"; version="2.0.1"; sha256="1xp3frkvzhd6qyp5f3y2w98p5j7adzgn5bj6gzs39cgwb3019zl9"; depends=[tuneR]; };
+seewave = derive { name="seewave"; version="2.0.2"; sha256="1dr2kldx85fbzawy5lp5z3044hsh72vdyirl15b12w8nrh2p1a5z"; depends=[tuneR]; };
 seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
 segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp]; };
 segmented = derive { name="segmented"; version="0.5-1.1"; sha256="0rkbhg8wwqk08jfd29sh4ifx427kmd4mfqrssllckha9hcglqhz7"; depends=[]; };
@@ -5977,7 +6107,7 @@ seismicRoll = derive { name="seismicRoll"; version="1.0.1"; sha256="1lls2gbx994j
 selectMeta = derive { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; };
 selectiongain = derive { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; };
 selectr = derive { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[stringr XML]; };
-selectspm = derive { name="selectspm"; version="0.1"; sha256="0bihyjaacpyjnm5vznix8krw2sqmy62in33hmb5yj4yidwz1gpv0"; depends=[ecespa spatstat]; };
+selectspm = derive { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; };
 selfea = derive { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; };
 selfingTree = derive { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
 sem = derive { name="sem"; version="3.1-6"; sha256="1gx0j3ignpmgy3qvnp0qjmhlzbxj0wjfr6jfs9d29cnq8b38p73c"; depends=[boot DiagrammeR MASS matrixcalc mi]; };
@@ -6037,7 +6167,7 @@ shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbz
 shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[MASS rgl scatterplot3d]; };
 sharpshootR = derive { name="sharpshootR"; version="0.7-2"; sha256="04plsgmyil6znmcqx2j78n2vjj4y4mprb3wqbhwagapdhvp9rcis"; depends=[ape aqp circular cluster Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
 sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[dclone dcmle Formula]; };
-shiny = derive { name="shiny"; version="0.12.1"; sha256="041illlgpw47y88razd77xj8q2h3brf582bhh8p8mmn7rn2af0mc"; depends=[digest htmltools httpuv jsonlite mime R6 xtable]; };
+shiny = derive { name="shiny"; version="0.12.2"; sha256="0hdgvqsg0s7va55z2pf76898fslcnghpcjvwsqlfw2q441h7dkh9"; depends=[digest htmltools httpuv jsonlite mime R6 xtable]; };
 shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
 shinyBS = derive { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
 shinyFiles = derive { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0yh17ap20bmwxa4bsan3h6bicrxzanl2dlwp8kvr"; depends=[htmltools RJSONIO shiny]; };
@@ -6045,7 +6175,7 @@ shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk6
 shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
 shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
 shinydashboard = derive { name="shinydashboard"; version="0.5.0"; sha256="1q2g0vdid14id489ybfhf6x67bmc4g2zhamw3vx9piqvdlfmnqg5"; depends=[htmltools shiny]; };
-shinyjs = derive { name="shinyjs"; version="0.0.7.0"; sha256="0yrv7qy7wbsi45gqia3vl0s7mi758j7qbkmh2hdbfs0aj7jxgr7y"; depends=[shiny]; };
+shinyjs = derive { name="shinyjs"; version="0.0.8.3"; sha256="0dd20p3j4yk9q6846s1ykxvp94kp06nykxrq29nhba8jgf9gm2g0"; depends=[shiny]; };
 shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; };
 shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; };
 shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
@@ -6062,7 +6192,7 @@ sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg
 sig = derive { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
 sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
 sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; };
-signal = derive { name="signal"; version="0.7-5"; sha256="0v6zmy25ikkrc2ravaj7k1qzxm3zdvj6g0d55lkyjv7pb3kl5m1k"; depends=[MASS]; };
+signal = derive { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; };
 signalHsmm = derive { name="signalHsmm"; version="1.3"; sha256="0hx389ibk473mfycc8sj96ppz9hri4x9ni05fv32zvzxy8b9i9jv"; depends=[biogram Rcpp seqinr shiny]; };
 signmedian_test = derive { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
 simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
@@ -6090,7 +6220,7 @@ sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz
 sirt = derive { name="sirt"; version="1.8-9"; sha256="19kkn2a18kpv6vk45xbi3662mfbmcrz06aq994fzynar2nbix3f0"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm psych qgraph Rcpp RcppArmadillo semPlot sfsmisc sm survey TAM]; };
 sisVIVE = derive { name="sisVIVE"; version="1.1"; sha256="1p1l07pgd88ap3bp0zwinnzda07pfg6cn92ync2pkqn5l0gmfxbs"; depends=[lars]; };
 sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
-sitar = derive { name="sitar"; version="1.0.2"; sha256="0z9r3z512s0gpkcpdbi45qdl40rp4jacpm9k0c5pjilwiga6p07z"; depends=[nlme quantreg]; };
+sitar = derive { name="sitar"; version="1.0.3"; sha256="194jyd93h811bvscxklx5cm3vjk9xl8ixmrim49nzrwckdrzfnm0"; depends=[nlme quantreg]; };
 sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
 sivipm = derive { name="sivipm"; version="1.0-0"; sha256="1r548kfsi90rzisx37nw3w9vwj3gs4ck5zhwlskbdzgigb78spfp"; depends=[seqinr]; };
 sjPlot = derive { name="sjPlot"; version="1.8.2"; sha256="1fnqsayg31gk0qggs3024i4nrdardfqqsyggf8l8c6zamcx680fa"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; };
@@ -6105,10 +6235,10 @@ sla = derive { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3n
 slackr = derive { name="slackr"; version="1.2"; sha256="1ymj3x52wyp0mp41xnnycg0vhdmv8whimwk1hzfsqr30pccnvn9j"; depends=[data_table ggplot2 httr jsonlite]; };
 slam = derive { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; };
 sld = derive { name="sld"; version="0.3"; sha256="18xj57v9gg78d894cr1h6wp10i05hrnmwhmq6yh6211kdyj9ljp1"; depends=[lmom]; };
-slfm = derive { name="slfm"; version="0.1"; sha256="0s5q6ank6075sls9pkqhf7jlvi6gyvsbxa99c34d6ccrv88skyzq"; depends=[coda Rcpp RcppArmadillo]; };
+slfm = derive { name="slfm"; version="0.2.0"; sha256="0hchwxhbq2ca50gbc8qjcjksdx3d3ms0bzqc00hyrakrf7bn0qkp"; depends=[coda lattice Rcpp RcppArmadillo]; };
 slp = derive { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pgpvn3cv51mr729c9ccr6jdjb1"; depends=[mgcv]; };
 sm = derive { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
-smaa = derive { name="smaa"; version="0.2-3"; sha256="1vabxxyz2k10sbvrzdf51jlh59zlkjdq82vblk5s37ddmzgwnif9"; depends=[]; };
+smaa = derive { name="smaa"; version="0.2-4"; sha256="1rp0hib79x1rf2v5h1d2gp6ixq7r8v33qy5bz5sfphi94xwasm7l"; depends=[]; };
 smac = derive { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; };
 smacof = derive { name="smacof"; version="1.6-2"; sha256="10yg4dxyv08wq1a74jac6jnmzhbjm6qip3vg5ca06w5pqk6lbdgn"; depends=[colorspace Hmisc nnls polynom rgl scatterplot3d]; };
 smacpod = derive { name="smacpod"; version="1.1.1"; sha256="1pmgxvww24mcgrvv87axqvw457r5wl57scqy93inmzia2mgyva1p"; depends=[spatstat]; };
@@ -6130,18 +6260,19 @@ smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h
 smnet = derive { name="smnet"; version="2.0"; sha256="0jd574cjkylcrlnlnw859f4vwadi1v955m2lb5z3w3gdpv0lbx3p"; depends=[DBI igraph RSQLite spam SSN]; };
 smoof = derive { name="smoof"; version="1.0"; sha256="10yvx5lr73kzjk7xn4jy97yzvv8qilrp7ilvk0fg5hyimbwlz13s"; depends=[BBmisc checkmate emoa ggplot2 ParamHelpers plot3D RColorBrewer]; };
 smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; };
-smoothSurv = derive { name="smoothSurv"; version="1.5-2"; sha256="07yr97nzp4mfj37v9sr37dgriq0a7kbmsj0n3lmxrzfjhinwnhij"; depends=[survival]; };
+smoothSurv = derive { name="smoothSurv"; version="1.6"; sha256="1s25gpih0nh8waw4r3iw53n3rc44mlzixkh4i2cykbg5rdrs8pnf"; depends=[survival]; };
 smoother = derive { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
 smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
 smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
 smoothtail = derive { name="smoothtail"; version="2.0.4"; sha256="0wbz9r9a7a3pjkdrsxhkjfm2qrbz4jrpsx4s1vm3kz7czkh55yg7"; depends=[logcondens]; };
 sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; };
 smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; };
-sn = derive { name="sn"; version="1.2-2"; sha256="1fsl2qjgk7lcjxszdfs7s159qwy6gyg7bsxpfg0l5rcf2mlbwf8m"; depends=[mnormt numDeriv]; };
+sn = derive { name="sn"; version="1.2-3"; sha256="0m3177c5jcf3avzmjc2aqrv0s5sdczj2n4xm39rhss1kxpcwxy0s"; depends=[mnormt numDeriv]; };
 sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
 snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
 snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv plyr reshape zoo]; };
 snipEM = derive { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; };
+snn = derive { name="snn"; version="1.0"; sha256="0pln5kxm7sqwp6zj158lyrkn49p8v26wkqpsxzin5hk5rxjz0jmf"; depends=[]; };
 snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; };
 snowFT = derive { name="snowFT"; version="1.4-0"; sha256="0gw2kn80jh1a6sg6ni9kj6ikvyq29c9dmx52k9m6gzcfpa7l0qbk"; depends=[rlecuyer snow]; };
 snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; };
@@ -6151,7 +6282,7 @@ snpRF = derive { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025
 snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; };
 snpar = derive { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; };
 snplist = derive { name="snplist"; version="0.13"; sha256="1v9n3gdvygx4s6hlm0ijyw04szxwn9c1dqnhaqn61a8yfkmmnxn8"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; };
-sns = derive { name="sns"; version="1.0.0"; sha256="0qr5gj095xg48mqj7maz1m1zizx1jdjca8qygygqvak1b7nl4ccs"; depends=[coda mvtnorm]; };
+sns = derive { name="sns"; version="1.1.0"; sha256="1pppf1h39kv8jjngkcrq091ldzz3knjgcn81gfg7y54yndb2mapr"; depends=[coda mvtnorm numDeriv]; };
 soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ellipse ggplot2 gridExtra scales]; };
 softImpute = derive { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; };
 softclassval = derive { name="softclassval"; version="1.0-20150416"; sha256="1zrf0nmyy4pfs4dzardghzznw1ahl21w4nykfh2pp8il4dpi21fs"; depends=[arrayhelpers svUnit]; };
@@ -6160,7 +6291,7 @@ soilDB = derive { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs
 soilphysics = derive { name="soilphysics"; version="2.4"; sha256="0mxh9jv7klk85zb30agg9c60d0y6v7rxapmvmmkc985ih94r5685"; depends=[MASS rpanel]; };
 soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
 soiltexture = derive { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[MASS sp]; };
-soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; };
+soilwater = derive { name="soilwater"; version="1.0.2"; sha256="0rkyh7rcaapp1bxih88ivbaqnrig9jy32694jbg8z04b115hmdpm"; depends=[]; };
 solaR = derive { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[lattice latticeExtra RColorBrewer zoo]; };
 solarius = derive { name="solarius"; version="0.2.3"; sha256="164va71v77b0lyhccgrb47idhi7dlgyyw1vbs2iqci77ld6x50yl"; depends=[data_table ggplot2 plyr]; };
 solr = derive { name="solr"; version="0.1.4"; sha256="0b1f6mf8fi2ql8j06b0mkk7nyy5wj1zsg46lfxi6bp8n4ywbym9n"; depends=[assertthat httr plyr rjson XML]; };
@@ -6185,7 +6316,7 @@ spBayes = derive { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x
 spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[coda Rcpp RcppArmadillo survival]; };
 spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; };
 spTDyn = derive { name="spTDyn"; version="1.0"; sha256="0yrnbf9g1n1hrrra2vp6412wfky1bhy3b6raif9k82xvi9p9m6pz"; depends=[coda sp]; };
-spTest = derive { name="spTest"; version="0.1.0"; sha256="0asfgf0dx72025q41ndzgwm2n471lwha7bcc1dfk3zwib75w3lgl"; depends=[]; };
+spTest = derive { name="spTest"; version="0.1.1"; sha256="0bzj5vmb4bwqi8f75f21pwrdi1n4zgq7xandh3dzsq2dahnrmhzh"; depends=[]; };
 spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; };
 spTimer = derive { name="spTimer"; version="2.0-0"; sha256="0ldby68p4y5cz5dj2m33jcbgd3mw9nv0py4llg8aj10bxylarmfv"; depends=[coda sp]; };
 spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
@@ -6202,8 +6333,8 @@ spanel = derive { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi0
 spanr = derive { name="spanr"; version="1.0"; sha256="1x29hky347kvmk9q75884vf6msgcmfi3w4lyarq99aasi442n1ps"; depends=[plyr stringr survival]; };
 sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
 sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
-spareserver = derive { name="spareserver"; version="1.0.0"; sha256="0vaql5v3337xh1ifjziav3v7fkjff4zhrz557mgy75ham554gs7c"; depends=[assertthat httr pingr]; };
-spark = derive { name="spark"; version="1.0.0"; sha256="0ryc7kq3hx8nd5m999p1y7lxli6x862y6hqpv8xwpqak0y863p6m"; depends=[magrittr]; };
+spareserver = derive { name="spareserver"; version="1.0.1"; sha256="094q5i6v4v37hzfdyps8zni394z312r802hl04jw0xzzps922rq4"; depends=[assertthat httr pingr]; };
+spark = derive { name="spark"; version="1.0.1"; sha256="03viih0r7bpv6zkm5ckk0c99lf2iv0fkgrzkbs1gg7ki9qyxji8c"; depends=[magrittr]; };
 sparkTable = derive { name="sparkTable"; version="1.0.0"; sha256="1d5vv7whayblq5g4pjrngkqf3d1pi4f0gibnskllv7rdad10n4nd"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; };
 sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
 sparr = derive { name="sparr"; version="0.3-6"; sha256="1imgph2bf575rm06l4vsz0nhizkrwa3p5j6b6gdn30l0hlhxjp0j"; depends=[MASS rgl spatstat]; };
@@ -6215,6 +6346,7 @@ sparseMVN = derive { name="sparseMVN"; version="0.2.0"; sha256="12g387bvpy4249kw
 sparseSEM = derive { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; };
 sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[bdsmatrix corpcor mvtnorm]; };
 sparsenet = derive { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; };
+sparsereg = derive { name="sparsereg"; version="1.0"; sha256="14v2dmvvs9h59ba0z3nd0mh82g1sr1lgfx87b8lrfbi3h26n0207"; depends=[coda ggplot2 glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; };
 spartan = derive { name="spartan"; version="2.2.1"; sha256="1syrvx3gmgsi3f49j27zg59b3i29v20352qbsc5mrqnwh5lawi1y"; depends=[]; };
 spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; };
 spate = derive { name="spate"; version="1.4"; sha256="1cr63qm3hgz6viw6ynzjv7q5ckfsan7zhbp224gz4cgx5yjg0pn3"; depends=[mvtnorm truncnorm]; };
@@ -6230,7 +6362,7 @@ spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyi
 spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
 spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
 spatstat = derive { name="spatstat"; version="1.42-2"; sha256="1wsdxl711p4vhaz69if1whjfrj81xkr6d2piw5hz0l04c6dcbac9"; depends=[abind deldir goftest Matrix mgcv polyclip tensor]; };
-spatsurv = derive { name="spatsurv"; version="0.9-9"; sha256="1zvf8n4isaxi8n47qvgw6zqrgsnf3g6jpm19k6w6zbp9v5r8fw7r"; depends=[fields geostatsp iterators Matrix RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
+spatsurv = derive { name="spatsurv"; version="0.9-10"; sha256="0hfdmp206rw6lgdlmkasl7l1hq1avwnp726cw2fzhrbp88a1s2jm"; depends=[fields geostatsp iterators Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
 spc = derive { name="spc"; version="0.5.1"; sha256="1299lhk8snrhm7xpq0ccmq5kmpapc13rxcyvljs4c7frj645rwz4"; depends=[]; };
 spca = derive { name="spca"; version="0.6.0"; sha256="156bz3w3999vhjpsa9cs21rf2r9hv49vw1pfak0r37kbvf2d4rm6"; depends=[MASS]; };
 spcadjust = derive { name="spcadjust"; version="0.9"; sha256="05w32bznv6s5jwwv4l1392zng6ia36205j88d0i6l9hcbp2g599a"; depends=[]; };
@@ -6239,10 +6371,12 @@ spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0
 spcr = derive { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; depends=[]; };
 spd = derive { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; };
 spdep = derive { name="spdep"; version="0.5-88"; sha256="1m2bxbf472xq7wr76znjirslx3hb1ylk6lp7x5003ka3i2zpakxn"; depends=[boot coda deldir LearnBayes MASS Matrix nlme sp]; };
-spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[animation deSolve raster]; };
+spduration = derive { name="spduration"; version="0.13.1"; sha256="13z7ykrb84smnjhabq6h7mxva16r44hx9c6kgjy91xypz1ynk26f"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
+spdynmod = derive { name="spdynmod"; version="1.1"; sha256="09lc8gyp9nw3w1vcid19q064plga7v99h8nfmg57i76dpny3s9ys"; depends=[animation deSolve raster]; };
 spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
 speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[MassSpecWavelet]; };
 speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
+speciesgeocodeR = derive { name="speciesgeocodeR"; version="1.0-3"; sha256="0iyll1w91mfxh4lbddmwlvvrxpchkh2pknh37idpsv5k8mvbyby6"; depends=[maps maptools raster sp]; };
 specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; };
 spectral_methods = derive { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; };
 spectralGP = derive { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
@@ -6259,7 +6393,7 @@ sphet = derive { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh
 spi = derive { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; };
 spider = derive { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; };
 spiders = derive { name="spiders"; version="1.0"; sha256="1n3ym9vc3vzjzm35z29sz4mz8sa25r761y0ph45srhq0lv7c66w6"; depends=[plyr]; };
-spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-8"; sha256="0h9b3hhnsqbxbxww7jhbkqf1wl72q347naxpjjbz3q5p2y8yli4z"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
+spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-9"; sha256="04xlin61hfq9j9q4wvpkzmc189cpq4jp5cdn3kz64skzlsc5yj2z"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
 spikeslab = derive { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
 splancs = derive { name="splancs"; version="2.01-37"; sha256="0q548i76107laa9yrsjxqvwhl8zyhlib557qqr8aa7kjg6j0p5fn"; depends=[sp]; };
 splitstackshape = derive { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; };
@@ -6277,6 +6411,7 @@ sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha
 sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; };
 sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[cvTools ggplot2 pcaPP reshape2]; };
 sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
+spsann = derive { name="spsann"; version="1.0.1"; sha256="0hdanihvcwmqsjsc2hinxwdmkkxyvv8qa9sp25mb9vf8ky3w4msm"; depends=[pedometrics Rcpp sp SpatialTools]; };
 spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; };
 spsurvey = derive { name="spsurvey"; version="3.0"; sha256="15i10a6hhk1wwnyd4lbrqaql8i4s10302bxmpr0s5cyifs084l77"; depends=[deldir foreign MASS rgeos sp]; };
 spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
@@ -6285,7 +6420,7 @@ spuRs = derive { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn4
 sqldf = derive { name="sqldf"; version="0.4-10"; sha256="0n8yvrg3gjgbc3vzq0vlf7fwhgm28kwf0jv25qy44x21n6fg11h7"; depends=[chron DBI gsubfn proto RSQLite]; };
 sqliter = derive { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; };
 sqlutils = derive { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; };
-squash = derive { name="squash"; version="1.0.6"; sha256="16iplngzzlif999z821a9bwx9jlmikdvwnk6p6d9w75b1fsbc0pz"; depends=[]; };
+squash = derive { name="squash"; version="1.0.7"; sha256="1wdnzagibh9fz7a3x6m4ixckh7493shvwxg7cn5kpnfzf8m1imyj"; depends=[]; };
 sra = derive { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
 srd = derive { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[animation colorspace plyr stringr survival]; };
 ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[gtools lubridate plyr r4ss reshape2]; };
@@ -6312,7 +6447,7 @@ stackoverflow = derive { name="stackoverflow"; version="0.1.2"; sha256="1psw96is
 stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; };
 stagePop = derive { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; };
 stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
-stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; };
+stargazer = derive { name="stargazer"; version="5.2"; sha256="0nikfkzjr44piv8hng5ak4f8d7q78f2znw2df0gy223kis8q2hsd"; depends=[]; };
 startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; };
 stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[digest filehash]; };
 statar = derive { name="statar"; version="0.3.0"; sha256="0ynvabdyp5vy90gz7c9ywbdyg8dp4vmmz2zjd7z8b5jjk0f8xsf1"; depends=[data_table dplyr ggplot2 lazyeval matrixStats proto stargazer stringr tidyr]; };
@@ -6321,8 +6456,8 @@ statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922c
 statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
 stationaRy = derive { name="stationaRy"; version="0.3"; sha256="151hsda3j8ii40v5z6nh6ypahrl0b2zlfdii75xlrpwryb7n3cq6"; depends=[downloader dplyr plyr readr]; };
 statmod = derive { name="statmod"; version="1.4.21"; sha256="138lh9qa25w6vaksbq43iqisj4c8hvmkjc3q81fn7m8b7zlnz6da"; depends=[]; };
-statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[ergm ergm_count latentnet network networkDynamic sna statnet_common tergm]; };
-statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1pyf6wfb86dwz6bkjli5qw6yz6dvlxwp5bpgkpg83aa9n7g"; depends=[]; };
+statnet = derive { name="statnet"; version="2015.6.2"; sha256="0dvkiz7i5ljnbs6qxz4a2v4rqynn2fi4wy4vd1hqhf4kpkj0amna"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
+statnet_common = derive { name="statnet.common"; version="3.2.3"; sha256="0z1nnav5kfjj5a54c7l8fingi3f4cm0nhlyyrwabxg98rydwxldm"; depends=[]; };
 statnetWeb = derive { name="statnetWeb"; version="0.3.4"; sha256="1nkis4l6yzpjcwxryskqfjgc2naxplzjc3gpp6xvpl0pcvw9mdk7"; depends=[ergm network RColorBrewer shiny sna]; };
 stcm = derive { name="stcm"; version="0.1.1"; sha256="05p0lp0p1mgcsf3mi3qgx42pgpv04m5wfmqa14gp63ialkl9pgx5"; depends=[caret dendextend ggplot2 magrittr plyr QCA randomForest XML]; };
 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
@@ -6335,11 +6470,12 @@ stheoreme = derive { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq
 stilt = derive { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; };
 stima = derive { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; };
 stinepack = derive { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; };
-stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh49a8ib263bzvjaqpi70mck49p"; depends=[glmnet lda Matrix matrixStats slam stringr]; };
-stmCorrViz = derive { name="stmCorrViz"; version="1.1"; sha256="03bjxil8v4ixgbabg2gq78xgqy4s3wh89hq1z5598gxysz12z3ji"; depends=[jsonlite stm]; };
+stm = derive { name="stm"; version="1.1.0"; sha256="0j1mgi584b28g3c0ai56fr1gks1kbd0s18xl7jbxndfiprk8q8f4"; depends=[glmnet lda Matrix matrixStats Rcpp RcppArmadillo slam stringr]; };
+stmBrowser = derive { name="stmBrowser"; version="1.0"; sha256="0jfh0c835a2sxn2cqlmwdlzj2g2dmkfl2z3pkv4fc1ajggw2n7g2"; depends=[httr jsonlite rjson stm]; };
+stmCorrViz = derive { name="stmCorrViz"; version="1.2"; sha256="0mhwl64hv4hjq72mqnvc5ii94aibmc0fw5rmdrvsad4bj6gg67p3"; depends=[jsonlite stm]; };
 stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[coda fields Matrix truncnorm]; };
 stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
-stochvol = derive { name="stochvol"; version="1.1.3"; sha256="077pky9k2cvakm4ap38hby8xdjc4d7b20qndyy2skk1622kmr0w6"; depends=[coda Rcpp]; };
+stochvol = derive { name="stochvol"; version="1.2.0"; sha256="10j6iz0nrcmy79b2ns1zszb8w7x2jc85sfj8xaf57j7z4f3n98ff"; depends=[coda Rcpp RcppArmadillo]; };
 stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
 stocks = derive { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; };
 stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
@@ -6357,7 +6493,7 @@ streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23x
 stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan MASS numDeriv]; };
 stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
 stringdist = derive { name="stringdist"; version="0.9.2"; sha256="13cwp2ic4v48r6h1gjbb1kn4m88d69z7wnhwyxsh64lqlhaz1xsm"; depends=[]; };
-stringgaussnet = derive { name="stringgaussnet"; version="1.0"; sha256="11pkvbq2lddwhrwrpspqhjkma4ixl9hv8w7m4jrnlx8dkabibw25"; depends=[AnnotationDbi biomaRt httr igraph limma pspearman RCurl RJSONIO simone VennDiagram]; };
+stringgaussnet = derive { name="stringgaussnet"; version="1.1"; sha256="161fi78cd7yddbcq71z3fgx1q2sacg1n1ggrkrqz17icwzviqrh5"; depends=[AnnotationDbi biomaRt httr igraph limma pspearman RCurl RJSONIO simone VennDiagram]; };
 stringi = derive { name="stringi"; version="0.5-5"; sha256="183wrrjhpgl1wbnn9lhghyvhz7l2mc64mpcmzplckal7y9j7pmhw"; depends=[]; };
 stringr = derive { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[magrittr stringi]; };
 strucchange = derive { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; };
@@ -6369,14 +6505,14 @@ stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2
 stylo = derive { name="stylo"; version="0.5.9"; sha256="061nfjh932qjlzvnarpwvzar0qv7ij8l6m3iax1jilygzhfqfyin"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
 suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
 subgroup = derive { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
-subplex = derive { name="subplex"; version="1.1-4"; sha256="0c6y5ibyxh0mpn77f7kwrmkpb3mah10hbqhwqmz4i1lfv58mb4zk"; depends=[]; };
+subplex = derive { name="subplex"; version="1.1-6"; sha256="0camqd0n468h93jxvvcnclki66glr39rb87nvrkrbiklbqd0s1fp"; depends=[]; };
 subrank = derive { name="subrank"; version="0.9.1"; sha256="0ghfpvw7aflbnnisn3rq8vrpi134ghm6vnyb7md1gi730mqgxfxv"; depends=[]; };
 subselect = derive { name="subselect"; version="0.12-5"; sha256="00wlkj6p0p2x057zwwk1xdvji25yakgagf98ggixmvfrk1m1saa4"; depends=[]; };
 subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; };
 subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
 sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
-sudokuAlt = derive { name="sudokuAlt"; version="0.1-4"; sha256="14jqwsp692dq0bfnk2i70qc42inb6jbissvp88c5r2cgzc1ry072"; depends=[]; };
-summarytools = derive { name="summarytools"; version="0.3"; sha256="1hhkhpyaj8sc62vap5s7ds0kmk1jiy6gdvsz65ynqy2qfz58c3ms"; depends=[htmltools pander rapportools rstudioapi xtable]; };
+sudokuAlt = derive { name="sudokuAlt"; version="0.1-6"; sha256="1x3h6si0g4k5xc327daa85k74qh3dqbql7b4ynmasrb5xpcnb92b"; depends=[]; };
+summarytools = derive { name="summarytools"; version="0.4"; sha256="1hf20fddi128jv083ljylwqg1ij39hyf6kdnzfxalczl9572wih9"; depends=[htmltools pander pryr rapportools rstudioapi xtable]; };
 supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; };
 supcluster = derive { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; };
 superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; };
@@ -6423,12 +6559,13 @@ svapls = derive { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22
 svcm = derive { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
 svd = derive { name="svd"; version="0.3.3-2"; sha256="064y4iq4rj2h35fhi6749wkffg37ppj29g9aw7h156c2rqvhxcln"; depends=[]; };
 svdvisual = derive { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
+svgPanZoom = derive { name="svgPanZoom"; version="0.2.0"; sha256="10ckz859c9wh09fjqxa6qfrfjk17f9nhkmvgcj1qfiasmp3qj2wk"; depends=[htmlwidgets]; };
 svgViewR = derive { name="svgViewR"; version="1.0.1"; sha256="1ggw5w5xjqp33z6nzszimcab3vkv4rliiilhcqbhppqlnhjb8nab"; depends=[]; };
 svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; };
 svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
 swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
-sweidnumbr = derive { name="sweidnumbr"; version="0.6.0"; sha256="1qdak16jnm436m7nlngarimlhx9sc6wwq9pfrcijq8240mh7xwa2"; depends=[lubridate stringr]; };
-swfscMisc = derive { name="swfscMisc"; version="1.0.3"; sha256="0ciwvxpafpc6an58r1ffkab8kj4np6l2kbpkijnqnfbf6cya0aim"; depends=[mapdata maps]; };
+sweidnumbr = derive { name="sweidnumbr"; version="0.6.1"; sha256="0fpbqh5ff54slmpvvyp02gwclz4p1rca3qfdb2xxn19sfiqx0wf7"; depends=[lubridate stringr]; };
+swfscMisc = derive { name="swfscMisc"; version="1.0.6"; sha256="14bbcn8xkc32nagi92sahdvfbgfd4v7pari1c004dz0qgxxcnz1h"; depends=[mapdata maps spatstat]; };
 swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[digest httr RCurl stringr testthat yaml]; };
 switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
 switchr = derive { name="switchr"; version="0.9.10"; sha256="02595b4mhhgm8j1abmk78z27fz27kr0mg01d7hf7n6yv6ybhn0qz"; depends=[]; };
@@ -6436,7 +6573,7 @@ switchrGist = derive { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4
 sybil = derive { name="sybil"; version="1.3.0"; sha256="1wprxwxyh5vzi263x1s7vdnyjgmyh3lha9ld2qqyjabrkg6wjzwg"; depends=[lattice Matrix]; };
 sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
 sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; };
-sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; };
+sybilSBML = derive { name="sybilSBML"; version="2.0.10"; sha256="0zw41lcq3b1qbs4ik7v3jjjqgm3hhi35mmxvq9vm78rrz1cz59b5"; depends=[Matrix sybil]; };
 sybilccFBA = derive { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[Matrix sybil]; };
 sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[MASS Matrix sybil]; };
 symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; };
@@ -6456,7 +6593,7 @@ syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj
 taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[plyr reshape2]; };
 taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[RCurl rgdal rgeos RJSONIO sp taRifx]; };
 tab = derive { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[gee survey survival]; };
-taber = derive { name="taber"; version="0.0.1"; sha256="1dqcsxl82s96rlw5jx8wzdvx351qd9jz6npfrhnwifr7vxhl2prd"; depends=[dplyr magrittr]; };
+taber = derive { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
 table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; };
 tableone = derive { name="tableone"; version="0.6.3"; sha256="0r91vzq3whz949kxg9q9bf413r41cxqsjvmicmb4najhwzhdr9fv"; depends=[e1071 gmodels]; };
 tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
@@ -6472,7 +6609,7 @@ tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdc
 taxize = derive { name="taxize"; version="0.6.0"; sha256="0zxlawj79l117hj3d93663xdzbkcq5gh6m090yfbvkzrb6a4rq3f"; depends=[ape bold data_table foreach httr jsonlite plyr RCurl reshape2 stringr Taxonstand XML]; };
 tbart = derive { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
 tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
-tcR = derive { name="tcR"; version="2.0"; sha256="05y3nbqdaxry7jwph6z2v8d2304xh791l0vviywyghrw7b2hqw9q"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 roxygen2 stringdist]; };
+tcR = derive { name="tcR"; version="2.1.1"; sha256="0lrw05n80110lwhms3gjbrh87rlsvib2hpfc1balf1wlrzd2ynj4"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 roxygen2 stringdist]; };
 tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
 tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[cluster mclust mvtnorm sn]; };
 tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; };
@@ -6499,10 +6636,11 @@ tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm2
 tfplot = derive { name="tfplot"; version="2015.4-1"; sha256="1qrw8x7pz7xcmpym3j1d095bhvy2s7znxplml1qyw5minc67n1mh"; depends=[tframe]; };
 tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; };
 tframePlus = derive { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; };
-tgcd = derive { name="tgcd"; version="1.4"; sha256="108i7kkfkpgavs8d2c6aih9winfqhin777jn5zfxzkjd6clj857i"; depends=[]; };
+tgcd = derive { name="tgcd"; version="1.5"; sha256="0yvb0yc5vwnd054lfgzwg96pvaf8q41x5f03ih3schrl32z3pvv6"; depends=[]; };
+tglm = derive { name="tglm"; version="1.0"; sha256="1gv33jq3bzd5wlrqjvcfb1ax258q9asawkdi64rbj18qp7fg2dbx"; depends=[BayesLogit coda mvtnorm truncnorm]; };
 tgp = derive { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; };
 tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
-thermocouple = derive { name="thermocouple"; version="1.0.0"; sha256="1pawk7aq27vc708xwz997pmxxhipw8449793zv6fw5aj47wcw1l5"; depends=[]; };
+thermocouple = derive { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; };
 thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; };
 threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
 threejs = derive { name="threejs"; version="0.2.1"; sha256="01zfv5lm11i2nkb876f3fg8vsff2wk271jqs6xw1njjdhbnnihs1"; depends=[base64enc htmlwidgets]; };
@@ -6522,6 +6660,7 @@ timeDate = derive { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg6
 timeROC = derive { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
 timeSeq = derive { name="timeSeq"; version="1.0.0"; sha256="1b7jcld1h3xsp3nl2nk9nqsgdg1pdi4m54hgsdlvivk9zzv3k6wr"; depends=[doParallel edgeR foreach gss lattice pheatmap reshape]; };
 timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadfs94xwn8578h8mw56wp923k0xfppzq69hcpcrhsvf"; depends=[timeDate]; };
+timedelay = derive { name="timedelay"; version="1.0.0"; sha256="0wqcc8kzgvn6bn7kclb3wnaibycg5hpcji9g1a66pj14fwdabny3"; depends=[]; };
 timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
 timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
 timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; };
@@ -6544,7 +6683,7 @@ tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rs
 tm = derive { name="tm"; version="0.6-2"; sha256="0q7plaqgc2ypihnz3dyjv2pwa0aimd4kv5i2z6m7aycc4wkmc7j4"; depends=[NLP slam]; };
 tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
 tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL NLP slam tm]; };
-tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.2"; sha256="1sgm9wnzlphl4qhc69nj5im4y1qs6b0vssmn5j98fbc3xlxiyzjx"; depends=[NLP tm XML]; };
+tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.3"; sha256="04sqaqmi00xm85732sk5iqv6ywfqh52qkkk0wv8xzqxwsixf3hyc"; depends=[NLP tm XML]; };
 tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; };
 tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[ISOcodes NLP tm XML]; };
 tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
@@ -6556,11 +6695,11 @@ tmle_npvi = derive { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh
 tmod = derive { name="tmod"; version="0.19"; sha256="0wnj2dfp3jjvr8xl43kw86b3xgqd1662zjagzb9ayznx5vi2k5zb"; depends=[beeswarm pca3d tagcloud XML]; };
 tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[gmm Matrix mvtnorm]; };
 tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; };
-toOrdinal = derive { name="toOrdinal"; version="0.0-1"; sha256="1rr6liw0krzdarc9gd406mf242n3hl38bn52xphr1g0riq5y2m4q"; depends=[]; };
+toOrdinal = derive { name="toOrdinal"; version="0.0-4"; sha256="0vvdz9l4sl7nlq6y93c65gbwssisrp3a9sp021g2l0rli00zq9q1"; depends=[]; };
 tolerance = derive { name="tolerance"; version="1.1.0"; sha256="1mrgvrdlawrmbz8bhq9cxqgn4fxvn18f1gjf9f9s8fvfnc4nda96"; depends=[rgl]; };
 topicmodels = derive { name="topicmodels"; version="0.2-2"; sha256="1nk3jgibs881isaadawyc377f4491af97jaqywc0z905wkzi008r"; depends=[modeltools slam tm]; };
 topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
-topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[fields graph gRbase qpgraph]; };
+topologyGSA = derive { name="topologyGSA"; version="1.4.5"; sha256="1v6plj7v0i5fr6khl0ls34xc0hfd61cpabqpw5s1z3mqmqnma56a"; depends=[fields graph gRbase qpgraph]; };
 topsis = derive { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
 tosls = derive { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
 tourr = derive { name="tourr"; version="0.5.4"; sha256="11xg5slvx7rgyzrc0lzandw7vr7wzk3w2pplsnyrqq3d990qp40d"; depends=[]; };
@@ -6574,15 +6713,16 @@ traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9n
 traits = derive { name="traits"; version="0.1.0"; sha256="0xn4jznf4fvm7d6yinyw8viik9gdnfskcgavwdb7r9als4qxqs58"; depends=[data_table dplyr httr jsonlite taxize XML]; };
 traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
 trajectories = derive { name="trajectories"; version="0.1-3"; sha256="1lk2mxfsf8x8idhb4dcj9lqvkjwm2yarvjid42xr2a9wwylvz9vq"; depends=[lattice sp spacetime]; };
+transcribeR = derive { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; };
 translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
 translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
 translateSPSS2R = derive { name="translateSPSS2R"; version="1.0.0"; sha256="11qnf44aq0dykcsv29faa9r4fcw9cc9rkgczsqx3mngvg3bilada"; depends=[car data_table e1071 foreign Hmisc plyr stringr tidyr zoo]; };
 translation_ko = derive { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
 transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; };
 trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
-treatSens = derive { name="treatSens"; version="1.1"; sha256="1h49idgv3rsday8xdj3rfqflj42ya9i5sg7cm1026arff1yqxxz8"; depends=[]; };
+treatSens = derive { name="treatSens"; version="2.0"; sha256="0maf9r35yixar1gb56z5h4v7al7qbh3a043ygx1y685smpwbj4vq"; depends=[dbarts]; };
 tree = derive { name="tree"; version="1.0-36"; sha256="0kqsmjw77p7n2awnlbnwny65rmmwb6z37x9rv1k4iqvvf8xbphg1"; depends=[]; };
-treeClust = derive { name="treeClust"; version="1.0-0"; sha256="1xn6m031vx12wcyyh04yb68cw416a6v5wd8rcp5f9jqirv1hp4xb"; depends=[cluster rpart]; };
+treeClust = derive { name="treeClust"; version="1.1-1"; sha256="06293w4r1h845jqzdqfnh7w5nsvyz4d0h6nn0w2aj4addj3sbp9y"; depends=[cluster rpart]; };
 treebase = derive { name="treebase"; version="0.1.1"; sha256="00xjmvnfh8f05w0076f5rlqa6w5yw0xiqpk076j3ixsv8z6m10hy"; depends=[ape data_table RCurl reshape2 XML]; };
 treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxsm20r554nyvwp40ngc47isy16a7f1q3rwjah"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
 treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; };
@@ -6595,6 +6735,7 @@ triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syff
 trifield = derive { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; };
 trimTrees = derive { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; };
 trimcluster = derive { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; };
+trimr = derive { name="trimr"; version="1.0.0"; sha256="0f6h7fwp1888fip0ybh91bgi2la5k37ylrllginv3dfrd914vsrm"; depends=[]; };
 trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; };
 trip = derive { name="trip"; version="1.1-21"; sha256="0rawckw3xd8kz2jn6xgspgl5axabjcp4xh4kp93n3h41xlarv9xa"; depends=[maptools MASS raster sp spatstat]; };
 tripEstimation = derive { name="tripEstimation"; version="0.0-42"; sha256="17spnvrrqv89vldd496wc1psmaby0mhw9nh0qnfm7yc2jcqaf5nb"; depends=[lattice mgcv rgdal sp zoo]; };
@@ -6610,7 +6751,7 @@ trust = derive { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfda
 trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Matrix Rcpp RcppEigen]; };
 tsDyn = derive { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
 tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
-tsallisqexp = derive { name="tsallisqexp"; version="0.9-1"; sha256="0z4csd3ircpf5jync6h1snj1k2awkd0s6vj2k4ij6rvs8w3nf8nn"; depends=[]; };
+tsallisqexp = derive { name="tsallisqexp"; version="0.9-2"; sha256="19535zlr6gjg45f8z6hm98pamgn20z19m8qb63997vbj4azsrjfv"; depends=[]; };
 tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
 tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; };
 tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; };
@@ -6640,7 +6781,7 @@ tvm = derive { name="tvm"; version="0.2"; sha256="1fwa37xnp3idal8v1xxlc9gr25595f
 twang = derive { name="twang"; version="1.4-9.3"; sha256="06lgawzq3b2jg84rvg24582ndlk8qji4gcbvxz5acf302cvdnmji"; depends=[gbm lattice latticeExtra survey xtable]; };
 tweedie = derive { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; };
 twiddler = derive { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
-twitteR = derive { name="twitteR"; version="1.1.8"; sha256="1gzahkipzpgfc160sgxzzga7byncih4j30r303m788c9lxk5dbxv"; depends=[bit64 DBI httr rjson]; };
+twitteR = derive { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; };
 twoStageGwasPower = derive { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; };
 twostageTE = derive { name="twostageTE"; version="1.2"; sha256="05k9lvkailv06cah71p71hnx8in045nxz6waplsccznplhgqg5ar"; depends=[isotone]; };
 txtplot = derive { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
@@ -6663,26 +6804,27 @@ upclass = derive { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pn
 uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
 urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; };
 urltools = derive { name="urltools"; version="1.2.0"; sha256="0fn84xb9yykpl2lccl75f675braaswfsr8p17grvnaplf8hpl8gj"; depends=[Rcpp]; };
-usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; };
+usdm = derive { name="usdm"; version="1.1-15"; sha256="1638fv8if7pcnm6y44w3vbmivgcg4a577zd2jwhmp00vrwml2a9m"; depends=[raster sp]; };
 useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; };
 userfriendlyscience = derive { name="userfriendlyscience"; version="0.3-0"; sha256="0gz59n315dbjlyh6fdqihr1x458wplnd43q2gw9s6f9b55359m2c"; depends=[car fBasics foreign GGally ggplot2 GPArotation knitr lavaan ltm MASS MBESS mosaic plyr psych pwr SuppDists xtable]; };
 uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
 usl = derive { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; };
 ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
 utility = derive { name="utility"; version="1.3"; sha256="0ng7jc45k9rgj9055ndmgl308zjvxd2cjsk2pn57x44rl1lldcj5"; depends=[]; };
-uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnlld8kmv0j6j3m31xjbpmc3ppr7w3"; depends=[]; };
+uuid = derive { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; };
 vacem = derive { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; };
 varComp = derive { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[CompQuadForm MASS Matrix mvtnorm nlme quadprog RLRsim SPA3G]; };
 varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; };
 varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
 vardiag = derive { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-vardpoor = derive { name="vardpoor"; version="0.3.2"; sha256="0vb684yhvafdmzphx4vv8gqih10x3mj8vmwshppwfgd3jp76dnps"; depends=[data_table foreach gdata laeken MASS plyr reshape2 stringr]; };
+vardpoor = derive { name="vardpoor"; version="0.3.4"; sha256="0hn45hb9x6zyhprnn68dwqipklrf6dqvj59w48v6clvhspbkk41b"; depends=[data_table foreach gdata laeken MASS plyr reshape2 stringr]; };
+varian = derive { name="varian"; version="0.2.1"; sha256="1rk8pmqkbsvjsfz704dawvqrqxdvbnql8sjwv0z38f9kgwvqh5p7"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
 vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; };
 vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; };
 vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
 vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
 vcd = derive { name="vcd"; version="1.4-1"; sha256="1529q8gysqzpgphsnqdwqqr630i4k1kr0zdbmxqq5wpy5r97fk5g"; depends=[colorspace lmtest MASS]; };
-vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[gnm MASS vcd]; };
+vcdExtra = derive { name="vcdExtra"; version="0.6-9"; sha256="0y00g6llf40sl0xx60l1r6qxz59gl7pqmgf906cjwrkikfmbx068"; depends=[gnm MASS vcd]; };
 vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
 vdg = derive { name="vdg"; version="1.1"; sha256="08bl7835m5c62lgaghgnd80zlbic6i80sjfxdr39a715bxpr8g3b"; depends=[ggplot2 gridExtra proxy quantreg]; };
 vdmR = derive { name="vdmR"; version="0.1.1"; sha256="0hmn7xgi1dzril6jdwxkpxp8isin0kxn3yb5fmcyfjhf03kcv4d4"; depends=[dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook]; };
@@ -6694,14 +6836,16 @@ vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2ds
 vegdata = derive { name="vegdata"; version="0.7"; sha256="1h0prrpsiywqx2h49hrr3h9i4515vbgqb2yxfpp81zv2pipa353b"; depends=[foreign XML]; };
 vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
 venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
-verification = derive { name="verification"; version="1.41"; sha256="1c8l0kqk02xijr4yhgpmhlqsflm3wizybkwpzmlnfanh8vzn49g2"; depends=[boot CircStats dtw fields MASS]; };
+verification = derive { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; };
+vertexenum = derive { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; };
 vetools = derive { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
 vines = derive { name="vines"; version="1.1.3"; sha256="1m862kgcwfz2af00p3vqg959dfldw88bdmb7p4zr3jnqzb6l7rnk"; depends=[ADGofTest copula cubature TSP]; };
 violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
 vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
 viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
+viridis = derive { name="viridis"; version="0.1"; sha256="0mdbdnc9d14lyqk2vcb3dc20m57d21q6i1csjbji5y2zqb2lyq85"; depends=[]; };
 virtualspecies = derive { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[ade4 dismo raster rworldmap]; };
-visNetwork = derive { name="visNetwork"; version="0.0.4"; sha256="0609zg6n8f0nddzvwm6bhi1xysxw2z197jvidycwd45f68qfg0ld"; depends=[htmlwidgets magrittr rjson]; };
+visNetwork = derive { name="visNetwork"; version="0.1.0"; sha256="1sm88wgr5grcqszdi1ifbb6vvjsy0l533q55fgkbvmkg34rn2j2c"; depends=[htmlwidgets magrittr rjson]; };
 visreg = derive { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; };
 visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[flip gridBase Hmisc matrixStats]; };
 visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
@@ -6719,6 +6863,7 @@ waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an
 waffle = derive { name="waffle"; version="0.3.1"; sha256="0z6snwf29n1p1i4zc3hx95yq388jgw8v3mcmjhsa2w95zsz9dxr0"; depends=[ggplot2 gridExtra gtable RColorBrewer]; };
 wahc = derive { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
 walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
+warbleR = derive { name="warbleR"; version="1.0.2"; sha256="1mcdqn2zs0dq0mk3lnnm6h17yb1dp5p4a3vxazqx8sjc2fdwpbzi"; depends=[fftw maps pbapply RCurl rjson seewave tuneR]; };
 wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
 waterData = derive { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; };
 waveband = derive { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; };
@@ -6729,7 +6874,10 @@ waveslim = derive { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqh
 wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; };
 wbs = derive { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; };
 weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; };
+weatherr = derive { name="weatherr"; version="0.1"; sha256="06ig2l5wiy8irzpzrv3q2lx3il9b4jsn5jxccm8b37g8i89v2jfp"; depends=[ggmap lubridate RJSONIO XML]; };
 webchem = derive { name="webchem"; version="0.0.1"; sha256="0hfsjaffxz78mxxh2wx5api2blnpg5y16lyc0jf1zmq7zkhccx3l"; depends=[RCurl RJSONIO XML]; };
+webreadr = derive { name="webreadr"; version="0.3.0"; sha256="1xbp1mmqabl9kdg07ysqva5rxfm59q698hm8av481hd3ggcqvv98"; depends=[Rcpp readr]; };
+webuse = derive { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; };
 webutils = derive { name="webutils"; version="0.3"; sha256="1wzpwigc5mmdnz453qr4s1viaslgdrcg238n25qcg4xjakmnxrss"; depends=[jsonlite]; };
 webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
 weightedScores = derive { name="weightedScores"; version="0.9.1"; sha256="0wd2ymxy8yh3l4xd3xgifbihi89h53wy6n84x7x26px12c70q8fa"; depends=[mvtnorm rootSolve]; };
@@ -6740,20 +6888,22 @@ wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9ls
 wgaim = derive { name="wgaim"; version="1.4-10"; sha256="0wf6j7f7hn2cnsb9yi28rjl7sa60zjggg62i00039b7gxcznxj1r"; depends=[lattice qtl]; };
 wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; };
 whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
-whoami = derive { name="whoami"; version="1.1.0"; sha256="15mj1s0dfr9y14b23nx0506r0vz48bm1f6mf0fi7b390q0zmndq7"; depends=[httr jsonlite]; };
+whoami = derive { name="whoami"; version="1.1.1"; sha256="1njyjzp9jl5k0vys0ymnvx9vbfckscg4r8hgl1nq7a2q9b9cg06f"; depends=[httr jsonlite]; };
 whoapi = derive { name="whoapi"; version="0.1.0"; sha256="01hi47da4i482ma7fzyk7ivs0xalinh7g9hjkynk9kr7xq1dj8ci"; depends=[httr]; };
 widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
 widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
 wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
-wikipediatrend = derive { name="wikipediatrend"; version="1.1.4"; sha256="1ccqwnlp0zchjqwxpy1li4wlgjlmdq3vdz6nrcgg7npplq4f6pjl"; depends=[httr jsonlite RCurl rvest stringr]; };
+wikipediatrend = derive { name="wikipediatrend"; version="1.1.6"; sha256="1yw22zs1rx4x8hk3fi4f0hbxmic102j9gj62dzwmsk6k02s6wvgw"; depends=[httr jsonlite RCurl rvest stringr]; };
 wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; };
 windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
+wiod = derive { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
 witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; };
 wkb = derive { name="wkb"; version="0.1-0"; sha256="0ynamg8zrk80j5ysyg7pymdcxzlscbhhygp8czmsd33p2y31pggd"; depends=[sp]; };
 wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zskmbzv1p08lxv227ikkbmnwn53"; depends=[circular]; };
 wmlf = derive { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; };
 wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[ifultools MASS splus2R]; };
 wnominate = derive { name="wnominate"; version="0.99"; sha256="19pis0p4kkwyddn8f93p4ff7l1hvcdr7m3hrv4bzmm9nd8iy8mk1"; depends=[pscl]; };
+woe = derive { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
 wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; };
 wordcloud = derive { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; };
 wordmatch = derive { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
@@ -6762,7 +6912,7 @@ wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jp
 wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
 wpp2012 = derive { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
 wppExplorer = derive { name="wppExplorer"; version="1.6-2"; sha256="1y9mdghq4is81gabx47pm1kfay67zv3b9hxz58lhml68wwwsfmsj"; depends=[ggplot2 googleVis Hmisc plyr reshape2 shiny wpp2012]; };
-wq = derive { name="wq"; version="0.4.3"; sha256="1lgxf5pfw3563dpyq0dgj4ps2mc5nqh56y1i77ypscj5lrcgjxrf"; depends=[ggplot2 reshape2 zoo]; };
+wq = derive { name="wq"; version="0.4.4"; sha256="1c99jr6wzalz2k7m85j6k1rmv33vrijkrrg24kjr6i08b4xgsxc5"; depends=[ggplot2 reshape2 zoo]; };
 wrassp = derive { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; };
 write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
 wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
@@ -6775,6 +6925,8 @@ x_ent = derive { name="x.ent"; version="1.1.2"; sha256="0wbbhsnlm5yln72h648nz3y5
 x12 = derive { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; };
 x12GUI = derive { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; };
 xergm = derive { name="xergm"; version="1.5"; sha256="1gjdcvpi84s0cy52a27n872ygb50mqw0w5117s3h7v1j68w88wv8"; depends=[boot coda ergm igraph lme4 Matrix network Rcpp ROCR sna speedglm statnet statnet_common texreg vegan]; };
+xergm_common = derive { name="xergm.common"; version="1.5.1"; sha256="0fxgzbczqbbir8f70d9k5d3jbih4nc8fs3l41wjbbdi9lvafqa0l"; depends=[ergm]; };
+xgboost = derive { name="xgboost"; version="0.4-2"; sha256="1m6jv1ww0cxqg87kq412akcwimj6i7ncg7anrbfhbq2h5v53brak"; depends=[data_table magrittr Matrix stringr]; };
 xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
 xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
 xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[extrafont ggplot2 Hmisc]; };
@@ -6787,14 +6939,15 @@ xtable = derive { name="xtable"; version="1.7-4"; sha256="1fvx4p058ygsyj9f4xb9k5
 xtal = derive { name="xtal"; version="1.0"; sha256="1717pl64nbliwbdg5fs6cwj7zvgrm00zlyj2dhi06yyg16gq1w8k"; depends=[]; };
 xtermStyle = derive { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
 xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
-yaImpute = derive { name="yaImpute"; version="1.0-24"; sha256="0vqzcxkrnsj99kpc4fx9lbm446fjgsjcbfakm9pdk013mxiii72d"; depends=[]; };
+yaImpute = derive { name="yaImpute"; version="1.0-26"; sha256="00w127wnwnhkfkrn4764l1ap3d3njlidglk9izcxm0n4kqj0zb49"; depends=[]; };
 yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
+yakmoR = derive { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; };
 yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; };
 ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
 yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; };
-yhatr = derive { name="yhatr"; version="0.13.6"; sha256="0g08ass0vrqcmw1zfybiaqbrspcwyf4bsmcmzbz3nzdlkgwbn3bh"; depends=[httr jsonlite plyr RCurl rjson stringr]; };
+yhatr = derive { name="yhatr"; version="0.13.7"; sha256="1n4n8v8qz3isvg8g1cwh0xz83g65n01x9pwzbxzvqidw5ip4ybb0"; depends=[httr jsonlite plyr RCurl rjson stringr]; };
 ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
-yuima = derive { name="yuima"; version="1.0.71"; sha256="0aqb87jlvlq6iw2mlngiylvayd6y2wrc82zl1za442gqq8py00if"; depends=[cubature expm mvtnorm zoo]; };
+yuima = derive { name="yuima"; version="1.0.73"; sha256="1nb91c3ii643sdw5yn8q55g5sy0x04xp9z4z3jipc72r6qcc84vw"; depends=[cubature expm mvtnorm zoo]; };
 zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; };
 zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
 zetadiv = derive { name="zetadiv"; version="0.1"; sha256="1p9mxy70mgqxjn7szh44217nvhjh90237kp5znli1r01ch64mx6b"; depends=[car mgcv vegan]; };
@@ -6804,7 +6957,7 @@ zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc
 zoeppritz = derive { name="zoeppritz"; version="1.0-5"; sha256="0a501411gjs02vvhxdy8z3a5449arkamdidf2q6qswkkiv68qq04"; depends=[]; };
 zoib = derive { name="zoib"; version="1.3.0"; sha256="15i2gczc6sh0vyi51k105qd3bymwkpbpv2xm99jwflpa170yd8jp"; depends=[coda Formula matrixcalc rjags]; };
 zoo = derive { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; };
-zooaRch = derive { name="zooaRch"; version="1.0"; sha256="1krzwrk2cknlsmd3hn8c2lly10pd8k8jj2x12mbjhr2wws0i5fj4"; depends=[ggplot2]; };
+zooaRch = derive { name="zooaRch"; version="1.1"; sha256="1a4cbayw5qj9wp925g06a1djiravh7yg3w7vdxzaks5a16pwv5li"; depends=[ggplot2]; };
 zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[filehash jpeg mlearning png svDialogs svMisc]; };
 zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
 ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; };
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d04ce8664fc..c24d5af7ddf 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -678,6 +678,7 @@ let
     "a4" # depends on broken package annaffy-1.41.1
     "a4Reporting" # depends on broken package annaffy-1.41.1
     "abd" # depends on broken package nlopt-2.4.2
+    "Actigraphy" # Build Is Broken
     "adabag" # depends on broken package nlopt-2.4.2
     "ADaCGH2" # depends on broken package tilingArray-1.47.0
     "adSplit" # build is broken
@@ -699,11 +700,15 @@ let
     "AgiMicroRna" # depends on broken package affyio-1.37.0
     "agRee" # depends on broken package nlopt-2.4.2
     "aLFQ" # depends on broken package nlopt-2.4.2
+    "AllelicImbalance" # depends on broken package Rsamtools-1.21.8
     "alr3" # depends on broken package nlopt-2.4.2
     "alr4" # depends on broken package nlopt-2.4.2
+    "alsace" # depends on broken nloptr-1.0.4
     "altcdfenvs" # depends on broken package affyio-1.37.0
+    "ampliQueso" # depends on broken package Rsamtools-1.21.8
     "anacor" # depends on broken package nlopt-2.4.2
     "annaffy" # build is broken
+    "annmap" # depends on broken package Rsamtools-1.21.8
     "AnnotationForge" # Build Is Broken
     "AnnotationHub" # depends on broken package interactiveDisplayBase-1.7.0
     "aods3" # depends on broken package nlopt-2.4.2
@@ -712,6 +717,7 @@ let
     "ArfimaMLM" # depends on broken package nlopt-2.4.2
     "arm" # depends on broken package nlopt-2.4.2
     "ArrayExpress" # depends on broken package affyio-1.37.0
+    "ArrayExpressHTS" # depends on broken package Rsamtools-1.21.8
     "arrayMvout" # depends on broken package affyio-1.37.0
     "arrayQualityMetrics" # depends on broken package affyio-1.37.0
     "ArrayTools" # depends on broken package affyio-1.37.0
@@ -721,20 +727,31 @@ let
     "attract" # depends on broken package AnnotationForge-1.11.3
     "BACA" # depends on broken package Category-2.35.1
     "BAGS" # build is broken
+    "ballgown" # depends on broken package Rsamtools-1.21.8
+    "bamsignals" # build is broken
     "bartMachine" # depends on broken package nlopt-2.4.2
+    "Basic4Cseq" # depends on broken package Rsamtools-1.21.8
     "bayesDem" # depends on broken package nlopt-2.4.2
     "bayesLife" # depends on broken package nlopt-2.4.2
     "bayesPop" # depends on broken package nlopt-2.4.2
     "Bayesthresh" # depends on broken package nlopt-2.4.2
     "BBRecapture" # depends on broken package nlopt-2.4.2
     "BCA" # depends on broken package nlopt-2.4.2
+    "BEAT" # depends on broken package Rsamtools-1.21.8
     "bgmm" # depends on broken package nlopt-2.4.2
     "bgx" # depends on broken package affyio-1.37.0
     "BIFIEsurvey" # depends on broken package nlopt-2.4.2
+    "bigGP" # build is broken
     "BiGGR" # depends on broken package rsbml-2.27.0
     "BiodiversityR" # depends on broken package nlopt-2.4.2
+    "biomvRCNS" # depends on broken package Rsamtools-1.21.8
+    "biotools" # depends on broken package rpanel-1.1-3
+    "biovizBase" # depends on broken package Rsamtools-1.21.8
     "birte" # build is broken
     "BiSEp" # depends on broken package GOSemSim-1.27.3
+    "BiSeq" # depends on broken package Rsamtools-1.21.8
+    "BitSeq" # depends on broken package Rsamtools-1.21.8
+    "BLCOP" # depends on broken package Rsymphony-0.1-20
     "blmeco" # depends on broken package nlopt-2.4.2
     "blme" # depends on broken package nlopt-2.4.2
     "bmd" # depends on broken package nlopt-2.4.2
@@ -743,295 +760,90 @@ let
     "boss" # depends on broken package nlopt-2.4.2
     "BradleyTerry2" # depends on broken package nlopt-2.4.2
     "BRugs" # build is broken
+    "BSgenome" # depends on broken package Rsamtools-1.21.8
+    "bumphunter" # depends on broken package Rsamtools-1.21.8
     "CADFtest" # depends on broken package nlopt-2.4.2
     "CAFE" # depends on broken package affyio-1.37.0
+    "CAGEr" # depends on broken package Rsamtools-1.21.8
     "cAIC4" # depends on broken package nlopt-2.4.2
+    "CAMERA" # depends on broken package mzR-2.3.1
     "canceR" # depends on broken package Category-2.35.1
     "candisc" # depends on broken package nlopt-2.4.2
     "carcass" # depends on broken package nlopt-2.4.2
     "car" # depends on broken package nlopt-2.4.2
     "caret" # depends on broken package nlopt-2.4.2
     "caretEnsemble" # depends on broken package nlopt-2.4.2
+    "CARrampsOcl" # depends on broken package OpenCL-0.1-3
+    "casper" # depends on broken package Rsamtools-1.21.8
     "Category" # Build Is Broken
     "categoryCompare" # depends on broken package Category-2.35.1
     "CCpop" # depends on broken package nlopt-2.4.2
     "cellHTS2" # depends on broken package Category-2.35.1
+    "CexoR" # depends on broken package Rsamtools-1.21.8
     "ChainLadder" # depends on broken package nlopt-2.4.2
     "ChAMP" # depends on broken package affyio-1.37.0
     "charm" # depends on broken package affyio-1.37.0
     "ChemmineR" # Build Is Broken
+    "chimera" # depends on broken package Rsamtools-1.21.8
     "chipenrich" # build is broken
+    "chipPCR" # depends on broken nloptr-1.0.4
+    "ChIPpeakAnno" # depends on broken package Rsamtools-1.21.8
     "ChIPQC" # depends on broken package AnnotationForge-1.11.3
+    "ChIPseeker" # depends on broken package Rsamtools-1.21.8
+    "chipseq" # depends on broken package Rsamtools-1.21.8
+    "ChIPseqR" # depends on broken package Rsamtools-1.21.8
+    "ChIPsim" # depends on broken package Rsamtools-1.21.8
     "ChIPXpress" # depends on broken package affyio-1.37.0
+    "ChromHeatMap" # depends on broken package Rsamtools-1.21.8
+    "cleanUpdTSeq" # depends on broken package Rsamtools-1.21.8
     "climwin" # depends on broken package nlopt-2.4.2
+    "clipper" # depends on broken package Rsamtools-1.21.8
     "CLME" # depends on broken package nlopt-2.4.2
     "clpAPI" # build is broken
     "clusterPower" # depends on broken package nlopt-2.4.2
-    "Actigraphy" # Build Is Broken
-    "Crossover" # Build Is Broken
-    "FunctionalNetworks" # Build Is Broken
-    "HiPLARM" # Build Is Broken
-    "HierO" # Build Is Broken
-    "KEGGprofile" # Build Is Broken
-    "MigClim" # Build Is Broken
-    "ROracle" # Build Is Broken
-    "Rcplex" # Build Is Broken
-    "RcppAPT" # Build Is Broken
-    "RnaSeqSampleSize" # Build Is Broken
-    "Rsamtools" # Build Is Broken
-    "SeqGrapheR" # Build Is Broken
-    "bamsignals" # build is broken
-    "bigGP" # build is broken
-    "cudaBayesreg" # build is broken
-    "dagbag" # build is broken
-    "gMCP" # build is broken
-    "h5" # build is broken
-    "lefse" # build is broken
-    "metaMix" # build is broken
-    "mirIntegrator" # build is broken
-    "pathview" # build is broken
-    "pcaL1" # build is broken
-    "permGPU" # build is broken
-    "pmclust" # build is broken
-    "qtbase" # build is broken
-    "rDEA" # build is broken
-    "rJPSGCS" # build is broken
-    "rLindo" # build is broken
-    "seqCNA" # build is broken
-    "sybilSBML" # build is broken
-    "AllelicImbalance" # depends on broken package Rsamtools-1.21.8
-    "ArrayExpressHTS" # depends on broken package Rsamtools-1.21.8
-    "BEAT" # depends on broken package Rsamtools-1.21.8
-    "BLCOP" # depends on broken package Rsymphony-0.1-20
-    "BSgenome" # depends on broken package Rsamtools-1.21.8
-    "Basic4Cseq" # depends on broken package Rsamtools-1.21.8
-    "BiSeq" # depends on broken package Rsamtools-1.21.8
-    "BitSeq" # depends on broken package Rsamtools-1.21.8
-    "CAGEr" # depends on broken package Rsamtools-1.21.8
-    "CAMERA" # depends on broken package mzR-2.3.1
-    "CARrampsOcl" # depends on broken package OpenCL-0.1-3
-    "CNEr" # depends on broken package Rsamtools-1.21.8
-    "CNVrd2" # depends on broken package Rsamtools-1.21.8
-    "CODEX" # depends on broken package Rsamtools-1.21.8
-    "CRISPRseek" # depends on broken package Rsamtools-1.21.8
-    "CexoR" # depends on broken package Rsamtools-1.21.8
-    "ChIPpeakAnno" # depends on broken package Rsamtools-1.21.8
-    "ChIPseeker" # depends on broken package Rsamtools-1.21.8
-    "ChIPseqR" # depends on broken package Rsamtools-1.21.8
-    "ChIPsim" # depends on broken package Rsamtools-1.21.8
-    "ChromHeatMap" # depends on broken package Rsamtools-1.21.8
-    "CopyNumber450k" # depends on broken package Rsamtools-1.21.8
-    "CopywriteR" # depends on broken package Rsamtools-1.21.8
-    "CoverageView" # depends on broken package Rsamtools-1.21.8
-    "DBKGrad" # depends on broken package rpanel-1.1-3
-    "DEXSeq" # depends on broken package Rsamtools-1.21.8
-    "DMRcate" # depends on broken package Rsamtools-1.21.8
-    "DMRforPairs" # depends on broken package Rsamtools-1.21.8
-    "DOQTL" # depends on broken package Rsamtools-1.21.8
-    "EDASeq" # depends on broken package Rsamtools-1.21.8
-    "ELMER" # depends on broken package Rsamtools-1.21.8
-    "ExomeDepth" # depends on broken package Rsamtools-1.21.8
-    "FourCSeq" # depends on broken package Rsamtools-1.21.8
-    "GOGANPA" # depends on broken package WGCNA-1.47
-    "GOTHiC" # depends on broken package Rsamtools-1.21.8
-    "GUIDE" # depends on broken package rpanel-1.1-3
-    "GenoView" # depends on broken package Rsamtools-1.21.8
-    "GenomicAlignments" # depends on broken package Rsamtools-1.21.8
-    "GenomicFeatures" # depends on broken package Rsamtools-1.21.8
-    "GenomicFiles" # depends on broken package Rsamtools-1.21.8
-    "GenomicInteractions" # depends on broken package Rsamtools-1.21.8
-    "GoogleGenomics" # depends on broken package Rsamtools-1.21.8
-    "GreyListChIP" # depends on broken package Rsamtools-1.21.8
-    "Gviz" # depends on broken package Rsamtools-1.21.8
-    "HTSeqGenie" # depends on broken package Rsamtools-1.21.8
-    "HiTC" # depends on broken package Rsamtools-1.21.8
-    "IdeoViz" # depends on broken package Rsamtools-1.21.8
-    "InPAS" # depends on broken package Rsamtools-1.21.8
-    "LinRegInteractive" # depends on broken package rpanel-1.1-3
-    "LowMACA" # depends on broken package Rsamtools-1.21.8
-    "M3D" # depends on broken package Rsamtools-1.21.8
-    "MEDIPS" # depends on broken package Rsamtools-1.21.8
-    "MSeasy" # depends on broken package mzR-2.3.1
-    "MSeasyTkGUI" # depends on broken package mzR-2.3.1
-    "Metab" # depends on broken package mzR-2.3.1
-    "MethylAid" # depends on broken package Rsamtools-1.21.8
-    "MethylSeekR" # depends on broken package Rsamtools-1.21.8
-    "MotIV" # depends on broken package Rsamtools-1.21.8
-    "MotifDb" # depends on broken package Rsamtools-1.21.8
-    "OTUbase" # depends on broken package Rsamtools-1.21.8
-    "OrganismDbi" # depends on broken package Rsamtools-1.21.8
-    "PGA" # depends on broken package Rsamtools-1.21.8
-    "PICS" # depends on broken package Rsamtools-1.21.8
-    "PING" # depends on broken package Rsamtools-1.21.8
-    "Pviz" # depends on broken package Rsamtools-1.21.8
-    "QDNAseq" # depends on broken package Rsamtools-1.21.8
-    "QuasR" # depends on broken package Rsamtools-1.21.8
-    "R3CPET" # depends on broken package Rsamtools-1.21.8
-    "R453Plus1Toolbox" # depends on broken package Rsamtools-1.21.8
-    "RAPIDR" # depends on broken package Rsamtools-1.21.8
-    "REBayes" # depends on broken package Rmosek-1.2.5.1
-    "REDseq" # depends on broken package Rsamtools-1.21.8
-    "RIPSeeker" # depends on broken package Rsamtools-1.21.8
-    "RMassBank" # depends on broken package mzR-2.3.1
-    "RNAprobR" # depends on broken package Rsamtools-1.21.8
-    "ROI_plugin_symphony" # depends on broken package Rsymphony-0.1-20
-    "RSVSim" # depends on broken package Rsamtools-1.21.8
-    "RUVSeq" # depends on broken package Rsamtools-1.21.8
-    "RVideoPoker" # depends on broken package rpanel-1.1-3
-    "RapidPolygonLookup" # depends on broken package PBSmapping-2.69.76
-    "Rariant" # depends on broken package Rsamtools-1.21.8
-    "Rcade" # depends on broken package Rsamtools-1.21.8
-    "ReQON" # depends on broken package Rsamtools-1.21.8
-    "RnBeads" # depends on broken package Rsamtools-1.21.8
-    "Rolexa" # depends on broken package Rsamtools-1.21.8
-    "Rqc" # depends on broken package Rsamtools-1.21.8
-    "SDD" # depends on broken package rpanel-1.1-3
-    "SGSeq" # depends on broken package Rsamtools-1.21.8
-    "SIMAT" # depends on broken package mzR-2.3.1
-    "SNPtools" # depends on broken package Rsamtools-1.21.8
-    "SVM2CRM" # depends on broken package Rsamtools-1.21.8
-    "SeqArray" # depends on broken package Rsamtools-1.21.8
-    "SeqVarTools" # depends on broken package Rsamtools-1.21.8
-    "ShortRead" # depends on broken package Rsamtools-1.21.8
-    "SimRAD" # depends on broken package Rsamtools-1.21.8
-    "SomaticSignatures" # depends on broken package Rsamtools-1.21.8
-    "SplicingGraphs" # depends on broken package Rsamtools-1.21.8
-    "TEQC" # depends on broken package Rsamtools-1.21.8
-    "TIN" # depends on broken package WGCNA-1.47
-    "TargetSearch" # depends on broken package mzR-2.3.1
-    "TitanCNA" # depends on broken package Rsamtools-1.21.8
-    "ToPASeq" # depends on broken package Rsamtools-1.21.8
-    "TransView" # depends on broken package Rsamtools-1.21.8
-    "VariantAnnotation" # depends on broken package Rsamtools-1.21.8
-    "VariantFiltering" # depends on broken package Rsamtools-1.21.8
-    "VariantTools" # depends on broken package Rsamtools-1.21.8
-    "ampliQueso" # depends on broken package Rsamtools-1.21.8
-    "annmap" # depends on broken package Rsamtools-1.21.8
-    "ballgown" # depends on broken package Rsamtools-1.21.8
-    "biomvRCNS" # depends on broken package Rsamtools-1.21.8
-    "biotools" # depends on broken package rpanel-1.1-3
-    "biovizBase" # depends on broken package Rsamtools-1.21.8
-    "bumphunter" # depends on broken package Rsamtools-1.21.8
-    "casper" # depends on broken package Rsamtools-1.21.8
-    "chimera" # depends on broken package Rsamtools-1.21.8
-    "chipseq" # depends on broken package Rsamtools-1.21.8
-    "cleanUpdTSeq" # depends on broken package Rsamtools-1.21.8
-    "clipper" # depends on broken package Rsamtools-1.21.8
-    "cn_mops" # depends on broken package Rsamtools-1.21.8
-    "coMET" # depends on broken package Rsamtools-1.21.8
-    "cobindR" # depends on broken package Rsamtools-1.21.8
-    "conumee" # depends on broken package Rsamtools-1.21.8
-    "cosmiq" # depends on broken package mzR-2.3.1
-    "cpvSNP" # depends on broken package Rsamtools-1.21.8
-    "csaw" # depends on broken package Rsamtools-1.21.8
-    "cummeRbund" # depends on broken package Rsamtools-1.21.8
-    "customProDB" # depends on broken package Rsamtools-1.21.8
-    "daff" # depends on broken package V8-0.6
-    "dagLogo" # depends on broken package Rsamtools-1.21.8
-    "deepSNV" # depends on broken package Rsamtools-1.21.8
-    "derfinder" # depends on broken package Rsamtools-1.21.8
-    "derfinderPlot" # depends on broken package Rsamtools-1.21.8
-    "easyRNASeq" # depends on broken package Rsamtools-1.21.8
-    "ensemblVEP" # depends on broken package Rsamtools-1.21.8
-    "epigenomix" # depends on broken package Rsamtools-1.21.8
-    "epivizr" # depends on broken package Rsamtools-1.21.8
-    "erpR" # depends on broken package rpanel-1.1-3
-    "exomeCopy" # depends on broken package Rsamtools-1.21.8
-    "exomePeak" # depends on broken package Rsamtools-1.21.8
-    "fPortfolio" # depends on broken package Rsymphony-0.1-20
-    "fastLiquidAssociation" # depends on broken package LiquidAssociation-1.23.0
-    "flagme" # depends on broken package mzR-2.3.1
-    "gamlss_demo" # depends on broken package rpanel-1.1-3
-    "genomation" # depends on broken package Rsamtools-1.21.8
-    "geojsonio" # depends on broken package V8-0.6
-    "ggbio" # depends on broken package Rsamtools-1.21.8
-    "girafe" # depends on broken package Rsamtools-1.21.8
-    "gmapR" # depends on broken package Rsamtools-1.21.8
-    "groHMM" # depends on broken package Rsamtools-1.21.8
-    "hiAnnotator" # depends on broken package Rsamtools-1.21.8
-    "hiReadsProcessor" # depends on broken package Rsamtools-1.21.8
-    "htSeqTools" # depends on broken package Rsamtools-1.21.8
-    "intansv" # depends on broken package Rsamtools-1.21.8
-    "js" # depends on broken package V8-0.6
-    "lawn" # depends on broken package V8-0.6
-    "lgcp" # depends on broken package rpanel-1.1-3
-    "mcaGUI" # depends on broken package Rsamtools-1.21.8
-    "metaMS" # depends on broken package mzR-2.3.1
-    "metaSEM" # depends on broken package OpenMx-2.2.4
-    "metagene" # depends on broken package Rsamtools-1.21.8
-    "methylPipe" # depends on broken package Rsamtools-1.21.8
-    "methylumi" # depends on broken package Rsamtools-1.21.8
-    "minfi" # depends on broken package Rsamtools-1.21.8
-    "minimist" # depends on broken package V8-0.6
-    "missMethyl" # depends on broken package Rsamtools-1.21.8
-    "motifRG" # depends on broken package Rsamtools-1.21.8
-    "motifStack" # depends on broken package Rsamtools-1.21.8
-    "mygene" # depends on broken package Rsamtools-1.21.8
-    "nettools" # depends on broken package WGCNA-1.47
-    "nucleR" # depends on broken package Rsamtools-1.21.8
-    "optBiomarker" # depends on broken package rpanel-1.1-3
-    "ora" # depends on broken package ROracle-1.1-12
-    "pbdBASE" # depends on broken package pbdSLAP-0.2-0
-    "pbdDEMO" # depends on broken package pbdSLAP-0.2-0
-    "pbdDMAT" # depends on broken package pbdSLAP-0.2-0
-    "podkat" # depends on broken package Rsamtools-1.21.8
-    "proBAMr" # depends on broken package Rsamtools-1.21.8
-    "qpgraph" # depends on broken package Rsamtools-1.21.8
-    "qrqc" # depends on broken package Rsamtools-1.21.8
-    "qtpaint" # depends on broken package qtbase-1.0.9
-    "qtutils" # depends on broken package qtbase-1.0.9
-    "quantro" # depends on broken package Rsamtools-1.21.8
-    "r3Cseq" # depends on broken package Rsamtools-1.21.8
-    "rGADEM" # depends on broken package Rsamtools-1.21.8
-    "rSFFreader" # depends on broken package Rsamtools-1.21.8
-    "rTRMui" # depends on broken package Rsamtools-1.21.8
-    "regionReport" # depends on broken package Rsamtools-1.21.8
-    "regioneR" # depends on broken package Rsamtools-1.21.8
-    "repijson" # depends on broken package V8-0.6
-    "rfPred" # depends on broken package Rsamtools-1.21.8
-    "rgbif" # depends on broken package V8-0.6
-    "rgpui" # depends on broken package rgp-0.4-1
-    "rjade" # depends on broken package V8-0.6
-    "rnaSeqMap" # depends on broken package Rsamtools-1.21.8
-    "roar" # depends on broken package Rsamtools-1.21.8
-    "rtracklayer" # depends on broken package Rsamtools-1.21.8
-    "sapFinder" # depends on broken package rTANDEM-1.9.0
-    "segmentSeq" # depends on broken package Rsamtools-1.21.8
-    "seq2pathway" # depends on broken package WGCNA-1.47
-    "seqbias" # depends on broken package Rsamtools-1.21.8
-    "seqplots" # depends on broken package Rsamtools-1.21.8
-    "shinyMethyl" # depends on broken package Rsamtools-1.21.8
-    "shinyTANDEM" # depends on broken package rTANDEM-1.9.0
-    "similaRpeak" # depends on broken package Rsamtools-1.21.8
-    "soGGi" # depends on broken package Rsamtools-1.21.8
-    "soilphysics" # depends on broken package rpanel-1.1-3
-    "spliceR" # depends on broken package Rsamtools-1.21.8
-    "spocc" # depends on broken package V8-0.6
-    "ssviz" # depends on broken package Rsamtools-1.21.8
-    "stagePop" # depends on broken package PBSddesolve-1.11.29
-    "topologyGSA" # depends on broken package Rsamtools-1.21.8
-    "trackViewer" # depends on broken package Rsamtools-1.21.8
-    "tracktables" # depends on broken package Rsamtools-1.21.8
-    "vmsbase" # depends on broken package PBSmapping-2.69.76
-    "wavClusteR" # depends on broken package Rsamtools-1.21.8
-    "xcms" # depends on broken package mzR-2.3.1
     "clusterProfiler" # depends on broken package GOSemSim-1.27.3
+    "clusterSEs" # depends on broken AER-1.2-4
+    "ClustGeo" # depends on broken FactoMineR-1.31.3
+    "CNEr" # depends on broken package Rsamtools-1.21.8
     "cn_farms" # depends on broken package affyio-1.37.0
+    "cn_mops" # depends on broken package Rsamtools-1.21.8
     "CNORfuzzy" # depends on broken package nlopt-2.4.2
+    "CNVPanelizer" # depends on broken cn.mops-1.15.1
+    "CNVrd2" # depends on broken package Rsamtools-1.21.8
+    "cobindR" # depends on broken package Rsamtools-1.21.8
     "CoCiteStats" # Build Is Broken
+    "CODEX" # depends on broken package Rsamtools-1.21.8
     "COHCAP" # build is broken
+    "colorscience"
+    "coMET" # depends on broken package Rsamtools-1.21.8
     "compEpiTools" # depends on broken package topGO-2.21.0
     "CompGO" # depends on broken package Category-2.35.1
     "conformal" # depends on broken package nlopt-2.4.2
     "ConsensusClusterPlus" # Build Is Broken
+    "conumee" # depends on broken package Rsamtools-1.21.8
+    "CopyNumber450k" # depends on broken package Rsamtools-1.21.8
+    "CopywriteR" # depends on broken package Rsamtools-1.21.8
     "corHMM" # depends on broken package nlopt-2.4.2
     "Cormotif" # depends on broken package affyio-1.37.0
     "coRNAi" # depends on broken package Category-2.35.1
+    "cosmiq" # depends on broken package mzR-2.3.1
     "CosmoPhotoz" # depends on broken package nlopt-2.4.2
+    "CoverageView" # depends on broken package Rsamtools-1.21.8
     "cplexAPI" # build is broken
+    "cpvSNP" # depends on broken package Rsamtools-1.21.8
+    "CRISPRseek" # depends on broken package Rsamtools-1.21.8
     "crlmm" # depends on broken package affyio-1.37.0
+    "Crossover" # Build Is Broken
     "CrypticIBDcheck" # depends on broken package nlopt-2.4.2
+    "csaw" # depends on broken package Rsamtools-1.21.8
+    "cudaBayesreg" # build is broken
+    "cummeRbund" # depends on broken package Rsamtools-1.21.8
+    "customProDB" # depends on broken package Rsamtools-1.21.8
+    "daff" # depends on broken package V8-0.6
+    "dagbag" # build is broken
+    "dagLogo" # depends on broken package Rsamtools-1.21.8
     "DAMisc" # depends on broken package nlopt-2.4.2
+    "DBKGrad" # depends on broken package rpanel-1.1-3
     "Deducer" # depends on broken package nlopt-2.4.2
     "DeducerExtras" # depends on broken package nlopt-2.4.2
     "DeducerPlugInExample" # depends on broken package nlopt-2.4.2
@@ -1039,8 +851,13 @@ let
     "DeducerSpatial" # depends on broken package nlopt-2.4.2
     "DeducerSurvival" # depends on broken package nlopt-2.4.2
     "DeducerText" # depends on broken package nlopt-2.4.2
+    "deepSNV" # depends on broken package Rsamtools-1.21.8
     "DEGraph" # depends on broken package RCytoscape-1.19.0
     "demi" # depends on broken package affyio-1.37.0
+    "derfinder" # depends on broken package Rsamtools-1.21.8
+    "derfinderPlot" # depends on broken package Rsamtools-1.21.8
+    "destiny" # depends on broken package VIM-4.3.0
+    "DEXSeq" # depends on broken package Rsamtools-1.21.8
     "DiagTest3Grp" # depends on broken package nlopt-2.4.2
     "DiffBind" # depends on broken package AnnotationForge-1.11.3
     "diffHic" # depends on broken package rhdf5-2.13.1
@@ -1049,10 +866,14 @@ let
     "discSurv" # depends on broken package nlopt-2.4.2
     "DistatisR" # depends on broken package nlopt-2.4.2
     "diveRsity" # depends on broken package nlopt-2.4.2
+    "DMRcate" # depends on broken package Rsamtools-1.21.8
+    "DMRforPairs" # depends on broken package Rsamtools-1.21.8
     "domainsignatures" # build is broken
     "doMPI" # build is broken
+    "DOQTL" # depends on broken package Rsamtools-1.21.8
     "DOSE" # depends on broken package GOSemSim-1.27.3
     "dpa" # depends on broken package nlopt-2.4.2
+    "dpcR" # depends on broken nloptr-1.0.4
     "drc" # depends on broken package nlopt-2.4.2
     "drfit" # depends on broken package nlopt-2.4.2
     "drsmooth" # depends on broken package nlopt-2.4.2
@@ -1060,20 +881,32 @@ let
     "dualKS" # depends on broken package affyio-1.37.0
     "dynlm" # depends on broken package nlopt-2.4.2
     "easyanova" # depends on broken package nlopt-2.4.2
+    "easyRNASeq" # depends on broken package Rsamtools-1.21.8
+    "EDASeq" # depends on broken package Rsamtools-1.21.8
     "edge" # depends on broken package nlopt-2.4.2
     "eeptools" # depends on broken package nlopt-2.4.2
     "EffectLiteR" # depends on broken package nlopt-2.4.2
     "effects" # depends on broken package nlopt-2.4.2
     "eiR" # depends on broken package ChemmineR-2.21.7
     "eisa" # depends on broken package Category-2.35.1
+    "ELMER" # depends on broken package Rsamtools-1.21.8
     "EMA" # depends on broken package nlopt-2.4.2
     "ENmix" # depends on broken package affyio-1.37.0
     "EnQuireR" # depends on broken package nlopt-2.4.2
+    "EnrichmentBrowser" # depends on broken package r-EDASeq-2.3.2
     "ensembldb" # depends on broken package interactiveDisplayBase-1.7.0
+    "ensemblVEP" # depends on broken package Rsamtools-1.21.8
+    "epigenomix" # depends on broken package Rsamtools-1.21.8
     "episplineDensity" # depends on broken package nlopt-2.4.2
+    "epivizr" # depends on broken package Rsamtools-1.21.8
     "epr" # depends on broken package nlopt-2.4.2
     "erer" # depends on broken package nlopt-2.4.2
+    "erma" # depends on broken GenomicFiles-1.5.4
+    "erpR" # depends on broken package rpanel-1.1-3
     "ExiMiR" # depends on broken package affyio-1.37.0
+    "exomeCopy" # depends on broken package Rsamtools-1.21.8
+    "ExomeDepth" # depends on broken package Rsamtools-1.21.8
+    "exomePeak" # depends on broken package Rsamtools-1.21.8
     "ExpressionView" # depends on broken package Category-2.35.1
     "extRemes" # depends on broken package nlopt-2.4.2
     "ez" # depends on broken package nlopt-2.4.2
@@ -1082,10 +915,12 @@ let
     "Factoshiny" # depends on broken package nlopt-2.4.2
     "faoutlier" # depends on broken package nlopt-2.4.2
     "farms" # depends on broken package affyio-1.37.0
+    "fastLiquidAssociation" # depends on broken package LiquidAssociation-1.23.0
     "fastR" # depends on broken package nlopt-2.4.2
     "FDRreg" # depends on broken package nlopt-2.4.2
     "FEM" # build is broken
     "ffpe" # depends on broken package affyio-1.37.0
+    "flagme" # depends on broken package mzR-2.3.1
     "flowDensity" # depends on broken package nlopt-2.4.2
     "flowPeaks" # build is broken
     "flowQ" # build is broken
@@ -1094,13 +929,17 @@ let
     "flowVS" # depends on broken package ncdfFlow-2.15.2
     "flowWorkspace" # depends on broken package ncdfFlow-2.15.2
     "fmcsR" # depends on broken package ChemmineR-2.21.7
+    "FourCSeq" # depends on broken package Rsamtools-1.21.8
+    "fPortfolio" # depends on broken package Rsymphony-0.1-20
     "freqweights" # depends on broken package nlopt-2.4.2
     "frma" # depends on broken package affyio-1.37.0
     "frmaTools" # depends on broken package affyio-1.37.0
     "fscaret" # depends on broken package nlopt-2.4.2
     "FunciSNP" # depends on broken package snpStats-1.19.0
+    "FunctionalNetworks" # Build Is Broken
     "fxregime" # depends on broken package nlopt-2.4.2
     "gamclass" # depends on broken package nlopt-2.4.2
+    "gamlss_demo" # depends on broken package rpanel-1.1-3
     "gamm4" # depends on broken package nlopt-2.4.2
     "gCMAP" # depends on broken package Category-2.35.1
     "gCMAPWeb" # depends on broken package Category-2.35.1
@@ -1110,20 +949,35 @@ let
     "GENE_E" # depends on broken package rhdf5-2.13.1
     "GeneExpressionSignature" # depends on broken package annaffy-1.41.1
     "GeneticTools" # depends on broken package snpStats-1.19.0
+    "genomation" # depends on broken package Rsamtools-1.21.8
+    "GenomicAlignments" # depends on broken package Rsamtools-1.21.8
+    "GenomicFeatures" # depends on broken package Rsamtools-1.21.8
+    "GenomicFiles" # depends on broken package Rsamtools-1.21.8
+    "GenomicInteractions" # depends on broken package Rsamtools-1.21.8
+    "genotypeeval" # depends on broken package r-rtracklayer-1.29.12
+    "GenoView" # depends on broken package Rsamtools-1.21.8
     "genridge" # depends on broken package nlopt-2.4.2
+    "geojsonio" # depends on broken package V8-0.6
     "GEOsubmission" # depends on broken package affyio-1.37.0
     "gespeR" # depends on broken package Category-2.35.1
     "GEWIST" # depends on broken package nlopt-2.4.2
     "GGBase" # depends on broken package snpStats-1.19.0
+    "ggbio" # depends on broken package Rsamtools-1.21.8
     "GGtools" # depends on broken package snpStats-1.19.0
     "gimme" # depends on broken package nlopt-2.4.2
+    "girafe" # depends on broken package Rsamtools-1.21.8
+    "gmapR" # depends on broken package Rsamtools-1.21.8
     "gmatrix" # depends on broken package cudatoolkit-5.5.22
+    "gMCP" # build is broken
     "GOFunction" # build is broken
+    "GOGANPA" # depends on broken package WGCNA-1.47
+    "GoogleGenomics" # depends on broken package Rsamtools-1.21.8
     "goProfiles" # build is broken
     "GOSemSim" # Build Is Broken
     "goseq" # build is broken
     "GOSim" # depends on broken package topGO-2.21.0
     "GOstats" # depends on broken package AnnotationForge-1.11.3
+    "GOTHiC" # depends on broken package Rsamtools-1.21.8
     "goTools" # build is broken
     "gplm" # depends on broken package nlopt-2.4.2
     "gputools" # depends on broken package cudatoolkit-5.5.22
@@ -1131,24 +985,40 @@ let
     "granova" # depends on broken package nlopt-2.4.2
     "graphicalVAR" # depends on broken package nlopt-2.4.2
     "GraphPCA" # depends on broken package nlopt-2.4.2
+    "GreyListChIP" # depends on broken package Rsamtools-1.21.8
+    "groHMM" # depends on broken package Rsamtools-1.21.8
     "GSCA" # depends on broken package rhdf5-2.13.1
+    "GUIDE" # depends on broken package rpanel-1.1-3
+    "Gviz" # depends on broken package Rsamtools-1.21.8
     "GWAF" # depends on broken package nlopt-2.4.2
     "gwascat" # depends on broken package interactiveDisplayBase-1.7.0
     "h2o" # build is broken
+    "h5" # build is broken
     "h5vc" # depends on broken package rhdf5-2.13.1
     "Harshlight" # depends on broken package affyio-1.37.0
     "hbsae" # depends on broken package nlopt-2.4.2
     "heplots" # depends on broken package nlopt-2.4.2
+    "hiAnnotator" # depends on broken package Rsamtools-1.21.8
+    "hierGWAS"
+    "HierO" # Build Is Broken
+    "highriskzone"
     "HilbertVisGUI" # Build Is Broken
+    "HiPLARM" # Build Is Broken
+    "hiReadsProcessor" # depends on broken package Rsamtools-1.21.8
     "HistDAWass" # depends on broken package nlopt-2.4.2
+    "HiTC" # depends on broken package Rsamtools-1.21.8
     "HLMdiag" # depends on broken package nlopt-2.4.2
     "HTqPCR" # depends on broken package affyio-1.37.0
     "HTSanalyzeR" # depends on broken package Category-2.35.1
+    "HTSeqGenie" # depends on broken package Rsamtools-1.21.8
+    "htSeqTools" # depends on broken package Rsamtools-1.21.8
     "hysteresis" # depends on broken package nlopt-2.4.2
     "IATscores" # depends on broken package nlopt-2.4.2
     "ibd" # depends on broken package nlopt-2.4.2
     "ibh" # build is broken
     "iccbeta" # depends on broken package nlopt-2.4.2
+    "IdeoViz" # depends on broken package Rsamtools-1.21.8
+    "ifaTools" # depends on broken package r-OpenMx-2.2.6
     "iFes" # depends on broken package cudatoolkit-5.5.22
     "imageHTS" # depends on broken package Category-2.35.1
     "immunoClust" # build is broken
@@ -1156,9 +1026,15 @@ let
     "in2extRemes" # depends on broken package nlopt-2.4.2
     "inferference" # depends on broken package nlopt-2.4.2
     "influence_ME" # depends on broken package nlopt-2.4.2
+    "InPAS" # depends on broken package Rsamtools-1.21.8
     "inSilicoMerging" # build is broken
+    "INSPEcT" # depends on broken GenomicFeatures-1.21.13
+    "intansv" # depends on broken package Rsamtools-1.21.8
     "interactiveDisplayBase" # build is broken
     "interactiveDisplay" # depends on broken package Category-2.35.1
+    "interplot" # depends on broken arm-1.8-5
+    "IONiseR" # depends on broken rhdf5-2.13.4
+    "iptools"
     "IsingFit" # depends on broken package nlopt-2.4.2
     "IsoGene" # depends on broken package affyio-1.37.0
     "IsoGeneGUI" # depends on broken package affyio-1.37.0
@@ -1166,14 +1042,21 @@ let
     "IVAS" # depends on broken package nlopt-2.4.2
     "ivpack" # depends on broken package nlopt-2.4.2
     "JAGUAR" # depends on broken package nlopt-2.4.2
+    "jetset"
     "joda" # depends on broken package nlopt-2.4.2
     "jomo" # build is broken
+    "js" # depends on broken package V8-0.6
     "KANT" # depends on broken package affyio-1.37.0
     "keggorthology" # build is broken
+    "KEGGprofile" # Build Is Broken
+    "lawn" # depends on broken package V8-0.6
     "learnstats" # depends on broken package nlopt-2.4.2
+    "lefse" # build is broken
     "lessR" # depends on broken package nlopt-2.4.2
     "lfe" # build is broken
+    "lgcp" # depends on broken package rpanel-1.1-3
     "limmaGUI" # depends on broken package affyio-1.37.0
+    "LinRegInteractive" # depends on broken package rpanel-1.1-3
     "LiquidAssociation" # build is broken
     "lmdme" # build is broken
     "lme4" # depends on broken package nlopt-2.4.2
@@ -1184,8 +1067,10 @@ let
     "LogisticDx" # depends on broken package nlopt-2.4.2
     "logitT" # depends on broken package affyio-1.37.0
     "longpower" # depends on broken package nlopt-2.4.2
+    "LowMACA" # depends on broken package Rsamtools-1.21.8
     "lumi" # depends on broken package affyio-1.37.0
     "LVSmiRNA" # depends on broken package affyio-1.37.0
+    "M3D" # depends on broken package Rsamtools-1.21.8
     "MAIT" # depends on broken package nlopt-2.4.2
     "makecdfenv" # depends on broken package affyio-1.37.0
     "mAPKL" # build is broken
@@ -1195,27 +1080,46 @@ let
     "MatrixRider" # depends on broken package DirichletMultinomial-1.11.1
     "MaxPro" # depends on broken package nlopt-2.4.2
     "mbest" # depends on broken package nlopt-2.4.2
+    "MBmca" # depends on broken nloptr-1.0.4
     "mBPCR" # depends on broken package affyio-1.37.0
+    "mcaGUI" # depends on broken package Rsamtools-1.21.8
     "MCRestimate" # build is broken
     "mdgsa" # build is broken
     "meboot" # depends on broken package nlopt-2.4.2
+    "mediation" # depends on broken package r-lme4-1.1-8
+    "MEDIPS" # depends on broken package Rsamtools-1.21.8
     "MEDME" # depends on broken package nlopt-2.4.2
     "MEMSS" # depends on broken package nlopt-2.4.2
     "meshr" # depends on broken package Category-2.35.1
+    "Metab" # depends on broken package mzR-2.3.1
     "metagear" # build is broken
+    "metagene" # depends on broken package Rsamtools-1.21.8
+    "metaMix" # build is broken
+    "metaMS" # depends on broken package mzR-2.3.1
     "metaplus" # depends on broken package nlopt-2.4.2
+    "metaSEM" # depends on broken package OpenMx-2.2.4
     "metaseqR" # depends on broken package affyio-1.37.0
     "Metatron" # depends on broken package nlopt-2.4.2
     "methyAnalysis" # depends on broken package affyio-1.37.0
+    "MethylAid" # depends on broken package Rsamtools-1.21.8
+    "methylPipe" # depends on broken package Rsamtools-1.21.8
+    "MethylSeekR" # depends on broken package Rsamtools-1.21.8
+    "methylumi" # depends on broken package Rsamtools-1.21.8
     "miceadds" # depends on broken package nlopt-2.4.2
     "micEconAids" # depends on broken package nlopt-2.4.2
     "micEconCES" # depends on broken package nlopt-2.4.2
     "micEconSNQP" # depends on broken package nlopt-2.4.2
     "mi" # depends on broken package nlopt-2.4.2
+    "MigClim" # Build Is Broken
     "migui" # depends on broken package nlopt-2.4.2
     "MineICA" # depends on broken package AnnotationForge-1.11.3
+    "minfi" # depends on broken package Rsamtools-1.21.8
+    "minimist" # depends on broken package V8-0.6
     "MinimumDistance" # depends on broken package affyio-1.37.0
+    "mirIntegrator" # build is broken
+    "missDeaths"
     "missMDA" # depends on broken package nlopt-2.4.2
+    "missMethyl" # depends on broken package Rsamtools-1.21.8
     "mitoODE" # build is broken
     "mixAK" # depends on broken package nlopt-2.4.2
     "mixlm" # depends on broken package nlopt-2.4.2
@@ -1229,6 +1133,12 @@ let
     "mongolite" # build is broken
     "monocle" # build is broken
     "mosaic" # depends on broken package nlopt-2.4.2
+    "MotifDb" # depends on broken package Rsamtools-1.21.8
+    "motifRG" # depends on broken package Rsamtools-1.21.8
+    "motifStack" # depends on broken package Rsamtools-1.21.8
+    "MotIV" # depends on broken package Rsamtools-1.21.8
+    "MSeasy" # depends on broken package mzR-2.3.1
+    "MSeasyTkGUI" # depends on broken package mzR-2.3.1
     "MSGFgui" # depends on broken package MSGFplus-1.3.0
     "MSGFplus" # Build Is Broken
     "msmsEDA" # depends on broken package affyio-1.37.0
@@ -1239,15 +1149,19 @@ let
     "multiDimBio" # depends on broken package nlopt-2.4.2
     "MultiRR" # depends on broken package nlopt-2.4.2
     "muma" # depends on broken package nlopt-2.4.2
+    "munsellinterpol"
     "mutossGUI" # build is broken
     "mvGST" # depends on broken package AnnotationForge-1.11.3
     "mvinfluence" # depends on broken package nlopt-2.4.2
+    "mygene" # depends on broken package Rsamtools-1.21.8
     "mzR" # build is broken
     "NanoStringQCPro" # build is broken
     "nCal" # depends on broken package nlopt-2.4.2
     "ncdfFlow" # build is broken
     "NCIgraph" # depends on broken package RCytoscape-1.19.0
     "netbenchmark" # build is broken
+    "nettools" # depends on broken package WGCNA-1.47
+    "NGScopy"
     "NHPoisson" # depends on broken package nlopt-2.4.2
     "nloptr" # depends on broken package nlopt-2.4.2
     "nondetects" # depends on broken package affyio-1.37.0
@@ -1255,6 +1169,7 @@ let
     "NormqPCR" # depends on broken package affyio-1.37.0
     "NORRRM" # build is broken
     "npIntFactRep" # depends on broken package nlopt-2.4.2
+    "nucleR" # depends on broken package Rsamtools-1.21.8
     "oligoClasses" # depends on broken package affyio-1.37.0
     "oligo" # depends on broken package affyio-1.37.0
     "OmicsMarkeR" # depends on broken package nlopt-2.4.2
@@ -1263,7 +1178,11 @@ let
     "openCyto" # depends on broken package ncdfFlow-2.15.2
     "OpenMx" # build is broken
     "OperaMate" # depends on broken package Category-2.35.1
+    "optBiomarker" # depends on broken package rpanel-1.1-3
+    "ora" # depends on broken package ROracle-1.1-12
     "ordBTL" # depends on broken package nlopt-2.4.2
+    "OrganismDbi" # depends on broken package Rsamtools-1.21.8
+    "OTUbase" # depends on broken package Rsamtools-1.21.8
     "OUwie" # depends on broken package nlopt-2.4.2
     "PADOG" # build is broken
     "pamm" # depends on broken package nlopt-2.4.2
@@ -1273,15 +1192,22 @@ let
     "papeR" # depends on broken package nlopt-2.4.2
     "parboost" # depends on broken package nlopt-2.4.2
     "parma" # depends on broken package nlopt-2.4.2
+    "Pasha" # depends on broken package GenomicAlignments-1.5.12
     "pathClass" # depends on broken package affyio-1.37.0
     "pathRender" # build is broken
+    "pathview" # build is broken
     "PatternClass" # build is broken
     "Pbase" # depends on broken package affyio-1.37.0
+    "pbdBASE" # depends on broken package pbdSLAP-0.2-0
+    "pbdDEMO" # depends on broken package pbdSLAP-0.2-0
+    "pbdDMAT" # depends on broken package pbdSLAP-0.2-0
     "pbdSLAP" # build is broken
     "PBImisc" # depends on broken package nlopt-2.4.2
     "pbkrtest" # depends on broken package nlopt-2.4.2
     "PBSddesolve" # build is broken
     "PBSmapping" # build is broken
+    "pcaBootPlot" # depends on broken FactoMineR-1.31.3
+    "pcaL1" # build is broken
     "PCpheno" # depends on broken package Category-2.35.1
     "pdInfoBuilder" # depends on broken package affyio-1.37.0
     "pdmclass" # build is broken
@@ -1289,20 +1215,27 @@ let
     "pedigreemm" # depends on broken package nlopt-2.4.2
     "pedometrics" # depends on broken package nlopt-2.4.2
     "pequod" # depends on broken package nlopt-2.4.2
+    "permGPU" # build is broken
+    "PGA" # depends on broken package Rsamtools-1.21.8
     "PGSEA" # depends on broken package annaffy-1.41.1
+    "PharmacoGx"
     "phenoDist" # depends on broken package Category-2.35.1
     "phenoTest" # depends on broken package Category-2.35.1
     "PhenStat" # depends on broken package nlopt-2.4.2
     "phia" # depends on broken package nlopt-2.4.2
     "phylocurve" # depends on broken package nlopt-2.4.2
     "phyloTop" # depends on broken package nlopt-2.4.2
+    "PICS" # depends on broken package Rsamtools-1.21.8
+    "PING" # depends on broken package Rsamtools-1.21.8
     "plateCore" # depends on broken package ncdfFlow-2.15.2
     "plier" # depends on broken package affyio-1.37.0
     "plsRbeta" # depends on broken package nlopt-2.4.2
     "plsRcox" # depends on broken package nlopt-2.4.2
     "plsRglm" # depends on broken package nlopt-2.4.2
     "plw" # depends on broken package affyio-1.37.0
+    "pmclust" # build is broken
     "pmm" # depends on broken package nlopt-2.4.2
+    "podkat" # depends on broken package Rsamtools-1.21.8
     "polytomous" # depends on broken package nlopt-2.4.2
     "pomp" # depends on broken package nlopt-2.4.2
     "ppiPre" # depends on broken package GOSemSim-1.27.3
@@ -1310,28 +1243,51 @@ let
     "prebs" # depends on broken package affyio-1.37.0
     "predictmeans" # depends on broken package nlopt-2.4.2
     "prLogistic" # depends on broken package nlopt-2.4.2
+    "proBAMr" # depends on broken package Rsamtools-1.21.8
     "ProCoNA" # depends on broken package AnnotationForge-1.11.3
     "pRoloc" # depends on broken package nlopt-2.4.2
     "pRolocGUI" # depends on broken package nlopt-2.4.2
     "proteoQC" # depends on broken package affyio-1.37.0
     "PSAboot" # depends on broken package nlopt-2.4.2
+    "ptw" # depends on broken nloptr-1.0.4
     "puma" # depends on broken package affyio-1.37.0
     "pvac" # depends on broken package affyio-1.37.0
     "pvca" # depends on broken package nlopt-2.4.2
+    "Pviz" # depends on broken package Rsamtools-1.21.8
     "pwOmics" # depends on broken package interactiveDisplayBase-1.7.0
+    "PythonInR"
     "qcmetrics" # build is broken
+    "QDNAseq" # depends on broken package Rsamtools-1.21.8
+    "QFRM"
     "qgraph" # depends on broken package nlopt-2.4.2
     "qpcrNorm" # depends on broken package affyio-1.37.0
+    "qpgraph" # depends on broken package Rsamtools-1.21.8
+    "qrqc" # depends on broken package Rsamtools-1.21.8
+    "qtbase" # build is broken
     "qtlnet" # depends on broken package nlopt-2.4.2
+    "qtpaint" # depends on broken package qtbase-1.0.9
+    "qtutils" # depends on broken package qtbase-1.0.9
     "QUALIFIER" # depends on broken package ncdfFlow-2.15.2
     "quantification" # depends on broken package nlopt-2.4.2
+    "quantro" # depends on broken package Rsamtools-1.21.8
+    "QuasR" # depends on broken package Rsamtools-1.21.8
     "R2STATS" # depends on broken package nlopt-2.4.2
+    "R3CPET" # depends on broken package Rsamtools-1.21.8
+    "r3Cseq" # depends on broken package Rsamtools-1.21.8
+    "R453Plus1Toolbox" # depends on broken package Rsamtools-1.21.8
     "radiant" # depends on broken package nlopt-2.4.2
     "raincpc" # build is broken
     "rainfreq" # build is broken
     "RamiGO" # depends on broken package RCytoscape-1.19.0
+    "RapidPolygonLookup" # depends on broken package PBSmapping-2.69.76
+    "RAPIDR" # depends on broken package Rsamtools-1.21.8
+    "RareVariantVis" # depends on broken VariantAnnotation-1.15.19
+    "Rariant" # depends on broken package Rsamtools-1.21.8
     "rasclass" # depends on broken package nlopt-2.4.2
+    "RBerkeley"
     "RbioRXN" # depends on broken package ChemmineR-2.21.7
+    "Rcade" # depends on broken package Rsamtools-1.21.8
+    "rCGH" # depends on broken package r-affy-1.47.1
     "Rchemcpp" # depends on broken package ChemmineR-2.21.7
     "Rcmdr" # depends on broken package nlopt-2.4.2
     "RcmdrMisc" # depends on broken package nlopt-2.4.2
@@ -1373,27 +1329,47 @@ let
     "RcmdrPlugin_temis" # depends on broken package nlopt-2.4.2
     "RcmdrPlugin_UCA" # depends on broken package nlopt-2.4.2
     "Rcpi" # depends on broken package ChemmineR-2.21.7
+    "Rcplex" # Build Is Broken
+    "RcppAPT" # Build Is Broken
     "RcppOctave" # build is broken
     "RcppRedis" # build is broken
     "RCytoscape" # Build Is Broken
     "RDAVIDWebService" # depends on broken package Category-2.35.1
     "rdd" # depends on broken package nlopt-2.4.2
+    "rddtools" # depends on broken package r-AER-1.2-4
+    "rDEA" # build is broken
     "RDieHarder" # build is broken
     "ReactomePA" # depends on broken package GOSemSim-1.27.3
     "ReadqPCR" # depends on broken package affyio-1.37.0
+    "REBayes" # depends on broken package Rmosek-1.2.5.1
+    "REDseq" # depends on broken package Rsamtools-1.21.8
     "referenceIntervals" # depends on broken package nlopt-2.4.2
     "RefNet" # depends on broken package interactiveDisplayBase-1.7.0
     "RefPlus" # depends on broken package affyio-1.37.0
     "refund" # depends on broken package nlopt-2.4.2
+    "regioneR" # depends on broken package Rsamtools-1.21.8
+    "regionReport" # depends on broken package Rsamtools-1.21.8
+    "repijson" # depends on broken package V8-0.6
     "Repitools" # depends on broken package affyio-1.37.0
     "ReportingTools" # depends on broken package Category-2.35.1
+    "ReQON" # depends on broken package Rsamtools-1.21.8
     "REST" # depends on broken package nlopt-2.4.2
+    "rfPred" # depends on broken package Rsamtools-1.21.8
+    "rGADEM" # depends on broken package Rsamtools-1.21.8
+    "rgbif" # depends on broken package V8-0.6
+    "Rgnuplot"
     "rgp" # build is broken
+    "rgpui" # depends on broken package rgp-0.4-1
     "rgsepd" # depends on broken package goseq-1.21.1
     "rhdf5" # build is broken
     "rHVDM" # depends on broken package affyio-1.37.0
     "Ringo" # depends on broken package affyio-1.37.0
+    "RIPSeeker" # depends on broken package Rsamtools-1.21.8
     "Risa" # depends on broken package affyio-1.37.0
+    "rjade" # depends on broken package V8-0.6
+    "rJPSGCS" # build is broken
+    "rLindo" # build is broken
+    "RMassBank" # depends on broken package mzR-2.3.1
     "rMAT" # build is broken
     "rmgarch" # depends on broken package nlopt-2.4.2
     "rminer" # depends on broken package nlopt-2.4.2
@@ -1401,37 +1377,56 @@ let
     "Rmosek" # build is broken
     "RNAinteract" # depends on broken package Category-2.35.1
     "RNAither" # depends on broken package nlopt-2.4.2
+    "RNAprobR" # depends on broken package Rsamtools-1.21.8
+    "rnaSeqMap" # depends on broken package Rsamtools-1.21.8
+    "RnaSeqSampleSize" # Build Is Broken
     "RnavGraph" # build is broken
+    "RnBeads" # depends on broken package Rsamtools-1.21.8
     "Rnits" # depends on broken package affyio-1.37.0
+    "roar" # depends on broken package Rsamtools-1.21.8
     "RobLoxBioC" # depends on broken package affyio-1.37.0
     "robustlmm" # depends on broken package nlopt-2.4.2
     "rockchalk" # depends on broken package nlopt-2.4.2
+    "ROI_plugin_symphony" # depends on broken package Rsymphony-0.1-20
+    "Rolexa" # depends on broken package Rsamtools-1.21.8
     "rols" # build is broken
+    "ROracle" # Build Is Broken
     "RPA" # depends on broken package affyio-1.37.0
     "rpanel" # build is broken
     "rpubchem" # depends on broken package nlopt-2.4.2
+    "Rqc" # depends on broken package Rsamtools-1.21.8
     "RQuantLib" # build is broken
     "rr" # depends on broken package nlopt-2.4.2
+    "Rsamtools" # Build Is Broken
     "RSAP" # build is broken
     "rsbml" # build is broken
     "rscala" # build is broken
     "RSDA" # depends on broken package nlopt-2.4.2
+    "rSFFreader" # depends on broken package Rsamtools-1.21.8
     "Rsubread" # Build Is Broken
+    "RSVSim" # depends on broken package Rsamtools-1.21.8
     "Rsymphony" # build is broken
     "rTANDEM" # build is broken
     "RTN" # depends on broken package nlopt-2.4.2
+    "rtracklayer" # depends on broken package Rsamtools-1.21.8
+    "rTRMui" # depends on broken package Rsamtools-1.21.8
     "rugarch" # depends on broken package nlopt-2.4.2
     "RUVcorr" # build is broken
     "RUVnormalize" # Build Is Broken
+    "RUVSeq" # depends on broken package Rsamtools-1.21.8
     "RVAideMemoire" # depends on broken package nlopt-2.4.2
     "RVFam" # depends on broken package nlopt-2.4.2
+    "RVideoPoker" # depends on broken package rpanel-1.1-3
     "ryouready" # depends on broken package nlopt-2.4.2
     "sampleSelection" # depends on broken package nlopt-2.4.2
+    "sapFinder" # depends on broken package rTANDEM-1.9.0
     "SCAN_UPC" # depends on broken package affyio-1.37.0
     "ScISI" # depends on broken package apComplex-2.35.0
     "sdcMicro" # depends on broken package nlopt-2.4.2
     "sdcMicroGUI" # depends on broken package nlopt-2.4.2
+    "SDD" # depends on broken package rpanel-1.1-3
     "seeg" # depends on broken package nlopt-2.4.2
+    "segmentSeq" # depends on broken package Rsamtools-1.21.8
     "sem" # depends on broken package nlopt-2.4.2
     "semdiag" # depends on broken package nlopt-2.4.2
     "SemDist" # Build Is Broken
@@ -1439,9 +1434,23 @@ let
     "semPlot" # depends on broken package nlopt-2.4.2
     "SensoMineR" # depends on broken package nlopt-2.4.2
     "SEPA" # depends on broken package topGO-2.21.0
+    "seq2pathway" # depends on broken package WGCNA-1.47
+    "SeqArray" # depends on broken package Rsamtools-1.21.8
+    "seqbias" # depends on broken package Rsamtools-1.21.8
+    "seqCNA" # build is broken
+    "SeqGrapheR" # Build Is Broken
+    "seqplots" # depends on broken package Rsamtools-1.21.8
     "seqTools" # build is broken
+    "SeqVarTools" # depends on broken package Rsamtools-1.21.8
+    "SGSeq" # depends on broken package Rsamtools-1.21.8
+    "shinyMethyl" # depends on broken package Rsamtools-1.21.8
+    "shinyTANDEM" # depends on broken package rTANDEM-1.9.0
+    "ShortRead" # depends on broken package Rsamtools-1.21.8
+    "SIMAT" # depends on broken package mzR-2.3.1
     "SimBindProfiles" # depends on broken package affyio-1.37.0
+    "similaRpeak" # depends on broken package Rsamtools-1.21.8
     "simpleaffy" # depends on broken package affyio-1.37.0
+    "SimRAD" # depends on broken package Rsamtools-1.21.8
     "sirt" # depends on broken package nlopt-2.4.2
     "sjPlot" # depends on broken package nlopt-2.4.2
     "skewr" # depends on broken package affyio-1.37.0
@@ -1453,11 +1462,23 @@ let
     "snpEnrichment" # depends on broken package snpStats-1.19.0
     "snpStats" # build is broken
     "snpStatsWriter" # depends on broken package snpStats-1.19.0
+    "SNPtools" # depends on broken package Rsamtools-1.21.8
     "SOD" # depends on broken package cudatoolkit-5.5.22
+    "soGGi" # depends on broken package Rsamtools-1.21.8
+    "soilphysics" # depends on broken package rpanel-1.1-3
+    "SomaticSignatures" # depends on broken package Rsamtools-1.21.8
+    "SoyNAM" # depends on broken package r-lme4-1.1-8
     "spacom" # depends on broken package nlopt-2.4.2
     "specificity" # depends on broken package nlopt-2.4.2
+    "spliceR" # depends on broken package Rsamtools-1.21.8
+    "SplicingGraphs" # depends on broken package Rsamtools-1.21.8
+    "spocc" # depends on broken package V8-0.6
+    "spoccutils" # depends on broken spocc-0.3.0
+    "spsann" # depends on broken package r-pedometrics-0.6-2
     "sscore" # depends on broken package affyio-1.37.0
     "ssmrob" # depends on broken package nlopt-2.4.2
+    "ssviz" # depends on broken package Rsamtools-1.21.8
+    "stagePop" # depends on broken package PBSddesolve-1.11.29
     "staRank" # depends on broken package Category-2.35.1
     "Starr" # depends on broken package affyio-1.37.0
     "STATegRa" # depends on broken package affyio-1.37.0
@@ -1465,16 +1486,29 @@ let
     "stepp" # depends on broken package nlopt-2.4.2
     "stringgaussnet" # build is broken
     "Surrogate" # depends on broken package nlopt-2.4.2
+    "SVM2CRM" # depends on broken package Rsamtools-1.21.8
+    "sybilSBML" # build is broken
     "synapter" # depends on broken package affyio-1.37.0
     "systemfit" # depends on broken package nlopt-2.4.2
     "systemPipeR" # depends on broken package AnnotationForge-1.11.3
+    "TargetSearch" # depends on broken package mzR-2.3.1
     "TcGSA" # depends on broken package nlopt-2.4.2
     "TDMR" # depends on broken package nlopt-2.4.2
+    "TEQC" # depends on broken package Rsamtools-1.21.8
     "TFBSTools" # depends on broken package DirichletMultinomial-1.11.1
     "tigerstats" # depends on broken package nlopt-2.4.2
     "tilingArray" # depends on broken package affyio-1.37.0
+    "TIN" # depends on broken package WGCNA-1.47
+    "TitanCNA" # depends on broken package Rsamtools-1.21.8
+    "ToPASeq" # depends on broken package Rsamtools-1.21.8
     "topGO" # build is broken
+    "topologyGSA" # depends on broken package Rsamtools-1.21.8
+    "tracktables" # depends on broken package Rsamtools-1.21.8
+    "trackViewer" # depends on broken package Rsamtools-1.21.8
+    "translateSPSS2R" # depends on broken car-2.0-25
     "tRanslatome" # depends on broken package GOSemSim-1.27.3
+    "TransView" # depends on broken package Rsamtools-1.21.8
+    "traseR"
     "TriMatch" # depends on broken package nlopt-2.4.2
     "TROM" # depends on broken package topGO-2.21.0
     "TurboNorm" # depends on broken package affyio-1.37.0
@@ -1482,18 +1516,25 @@ let
     "userfriendlyscience" # depends on broken package nlopt-2.4.2
     "V8" # build is broken
     "VanillaICE" # depends on broken package affyio-1.37.0
+    "variancePartition" # depends on broken package lme4-1.1-8
+    "VariantAnnotation" # depends on broken package Rsamtools-1.21.8
+    "VariantFiltering" # depends on broken package Rsamtools-1.21.8
+    "VariantTools" # depends on broken package Rsamtools-1.21.8
     "VIM" # depends on broken package nlopt-2.4.2
     "VIMGUI" # depends on broken package nlopt-2.4.2
+    "vmsbase" # depends on broken package PBSmapping-2.69.76
     "vows" # depends on broken package nlopt-2.4.2
     "vsn" # depends on broken package affyio-1.37.0
     "vtpnet" # depends on broken package interactiveDisplayBase-1.7.0
     "wateRmelon" # depends on broken package affyio-1.37.0
+    "wavClusteR" # depends on broken package Rsamtools-1.21.8
     "waveTiling" # depends on broken package affyio-1.37.0
     "webbioc" # depends on broken package affyio-1.37.0
     "wfe" # depends on broken package nlopt-2.4.2
     "WGCNA" # build is broken
     "wgsea" # depends on broken package snpStats-1.19.0
     "WideLM" # depends on broken package cudatoolkit-5.5.22
+    "xcms" # depends on broken package mzR-2.3.1
     "xergm" # depends on broken package nlopt-2.4.2
     "xps" # build is broken
     "yaqcaffy" # depends on broken package affyio-1.37.0
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index e9ddc17bb02..ff23390d79c 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }:
+{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf2_5, pkgconfig, libarchive, unzip, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "bazel-20150326.981b7bc1";
@@ -10,19 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7";
   };
 
-  buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ];
+  buildInputs = [ pkgconfig protobuf2_5 zlib zip jdk libarchive unzip which makeWrapper ];
 
   installPhase = ''
     PROTOC=protoc bash compile.sh
     mkdir -p $out/bin $out/share
     cp -R output $out/share/bazel
     ln -s $out/share/bazel/bazel $out/bin/bazel
-    wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk}"
+    wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk.home}"
   '';
 
   meta = {
     homepage = http://github.com/google/bazel/;
     description = "Build tool that builds code quickly and reliably";
     license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.philandstuff ];
   };
 }
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 378e250eb2f..b56dc6bdd89 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -1,35 +1,41 @@
-{ mkDerivation, fetchgit, aeson, base, bytestring, Cabal, containers
-, deepseq, deepseq-generics, directory, doctest, filepath, gitMinimal
-, hackage-db, hspec, lens, monad-par, monad-par-extras, mtl, pretty
-, process, QuickCheck, regex-posix, SHA, split, stdenv, transformers
-, utf8-string, cartel, nix-prefetch-scripts, optparse-applicative
-, makeWrapper
+{ mkDerivation, fetchgit, 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
+, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel
+, nix-prefetch-scripts
 }:
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150531";
+  version = "20150807";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "513a5fce6cfabe0b062424f6deb191a12f7e2187";
-    sha256 = "1rsnzgfzw6zrjwwr3a4qbhw4l07pqi9ddm2p9l3sw3agzwmc7z49";
+    rev = "796dabfc3fb0a98174b680c5d722954096465103";
+    sha256 = "1blyjq80w9534ap4cg0m6awks0zj2135kxld1i9d2z88x1ijzx9v";
     deepClone = true;
   };
+  isLibrary = true;
   isExecutable = true;
-  enableSharedLibraries = false;
-  enableSharedExecutables = false;
-  buildDepends = [
-    aeson base bytestring Cabal containers deepseq-generics directory
-    filepath hackage-db lens monad-par monad-par-extras mtl pretty
-    process regex-posix SHA split transformers utf8-string cartel
-    optparse-applicative
+  libraryHaskellDepends = [
+    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
   ];
-  testDepends = [
-    aeson base bytestring Cabal containers deepseq deepseq-generics
-    directory doctest filepath hackage-db hspec lens monad-par
-    monad-par-extras mtl pretty process QuickCheck regex-posix SHA
-    split transformers utf8-string
+  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
   ];
+  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
+  ];
+  buildDepends = [ cartel ];
   buildTools = [ gitMinimal makeWrapper ];
   preConfigure = ''
     git reset --hard # Re-create the index that fetchgit destroyed in the name of predictable hashes.
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index f41969ebb43..fad2d87cc17 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   passthru = {
     # A derivation that provides gcc and g++ commands, but that
     # will end up calling ccache for the given cacheDir
-    links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; }
+    links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; passthru.isGNU = true; }
       ''
         mkdir -p $out/bin
         if [ -x "${gcc.cc}/bin/gcc" ]; then
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index a8043a9fc5e..20373c923e7 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl, which, ocaml}:
+{stdenv, fetchzip, which, ocaml}:
 let
   ocaml_version = (stdenv.lib.getVersion ocaml);
+  version = "4.02+6";
+
 in
 
 assert stdenv.lib.versionAtLeast ocaml_version "4.02";
 
 stdenv.mkDerivation {
-  name = "camlp4-4.02.0+1";
-  src = fetchurl {
-    url = https://github.com/ocaml/camlp4/archive/4.02.0+1.tar.gz;
-    sha256 = "0055f4jiz82rgn581xhq3mr4qgq2qgdxqppmp8i2x1xnsim4h9pn";
+  name = "camlp4-${version}";
+  src = fetchzip {
+    url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz";
+    sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj";
   };
 
   buildInputs = [ which ocaml ];
@@ -27,10 +29,6 @@ stdenv.mkDerivation {
   postConfigure = ''
     substituteInPlace camlp4/META.in \
     --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4
-    substituteInPlace camlp4/config/Camlp4_config.ml \
-    --replace \
-      "Filename.concat ocaml_standard_library" \
-      "Filename.concat \"$out/lib/ocaml/${ocaml_version}/site-lib\""
   '';
 
 
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index c5c0ac9a3ed..c9addf55312 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,22 +1,24 @@
 {stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper,
- ocaml_react, camomile, zed
+ ocaml_react, camomile, zed, cppo, camlp4
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.15";
+  version = "1.17";
   name = "utop-${version}";
 
   src = fetchurl {
-    url = https://github.com/diml/utop/archive/1.15.tar.gz;
-    sha256 = "106v0x6sa2x10zgmjf73mpzws7xiqanxswivd00iqnpc0bcpkmrr";
+    url = "https://github.com/diml/utop/archive/${version}.tar.gz";
+    sha256 = "0l9lz2nypl2ls3kqzmp738m02yvscabhsfpj70ckp0p98pimnnfd";
   };
 
-  buildInputs = [ ocaml findlib makeWrapper];
+  buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ];
 
   propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];
 
   createFindlibDestdir = true;
 
+  configureFlags = "--enable-camlp4";
+
   buildPhase = ''
     make
     make doc
diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix
new file mode 100644
index 00000000000..1c641f55c47
--- /dev/null
+++ b/pkgs/games/freecell-solver/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, cmake, perl, gmp, libtap, perlPackages }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "freecell-solver-${version}";
+  version = "3.26.0";
+
+  src = fetchurl {
+    url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.bz2";
+    sha256 = "0pm6xk4fmwgzva70qxb0pqymdfvpasnvqiwwmm8hpx7g37y11wqk";
+  };
+
+  buildInputs = [ pkgconfig cmake perl gmp libtap
+    perlPackages.TemplateToolkit perlPackages.StringShellQuote
+    perlPackages.GamesSolitaireVerify ];
+
+  meta = {
+    description = "A FreeCell automatic solver";
+    longDescription = ''
+      FreeCell Solver is a program that automatically solves layouts
+      of Freecell and similar variants of Card Solitaire such as Eight
+      Off, Forecell, and Seahaven Towers, as well as Simple Simon
+      boards.
+    '';
+    homepage = http://fc-solve.shlomifish.org/;
+    license = licenses.mit;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh
index c7d9ed55a3f..cf6cc59a6da 100644
--- a/pkgs/misc/emulators/wine/builder-wow.sh
+++ b/pkgs/misc/emulators/wine/builder-wow.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+## build described at http://wiki.winehq.org/Wine64
+
 source $stdenv/setup
 
 unpackPhase
diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 4714834fbcb..2775150385d 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -1,7 +1,7 @@
 {
   unstable = {
-    wineVersion = "1.7.47";
-    wineSha256  = "0bmvgcag0kv0671dj6fbfdz86ij91rb2kp2dssqw83a0xidgfx5s";
+    wineVersion = "1.7.48";
+    wineSha256  = "13kcjirif57p8mg4yhzxf0hjpghlwc18iskz66dx94i0dvjmrxg3";
     geckoVersion = "2.36";
     geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
     gecko64Version = "2.36";
@@ -18,13 +18,10 @@
     gecko64Sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
     monoVersion = "4.5.6";
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
-    ## TESTME wine stable should work with most recent mono
-    #monoVersion = "0.0.8";
-    #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
   };
   staging = {
-    version = "1.7.47";
-    sha256 = "0m47v4jbc70b7qxj0lqnc7an1xlcb81b6k7dwzjyk3pv3ixp2snp";
+    version = "1.7.48";
+    sha256 = "06p1h92vaqlzk09aj4na6z7k3a81y9nw19rfg9q2szpcqjdd437w";
   };
   winetricks = {
     version = "20150706";
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 7ce997acb68..23f8b0e16e3 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -85,6 +85,17 @@ rec {
   yankring            = YankRing;
 
 
+  CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "CheckAttach-2015-06-22";
+    src = fetchgit {
+      url = "git://github.com/chrisbra/CheckAttach";
+      rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68";
+      sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f";
+    };
+    dependencies = [];
+
+  };
+
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "CSApprox-2013-07-26";
     src = fetchgit {
@@ -1351,6 +1362,17 @@ rec {
 
   };
 
+  vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimwiki-2014-02-21";
+    src = fetchgit {
+      url = "git://github.com/vimwiki/vimwiki";
+      rev = "2c03d82a0e4662adf1e347487d73a9bf4bf6fdac";
+      sha256 = "8f94fe1204ae3770b114370382f9c616f971eb9b940d8d08ca96ac83405a0cdf";
+    };
+    dependencies = [];
+
+  };
+
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vundle-2015-03-21";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index fb5f2fc6f97..7d3fa343375 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,3 +1,4 @@
+"CheckAttach"
 "CSApprox"
 "Gist"
 "Gundo"
@@ -100,4 +101,5 @@
 "vim-signature"
 "vim-snippets"
 "vim2hs"
+"vimwiki"
 "vundle"
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7063017b3a8..386004dad43 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -141,6 +141,8 @@ with stdenv.lib;
   # Video configuration.
   # Enable KMS for devices whose X.org driver supports it.
   DRM_I915_KMS y
+  # Allow specifying custom EDID on the kernel command line
+  DRM_LOAD_EDID_FIRMWARE y
   ${optionalString (versionOlder version "3.9") ''
     DRM_RADEON_KMS? y
   ''}
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index 205171ec928..fa529fe71fe 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, libdrm, libpciaccess }:
 
-let version = "2015-06-24"; in
+let version = "2015-08-06"; in
 stdenv.mkDerivation {
   name = "radeontop-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "06cn7lixxx94c1fki0plg9f4rdy459mgi9yl80m0k1a20jqykz2a";
-    rev = "976cae0be0ffb9142d5e63e435960c6b2bb0eb34";
+    sha256 = "01s0j28lk66wb46qymkk1nyk91iv22y3m56z4lqd16yaxmhl0v2f";
+    rev = "93c8ff2f07da8d4c204ee4872aed7eec834ff57d";
     repo = "radeontop";
     owner = "clbr";
   };
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 5d0b68bba2b..789aa95b157 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -11,21 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "19qhia4lfa8a0rzp2v6lnlxp2lf4z4vqhgfxnicfdnx07q4r847i";
   };
 
-  postPatch = ''
-    # Remove the dependence on bundled libraries
-    sed -i '/must_fetch_list/ s/ v8//' configure
-
-    # Don't use the default command line args
-    rm configure.default
-  '';
-
   preConfigure = ''
     export ALLOW_WARNINGS=1
     patchShebangs .
   '';
 
   configureFlags = [
-    "--dynamic=all"
     "--with-jemalloc"
     "--lib-path=${jemalloc}/lib"
   ];
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 856a22d7bb8..e018c7790b9 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook
-, json_c, libsndfile
+, json_c, libsndfile, libtool
 , xlibs, libcap, alsaLib, glib
 , avahi, libjack2, libasyncns, lirc, dbus
 , sbc, bluez5, udev, openssl, fftwFloat
@@ -109,6 +109,7 @@ stdenv.mkDerivation rec {
 
   postInstall = lib.optionalString libOnly ''
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
+    sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-6.0.la
   '';
 
   meta = {
diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix
index 381fe6ddc1e..94a46459d4e 100644
--- a/pkgs/servers/serfdom/default.nix
+++ b/pkgs/servers/serfdom/default.nix
@@ -3,7 +3,7 @@
 with goPackages;
 
 buildGoPackage rec {
-  version = "0.6.3";
+  version = "0.6.4";
   name = "serfdom-${version}";
   goPackagePath = "github.com/hashicorp/serf";
 
@@ -11,10 +11,10 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "serf";
     rev = "v${version}";
-    sha256 = "0ck77ji28bvm4ahzxyyi4sm17c3fxc16k0k5mihl1nlkgdd73m8y";
+    sha256 = "1fhz8wrvsmgaky22n255w9hkyfph2n45c47ivdyzrrxisg5j2438";
   };
 
-  buildInputs = [ cli mapstructure memberlist logutils go-syslog mdns columnize circbuf ];
+  buildInputs = [ cli mapstructure memberlist_v2 logutils go-syslog mdns columnize circbuf ugorji.go ];
 
   dontInstallSrc = true;
 
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 90eaef73e16..6495b2de7f3 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ckbcomp-${version}";
-  version = "1.129";
+  version = "1.131";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/d-i/console-setup.git";
     rev = "refs/tags/${version}";
-    sha256 = "1shbqnjhdmy7qwz2kwfhrdxbjw1vv98rpz1x7wlgqxr812aqcfdd";
+    sha256 = "0xmdnzhm1wsdpjb0wsi24xzk1xpv5h2bxgwm9f4awb7aj7wv59ma";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index 910fe332d25..edda974281e 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.12";
+  version = "1.13";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "09b9j2mygv1dsrq424j535c92wvlbzpwgzcgg7x922dxrnsdsxpr";
+    sha256 = "13a9icgp7kvxaw700sdhxll0in00ghk0aacg26s4kxmxc85w92i4";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
diff --git a/pkgs/tools/filesystems/ceph/0.94-pre.nix b/pkgs/tools/filesystems/ceph/0.94-pre.nix
index e496dcccd82..fcf57526fd1 100644
--- a/pkgs/tools/filesystems/ceph/0.94-pre.nix
+++ b/pkgs/tools/filesystems/ceph/0.94-pre.nix
@@ -4,9 +4,9 @@ callPackage ./generic.nix (args // rec {
   version = "0.94.3";
 
   src = fetchgit {
-    url = "https://github.com/ceph/ceph.git";
-    rev = "c19b0fc1aa2834ae3027b07a02aebe9639fc2ca7";
-    sha256 = "1h1y5jh2bszia622rmwdblb3cpkpd0mijahkaiasr30jwpkmzh0i";
+    url = "https://github.com/wkennington/ceph.git";
+    rev = "6218aa41e04533f0d6e62b5c7be591c2e99716ec";
+    sha256 = "0cyl5i1q6lap5a6vk8fjxfpikhxzwm9zkybg37nibahi2bwjr7rr";
   };
 
   patches = [ ./fix-pgrefdebugging.patch ];
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index dca6d930020..8b9cefdbf23 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -164,50 +164,55 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = [
-    (mkOther                               "exec_prefix"        "\${out}")
-    (mkOther                               "sysconfdir"         "/etc")
-    (mkOther                               "localstatedir"      "/var")
-    (mkOther                               "libdir"             "\${lib}/lib")
-    (mkOther                               "includedir"         "\${lib}/include")
-    (mkWith   true                         "rbd"                 null)
-    (mkWith   true                         "cephfs"              null)
-    (mkWith   hasRadosgw                   "radosgw"             null)
-    (mkWith   true                         "radosstriper"        null)
-    (mkWith   hasServer                    "mon"                 null)
-    (mkWith   hasServer                    "osd"                 null)
-    (mkWith   hasServer                    "mds"                 null)
-    (mkEnable true                         "client"              null)
-    (mkEnable hasServer                    "server"              null)
-    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"            null)
-    (mkWith   (cryptoStr == "nss")         "nss"                 null)
-    (mkEnable false                        "root-make-check"     null)
-    (mkWith   false                        "profiler"            null)
-    (mkWith   false                        "debug"               null)
-    (mkEnable false                        "coverage"            null)
-    (mkWith   (optFuse != null)            "fuse"                null)
-    (mkWith   (malloc == optJemalloc)      "jemalloc"            null)
-    (mkWith   (malloc == optGperftools)    "tcmalloc"            null)
-    (mkEnable false                        "pgrefdebugging"      null)
-    (mkEnable false                        "cephfs-java"         null)
-    (mkEnable hasXio                       "xio"                 null)
-    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"       null)
-    (mkWith   true                         "ocf"                 null)
-    (mkWith   hasKinetic                   "kinetic"             null)
-    (mkWith   hasRocksdb                   "librocksdb"          null)
-    (mkWith   false                        "librocksdb-static"   null)
+    (mkOther                               "exec_prefix"         "\${out}")
+    (mkOther                               "sysconfdir"          "/etc")
+    (mkOther                               "localstatedir"       "/var")
+    (mkOther                               "libdir"              "\${lib}/lib")
+    (mkOther                               "includedir"          "\${lib}/include")
+    (mkWith   true                         "rbd"                  null)
+    (mkWith   true                         "cephfs"               null)
+    (mkWith   hasRadosgw                   "radosgw"              null)
+    (mkWith   true                         "radosstriper"         null)
+    (mkWith   hasServer                    "mon"                  null)
+    (mkWith   hasServer                    "osd"                  null)
+    (mkWith   hasServer                    "mds"                  null)
+    (mkEnable true                         "client"               null)
+    (mkEnable hasServer                    "server"               null)
+    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"             null)
+    (mkWith   (cryptoStr == "nss")         "nss"                  null)
+    (mkEnable false                        "root-make-check"      null)
+    (mkWith   false                        "profiler"             null)
+    (mkWith   false                        "debug"                null)
+    (mkEnable false                        "coverage"             null)
+    (mkWith   (optFuse != null)            "fuse"                 null)
+    (mkWith   (malloc == optJemalloc)      "jemalloc"             null)
+    (mkWith   (malloc == optGperftools)    "tcmalloc"             null)
+    (mkEnable false                        "pgrefdebugging"       null)
+    (mkEnable false                        "cephfs-java"          null)
+    (mkEnable hasXio                       "xio"                  null)
+    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"        null)
+    (mkWith   true                         "ocf"                  null)
+    (mkWith   hasKinetic                   "kinetic"              null)
+    (mkWith   hasRocksdb                   "librocksdb"           null)
+    (mkWith   false                        "librocksdb-static"    null)
   ] ++ optional stdenv.isLinux [
-    (mkWith   (optLibaio != null)          "libaio"              null)
-    (mkWith   (optLibxfs != null)          "libxfs"              null)
-    (mkWith   (optZfs != null)             "libzfs"              null)
+    (mkWith   (optLibaio != null)          "libaio"               null)
+    (mkWith   (optLibxfs != null)          "libxfs"               null)
+    (mkWith   (optZfs != null)             "libzfs"               null)
+  ] ++ optional (versionAtLeast version "0.94.3") [
+    (mkWith   false                        "tcmalloc-minimal"     null)
   ] ++ optional (versionAtLeast version "9.0.1") [
-    (mkWith   false                        "tcmalloc-minimal"    null)
-    (mkWith   false                        "valgrind"            null)
+    (mkWith   false                        "valgrind"             null)
   ] ++ optional (versionAtLeast version "9.0.2") [
-    (mkWith   true                         "man-pages"           null)
-    (mkWith   true                         "systemd-libexec-dir" "\${TMPDIR}")
+    (mkWith   true                         "man-pages"            null)
+    (mkWith   true                         "systemd-libexec-dir"  "\${out}/libexec")
   ] ++ optional (versionOlder version "10.0.0") [
-    (mkWith   (optLibs3 != null)           "system-libs3"        null)
-    (mkWith   true                         "rest-bench"          null)
+    (mkWith   (optLibs3 != null)           "system-libs3"         null)
+    (mkWith   true                         "rest-bench"           null)
+  ] ++ optional (versionAtLeast version "10.0.0") [
+    (mkWith   true                         "rgw-user"             "rgw")
+    (mkWith   true                         "rgw-group"            "rgw")
+    (mkWith   true                         "systemd-unit-dir"     "\${out}/etc/systemd/system")
   ];
 
   preBuild = optionalString (versionAtLeast version "9.0.0") ''
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index 913901a0f80..9343d2cdf33 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-07-31";
+  version = "2015-08-05";
 
   src = fetchgit {
-    url = "git://github.com/ceph/ceph.git";
-    rev = "ef86e29259d0e863e62115926bf67287dc9a7e41";
-    sha256 = "14h387ngx3fmdm0b0sgl0l743j3d22gnp3lv68ah59yc4crfgdcx";
+    url = "git://github.com/wkennington/ceph.git";
+    rev = "043a780feb973b7ad571bb696437476da3260133";
+    sha256 = "02kk24wm6mxsclklsz5zzpj3wm6f341blj2anx3v5x20cixzdnhp";
   };
 
   patches = [ ./fix-pythonpath.patch ];
diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix
new file mode 100644
index 00000000000..7ce48d28803
--- /dev/null
+++ b/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }:
+
+stdenv.mkDerivation rec {
+  name = "hubicfuse-${version}";
+  version = "2.1.0";
+
+  src = fetchurl {
+    url = https://github.com/TurboGit/hubicfuse/archive/v2.1.0.tar.gz;
+    sha256 = "1mnijcwac6k3f6xknvdrsbmkkizpwbayqkb5l6jic15ymxv1fs7d";
+  };
+
+  buildInputs = [ pkgconfig curl openssl fuse libxml2 json_c file ];
+  postInstall = ''
+    install hubic_token $out/bin
+    mkdir -p $out/sbin
+    ln -sf $out/bin/hubicfuse $out/sbin/mount.hubicfuse
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/TurboGit/hubicfuse;
+    description = "FUSE-based filesystem to access hubic cloud storage";
+    platforms = platforms.linux;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/tools/misc/debbindiff/default.nix b/pkgs/tools/misc/debbindiff/default.nix
deleted file mode 100644
index f5fcb37324e..00000000000
--- a/pkgs/tools/misc/debbindiff/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchgit, pythonPackages, docutils
-, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext
-, gnupg, gzip, pdftk, poppler_utils, rpm, squashfsTools, unzip, vim, xz
-}:
-
-pythonPackages.buildPythonPackage rec {
-  name = "debbindiff-${version}";
-  version = "26";
-
-  namePrefix = "";
-
-  src = fetchgit {
-    url = "git://anonscm.debian.org/reproducible/debbindiff.git";
-    rev = "refs/tags/${version}";
-    sha256 = "18637gc7c92mwcpx3dvh6xild0sb9bwsgfcrjplmh7s8frvlvkv6";
-  };
-
-  postPatch = ''
-    # Different pkg name in debian
-    sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
-
-    # Upstream doesn't provide a PKG-INFO file
-    sed -i setup.py -e "/'rpm',/d"
-  '';
-
-  # Still missing these tools: ghc javap showttf sng
-  propagatedBuildInputs = (with pythonPackages; [ debian magic ]) ++
-    [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
-      gzip pdftk poppler_utils rpm squashfsTools unzip vim xz ];
-
-  doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
-
-  postInstall = ''
-    mv $out/bin/debbindiff.py $out/bin/debbindiff
-    mkdir -p $out/share/man/man1
-    ${docutils}/bin/rst2man.py debian/debbindiff.1.rst $out/share/man/man1/debbindiff.1
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Highlight differences between two builds of Debian packages, and even other kind of files";
-    homepage = https://wiki.debian.org/ReproducibleBuilds;
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
new file mode 100644
index 00000000000..e6c672d8344
--- /dev/null
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchgit, pythonPackages, docutils
+, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext
+, gnupg, gzip, pdftk, poppler_utils, rpm, sqlite, squashfsTools, unzip, vim, xz
+}:
+
+pythonPackages.buildPythonPackage rec {
+  name = "diffoscope-${version}";
+  version = "29";
+
+  namePrefix = "";
+
+  src = fetchgit {
+    url = "git://anonscm.debian.org/reproducible/diffoscope.git";
+    rev = "refs/tags/${version}";
+    sha256 = "0q7hx2wm9gvzl1f7iilr9pjwpv8i2anscqan7cgk80v90s2pakrf";
+  };
+
+  postPatch = ''
+    # Different pkg name in debian
+    sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
+
+    # Upstream doesn't provide a PKG-INFO file
+    sed -i setup.py -e "/'rpm',/d"
+  '';
+
+  # Still missing these tools: ghc javap showttf sng
+  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c magic ssdeep ]) ++
+    [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
+      gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ];
+
+  doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
+
+  postInstall = ''
+    mv $out/bin/diffoscope.py $out/bin/diffoscope
+    mkdir -p $out/share/man/man1
+    ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Perform in-depth comparison of files, archives, and directories";
+    longDescription = ''
+      diffoscope will try to get to the bottom of what makes files or directories
+      different. It will recursively unpack archives of many kinds and transform
+      various binary formats into more human readable form to compare them. It can
+      compare two tarballs, ISO images, or PDF just as easily. The differences can
+      be shown in a text or HTML report.
+
+      diffoscope is developed as part of the "reproducible builds" Debian
+      project and was formerly known as "debbindiff".
+    '';
+    homepage = https://wiki.debian.org/ReproducibleBuilds;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index abe6a8adc14..d07e99e2660 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.5.2";
+  version = "0.6.0";
   name = "vdirsyncer-${version}";
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://github.com/untitaker/vdirsyncer/archive/${version}.tar.gz";
-    sha256 = "02k6ijj0z0r08l50ignm2ngd4ax84l0r1wshh1is0wcfr70d94h9";
+    url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz";
+    sha256 = "1mb0pws5vsgnmyp5dp5m5jvgl6jcvdamxjz7wmgvxkw6n1vrcahd";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 21de5705e4f..02eee4d7e36 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,23 +1,25 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.19";
+  version = "1.4.20";
   name = "ccid-${version}";
 
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
-    sha256 = "1q9lx5ci8kikwk9mhbjl6m3zk4id209zfna5wgpqjrp5nhmjrjyc";
+    url = "https://alioth.debian.org/frs/download.php/file/4140/ccid-1.4.20.tar.bz2";
+    sha256 = "1g0w4pv6q30d8lhs3kd6nywkhh34nhf9fbcbcvbxdvk3pdjvh320";
   };
 
   patchPhase = ''
-    sed -i 's,/usr/bin/env perl,${perl}/bin/perl,' src/*.pl
+    patchShebangs .
     substituteInPlace src/Makefile.in --replace /bin/echo echo
   '';
+
   preConfigure = ''
-    configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers"
+    configureFlagsArray+=("--enable-usbdropdir=$out/pcsc/drivers")
   '';
 
-  buildInputs = [ pcsclite pkgconfig libusb1 ];
+  nativeBuildInputs = [ pkgconfig perl ];
+  buildInputs = [ pcsclite libusb1 ];
 
   meta = with stdenv.lib; {
     description = "ccid drivers for pcsclite";
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 0b6a8712661..6ec0cb23864 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,23 +1,22 @@
 { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }:
 
 stdenv.mkDerivation rec {
-  name = "pcsclite-1.8.13";
+  name = "pcsclite-1.8.14";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/4126/pcsc-lite-1.8.13.tar.bz2";
-    sha256 = "0fxwzckbjsckfp1f01yp3x6y1wlaaivhy12a5hka6qwdh1z085gk";
+    url = "https://alioth.debian.org/frs/download.php/file/4138/pcsc-lite-1.8.14.tar.bz2";
+    sha256 = "0kik09dif6hih09vvprd7zvj31lnrclrbrh5y10mlca2c209f7xr";
   };
 
-  # The OS should care on preparing the drivers into this location
   configureFlags = [
+    # The OS should care on preparing the drivers into this location
     "--enable-usbdropdir=/var/lib/pcsc/drivers"
-    "--with-systemdsystemunitdir=$out/etc/systemd/system"
-    "--enable-confdir=$out/etc"
+    "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
+    "--enable-confdir=/etc"
   ];
 
-  buildInputs = [ udev dbus_libs perl ];
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig perl ];
+  buildInputs = [ udev dbus_libs ];
 
   meta = with stdenv.lib; {
     description = "Middleware to access a smart card using SCard API (PC/SC)";
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
index 4cc5e2505d1..fceb4c82128 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     description = "Tools for maintaining UEFI signature databases";
     homepage    = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases;
     maintainers = [ maintainers.tstrobel ];
-    platforms   = platforms.linux;
+    platforms   = [ "x86_64-linux" ]; # Broken on i686
   };
 }
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6794e4b2e3..54adc88e544 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1260,8 +1260,6 @@ let
 
   dcfldd = callPackage ../tools/system/dcfldd { };
 
-  debbindiff = callPackage ../tools/misc/debbindiff { };
-
   debian_devscripts = callPackage ../tools/misc/debian-devscripts {
     inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
   };
@@ -1304,6 +1302,8 @@ let
 
   di = callPackage ../tools/system/di { };
 
+  diffoscope = callPackage ../tools/misc/diffoscope { };
+
   diffstat = callPackage ../tools/text/diffstat { };
 
   diffutils = callPackage ../tools/text/diffutils { };
@@ -1871,6 +1871,8 @@ let
 
   httptunnel = callPackage ../tools/networking/httptunnel { };
 
+  hubicfuse = callPackage ../tools/filesystems/hubicfuse { };
+
   hwinfo = callPackage ../tools/system/hwinfo { };
 
   i2c-tools = callPackage ../os-specific/linux/i2c-tools { };
@@ -5316,7 +5318,7 @@ let
 
   bam = callPackage ../development/tools/build-managers/bam {};
 
-  bazel = callPackage ../development/tools/build-managers/bazel { jdk = oraclejdk8; };
+  bazel = callPackage ../development/tools/build-managers/bazel { jdk = openjdk8; };
 
   bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };
 
@@ -6770,6 +6772,7 @@ let
     else libcanberra;
 
   libcec = callPackage ../development/libraries/libcec { };
+  libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };
 
   libcello = callPackage ../development/libraries/libcello {};
 
@@ -7348,6 +7351,8 @@ let
 
   libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { };
 
+  libtap = callPackage ../development/libraries/libtap { };
+
   libtsm = callPackage ../development/libraries/libtsm {
     automake = automake114x;
   };
@@ -9250,7 +9255,9 @@ let
 
   seyren = callPackage ../servers/monitoring/seyren { };
 
-  sensu = callPackage ../servers/monitoring/sensu { };
+  sensu = callPackage ../servers/monitoring/sensu {
+    ruby = ruby_2_1;
+  };
 
   shishi = callPackage ../servers/shishi { };
 
@@ -11142,7 +11149,6 @@ let
     gitModes = callPackage ../applications/editors/emacs-modes/git-modes { };
 
     haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
-    haskellModeGit = lowPrio (callPackage ../applications/editors/emacs-modes/haskell/git.nix { });
 
     hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { };
 
@@ -11412,6 +11418,7 @@ let
   firefox = callPackage ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
+    libpng = libpng_apng;
     enableGTK3 = false;
   };
 
@@ -12938,6 +12945,8 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
+  tortoisehg = callPackage ../applications/version-management/tortoisehg { };
+
   toxic = callPackage ../applications/networking/instant-messengers/toxic { };
 
   transcode = callPackage ../applications/audio/transcode { };
@@ -13612,6 +13621,8 @@ let
 
   flightgear = callPackage ../games/flightgear { };
 
+  freecell-solver = callPackage ../games/freecell-solver { };
+
   freeciv = callPackage ../games/freeciv { };
 
   freeciv_gtk = callPackage ../games/freeciv {
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 5982a9f5ce7..9f0978ffa1a 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1,17 +1,35 @@
 # package.el-based emacs packages
+
+## FOR USERS
 #
-## add this at the start your init.el:
-# (require 'package)
+# Recommended way: simply use `emacsWithPackages` from
+# `all-packages.nix` with the packages you want.
 #
-# ;; optional. makes unpure packages archives unavailable
-# (setq package-archives nil)
+# Possible way: use `emacs` from `all-packages.nix`, install
+# everything to a system or user profile and then add this at the
+# start your `init.el`:
+/*
+  (require 'package)
+
+  ;; optional. makes unpure packages archives unavailable
+  (setq package-archives nil)
+
+  ;; optional. use this if you install emacs packages to the system profile
+  (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa")
+
+  ;; optional. use this if you install emacs packages to user profiles (with nix-env)
+  (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa")
+
+  (package-initialize)
+*/
+
+## FOR CONTRIBUTORS
 #
-# (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa")
-#
-# ;; optional. use this if you install emacs packages to user profiles (with nix-env)
-# (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa")
-#
-# (package-initialize)
+# When adding a new package here please note that
+# * lib.licenses are `with`ed on top of the file here
+# * both trivialBuild and melpaBuild will automatically derive a
+#   `meta` with `platforms` and `homepage` set to something you are
+#   unlikely to want to override for most packages
 
 { overrides
 
@@ -44,7 +62,10 @@ let self = _self // overrides;
       sha256 = "0dlrhc1dmzgrjvcnlqvm6clyv0r6zray6qqliqngy14880grghbm";
     };
     packageRequires = [ auto-complete haskell-mode ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Haskell code completion for auto-complete Emacs framework";
+      license = gpl3Plus;
+    };
   };
 
   ace-jump-mode = melpaBuild rec {
@@ -72,7 +93,10 @@ let self = _self // overrides;
       sha256 = "19y5w9m2flp4as54q8yfngrkri3kd7fdha9pf2xjgx6ryflqx61k";
     };
     packageRequires = [ dash s ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Search using ag from inside Emacs";
+      license = gpl3Plus;
+    };
   };
 
   agda2-mode = with external; trivialBuild {
@@ -108,7 +132,10 @@ let self = _self // overrides;
       sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
     };
     packageRequires = [ gntp log4e ];
-    meta = { license = gpl2Plus; };
+    meta = {
+      description = "A Growl-like alerts notifier for Emacs";
+      license = gpl2Plus;
+    };
   };
 
   anzu = melpaBuild rec {
@@ -127,7 +154,6 @@ let self = _self // overrides;
         mode which displays current match and total matches information
         in the mode-line in various search mode.
       '';
-      homepage = https://github.com/syohex/emacs-anzu/;
       license = gpl3Plus;
     };
   };
@@ -164,7 +190,10 @@ let self = _self // overrides;
       rev    = "v${version}";
       sha256 = "1j6mbvvbnm2m1gpsy9ipxiv76b684nn57yssbqdyiwyy499cma6q";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Asynchronous processing in Emacs";
+      license = gpl3Plus;
+    };
   };
 
   auctex = melpaBuild rec {
@@ -177,7 +206,11 @@ let self = _self // overrides;
     buildPhase = ''
       cp $src ${pname}-${version}.tar
     '';
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
+      homepage = https://www.gnu.org/software/auctex/;
+      license = gpl3Plus;
+    };
   };
 
   auto-complete = melpaBuild rec {
@@ -194,7 +227,6 @@ let self = _self // overrides;
       description = "Auto-complete extension for Emacs";
       homepage = http://cx4a.org/software/auto-complete/;
       license = gpl3Plus;
-      platforms = lib.platforms.all;
     };
   };
 
@@ -221,7 +253,10 @@ let self = _self // overrides;
       sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i";
     };
     files = [ "bind-key.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "A simple way to manage personal keybindings";
+      license = gpl3Plus;
+    };
   };
 
   browse-kill-ring = melpaBuild rec {
@@ -235,7 +270,6 @@ let self = _self // overrides;
     };
     meta = {
       description = "Interactively insert items from Emacs kill-ring";
-      homepage = https://github.com/browse-kill-ring/browse-kill-ring/;
       license = gpl2Plus;
     };
   };
@@ -251,7 +285,6 @@ let self = _self // overrides;
     };
     meta = {
       description = "Mouseable text in Emacs";
-      homepage = "https://github.com/rolandwalker/button-lock";
       license  = bsd2;
     };
   };
@@ -267,7 +300,10 @@ let self = _self // overrides;
     };
     fileSpecs = [ "emacs/*.el" ];
     configurePhase = "true";
-    meta = { license = gpl2Plus; };
+    meta = {
+      description = "OCaml code editing commands for Emacs";
+      license = gpl2Plus;
+    };
   };
 
   change-inner = melpaBuild rec {
@@ -280,7 +316,10 @@ let self = _self // overrides;
       sha256 = "1fv8630bqbmfr56zai08f1q4dywksmghhm70084bz4vbs6rzdsbq";
     };
     packageRequires = [ expand-region ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Change contents based on semantic units in Emacs";
+      license = gpl3Plus;
+    };
   };
 
   circe = melpaBuild rec {
@@ -294,7 +333,10 @@ let self = _self // overrides;
     };
     packageRequires = [ lcs lui ];
     fileSpecs = [ "lisp/circe*.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "IRC client for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   company = melpaBuild rec {
@@ -306,7 +348,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Modular text completion framework for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   company-ghc = melpaBuild rec {
@@ -334,7 +379,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "02gfrcda7gj3j5yx71dz40xylrafl4pcaj7bgfajqi9by0w2nrnx";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "A modern list library for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   deferred = melpaBuild rec {
@@ -355,7 +403,6 @@ let self = _self // overrides;
         The API and implementations were translated from JSDeferred (by cho45)
          and Mochikit.Async (by Bob Ippolito) in JavaScript.
       '';
-      homepage =  https://github.com/kiwanami/emacs-deferred;
       license = gpl3Plus;
     };
   };
@@ -369,7 +416,11 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "0hshw7z5f8pqxvgxw74kbj6nvprsgfvy45fl854xarnkvqcara09";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Diminishes the amount of space taken on the mode-line by Emacs minor modes";
+      homepage = http://www.eskimo.com/~seldon/;
+      license = gpl3Plus;
+    };
   };
 
   epl = melpaBuild rec {
@@ -770,7 +821,6 @@ let self = _self // overrides;
     };
     meta = {
       description = "Does what you expected ido-everywhere to do in Emacs";
-      homepage = https://github.com/DarwinAwardWinner/ido-ubiquitous/;
       license = gpl3Plus;
     };
   };
@@ -949,7 +999,9 @@ let self = _self // overrides;
     };
   };
 
-  nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {};
+  nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {
+    inherit lib;
+  };
 
   org-plus-contrib = melpaBuild rec {
     pname   = "org-plus-contrib";
@@ -981,7 +1033,7 @@ let self = _self // overrides;
         Org-trello is an emacs minor mode that extends org-mode with
         Trello abilities.
       '';
-      homepage = https://org-trello.github.io;
+      homepage = https://org-trello.github.io/;
       license = gpl3Plus;
     };
   };
@@ -1079,7 +1131,9 @@ let self = _self // overrides;
       sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92";
     };
 
-    meta = with stdenv.lib; {
+    files = [ "request.el" ];
+
+    meta = {
       description = "Easy HTTP request for Emacs Lisp";
       longDescription = ''
         Request.el is a HTTP request library with multiple backends. It supports
@@ -1088,36 +1142,18 @@ let self = _self // overrides;
         Library author can use request.el to avoid imposing external dependencies
         such as curl to users while giving richer experience for users who have curl.
       '';
-      homepage = https://github.com/tkf/emacs-request;
       license = gpl3Plus;
     };
   };
 
   request-deferred = melpaBuild rec {
     pname = "request-deferred";
-    version = "0.2.0";
-
-    src = fetchFromGitHub {
-      owner = "tkf";
-      repo = "emacs-request";
-      rev = "adf7de452f9914406bfb693541f1d280093c4efd";
-      sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92";
-    };
-
+    version = request.version;
+    src = request.src;
     packageRequires = [ request deferred ];
-
-    meta = with stdenv.lib; {
-      description = "Easy HTTP request for Emacs Lisp";
-      longDescription = ''
-        Request.el is a HTTP request library with multiple backends. It supports
-        url.el which is shipped with Emacs and curl command line program. User
-        can use curl when s/he has it, as curl is more reliable than url.el.
-        Library author can use request.el to avoid imposing external dependencies
-        such as curl to users while giving richer experience for users who have curl.
-      '';
-      homepage = https://github.com/tkf/emacs-request;
-      license = gpl3Plus;
-    };
+    files = [ "request-deferred.el" ];
+    meta = request.meta
+        // { description = "${request.meta.description} (deferred)"; };
   };
 
   rich-minority = melpaBuild rec {
@@ -1130,7 +1166,10 @@ let self = _self // overrides;
       sha256 = "0kvhy4mgs9llihwsb1a9n5a85xzjiyiyawxnz0axy2bvwcxnp20k";
     };
     packageRequires = [ dash ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Hiding and/or highlighting the list of minor modes in the Emacs mode-line.";
+      license = gpl3Plus;
+    };
   };
 
   s = melpaBuild rec {
@@ -1211,7 +1250,6 @@ let self = _self // overrides;
     };
     meta = {
       description = "M-x enhancement for Emacs build on top of Ido";
-      homepage = https://github.com/nonsequitur/smex/;
       license = emacs.meta.license; # should be "same as Emacs"
     };
   };
@@ -1224,7 +1262,6 @@ let self = _self // overrides;
     fileSpecs = [ "elisp/*.el" ];
 
     meta = {
-      homepage = "https://github.com/chrisdone/structured-haskell-mode";
       description = "Structured editing Emacs mode for Haskell";
       license = bsd3;
       platforms = external.structured-haskell-mode.meta.platforms;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ec0bd08cd88..470dc6605f5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1661,6 +1661,21 @@ let
     propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
   };
 
+  memberlist_v2 = buildGoPackage rec {
+    rev = "165267096ca647f00cc0b59a8f1ede9a96cbfbb1";
+    name = "memberlist-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/memberlist";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "memberlist";
+      sha256 = "09lh79xqy7q0gy23x22lpfwihb5acr750vxl2fx0i4b88kq1vrzh";
+    };
+
+    propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
+  };
+
   mesos-stats = buildGoPackage rec {
     rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920";
     name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5e3c6d6f0e0..43fc9976ec7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -44,8 +44,8 @@ rec {
       libiconv = pkgs.darwin.libiconv;
     });
 
-    ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
-      ghc = compiler.ghc7101;
+    ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs {
+      ghc = compiler.ghc7102;
     };
 
     jhc = callPackage ../development/compilers/jhc {
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 383f03934a2..4757dfd49c3 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -287,6 +287,7 @@ let
       homepage = "https://github.com/lua-stdlib/lua-stdlib/";
       hydraPlatforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
+      broken = true;
     };
   };
 
@@ -400,4 +401,29 @@ let
     '';
   };
 
+  vicious = stdenv.mkDerivation rec {
+    name = "vicious-${version}";
+    version = "2.1.3";
+
+    src = fetchzip {
+      url    = "http://git.sysphere.org/vicious/snapshot/vicious-${version}.tar.xz";
+      sha256 = "1c901siza5vpcbkgx99g1vkqiki5qgkzx2brnj4wrpbsbfzq0bcq";
+    };
+
+    meta = with stdenv.lib; {
+      description = "vicious widgets for window managers";
+      homepage    = http://git.sysphere.org/vicious/;
+      license     = licenses.gpl2;
+      maintainers = with maintainers; [ makefu ];
+      platforms   = platforms.linux;
+    };
+
+    buildInputs = [ lua ];
+    installPhase = ''
+      mkdir -p $out/lib/lua/${lua.luaversion}/
+      cp -r . $out/lib/lua/${lua.luaversion}/vicious/
+      printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' ..  package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua
+    '';
+  };
+
 }; in self
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d1ab2ea9f77..5218e9e2ecb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1632,17 +1632,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   ConfigMVP = buildPerlPackage {
-    name = "Config-MVP-2.200007";
+    name = "Config-MVP-2.200010";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200007.tar.gz;
-      sha256 = "10hc8v22mv56wqi6drpl4pw3r8y3xrgh80ayrb2gir80ah9s5bvi";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200010.tar.gz;
+      sha256 = "bfb5870452a12ead4d3fd485045d1fa92b2a11741c3b93b61eb43f3dcbd6099b";
     };
     buildInputs = [ TestFatal ];
-    propagatedBuildInputs = [ ClassLoad Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ];
+    propagatedBuildInputs = [ ClassLoad ModulePluggable Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ];
     meta = {
-      homepage = https://github.com/rjbs/config-mvp;
+      homepage = https://github.com/rjbs/Config-MVP;
       description = "Multivalue-property package-oriented configuration";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -4066,6 +4067,20 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
+  GamesSolitaireVerify = buildPerlModule {
+    name = "Games-Solitaire-Verify-0.1400";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1400.tar.gz;
+      sha256 = "0c897c17f23ed6710d0e3ddfb54cce0f00f5b68c55277181adc94a03b7d8c659";
+    };
+    buildInputs = [ TestDifferences ];
+    propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils MooXlate ];
+    meta = {
+      description = "Verify solutions for solitaire games";
+      license = "mit";
+    };
+  };
+
   GD = buildPerlPackage rec {
     name = "GD-2.53";
     src = fetchurl {
@@ -6190,6 +6205,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  MooXlate = buildPerlPackage {
+    name = "MooX-late-0.015";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.015.tar.gz;
+      sha256 = "175326af3076fa8698669f289fad1322724978cddaf40ea04e600fcd7f6afbbf";
+    };
+    buildInputs = [ TestFatal TestRequires ];
+    propagatedBuildInputs = [ Moo TypeTiny ];
+    meta = {
+      homepage = https://metacpan.org/release/MooX-late;
+      description = "Easily translate Moose code to Moo";
+      license = "perl";
+    };
+  };
+
   MouseXSimpleConfig = buildPerlPackage {
     name = "MouseX-SimpleConfig-0.11";
     src = fetchurl {
@@ -7514,18 +7544,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  PerlCritic = buildPerlPackage {
-    name = "Perl-Critic-1.121";
+  PerlCritic = buildPerlModule {
+    name = "Perl-Critic-1.125";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.121.tar.gz;
-      sha256 = "1y2bxjwzlp6ix51h36a5g3dqpaviaajij1rn22hpvcqxh4hh6car";
+      url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.125.tar.gz;
+      sha256 = "503b718356b14d4c00ed486b66a0f622f4bef2b206be406ee7922c8270463fa1";
     };
     buildInputs = [ TestDeep ];
-    propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass IOString ListMoreUtils PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ];
+    propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ];
     meta = {
       homepage = http://perlcritic.com;
       description = "Critique Perl source code for best-practices";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -7710,18 +7741,24 @@ let self = _self // overrides; _self = with self; {
   };
 
   PPI = buildPerlPackage {
-    name = "PPI-1.215";
+    name = "PPI-1.220";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AD/ADAMK/PPI-1.215.tar.gz;
-      sha256 = "db238e84da705b952b69f25554019ce70124079a0ad43713d0638aa14ba54878";
+      url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.220.tar.gz;
+      sha256 = "1e15be50e7d95a36d351af8bf5074f6695a2c72165e586d93e616183e7602b83";
     };
     buildInputs = [ ClassInspector FileRemove TestNoWarnings TestObject TestSubCalls ];
     propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ];
+
+    # Remove test that fails due to unexpected shebang after
+    # patchShebang.
+    preCheck = "rm t/03_document.t";
+
     meta = {
+      homepage = https://github.com/adamkennedy/PPI;
       description = "Parse, Analyze and Manipulate Perl (without perl)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
-    doCheck = false;
   };
 
   PPIxRegexp = buildPerlPackage {
@@ -7867,17 +7904,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   PodElementalPerlMunger = buildPerlPackage {
-    name = "Pod-Elemental-PerlMunger-0.093332";
+    name = "Pod-Elemental-PerlMunger-0.200003";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.093332.tar.gz;
-      sha256 = "fc4c4ef76d2b557c590b998d08393b189a2af969d4d195439f37e7d7d466d062";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200003.tar.gz;
+      sha256 = "94b3abe6894c96b7990cb324a3789af05489dc2b5d1ec8961d37309cc6e8c243";
     };
     buildInputs = [ Moose PodElemental ];
-    propagatedBuildInputs = [ ListMoreUtils Moose PPI PodElemental namespaceautoclean ];
+    propagatedBuildInputs = [ ListMoreUtils Moose PPI ParamsUtil PodElemental namespaceautoclean ];
     meta = {
-      homepage = https://github.com/rjbs/pod-elemental-perlmunger;
+      homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger;
       description = "A thing that takes a string of Perl and rewrites its documentation";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9c42d325ed..cf0140a25d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2300,7 +2300,7 @@ let
 
     buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
                     self.iso8601 self.pyasn1 self.pytest ];
-    propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi;
+    propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi_0_8;
   };
 
   cryptography_vectors = buildPythonPackage rec {
@@ -2402,6 +2402,21 @@ 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";
+    };
+
+    propagatedBuildInputs = with self; [ pkgs.libffi pycparser ];
+
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
+    };
+  };
+
   cffi = buildPythonPackage rec {
     name = "cffi-1.1.2";
 
@@ -3717,6 +3732,23 @@ let
     };
   };
 
+  iniparse = buildPythonPackage rec {
+
+    name = "iniparse-${version}";
+    version = "0.4";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/iniparse/iniparse-${version}.tar.gz";
+      sha256 = "0m60k46vr03x68jckachzsipav0bwhhnqb8715hm1cngs89fxhdb";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Accessing and Modifying INI files";
+      license = licenses.mit;
+      maintainers = [ "abcz2.uprola@gmail.com" ];
+    };
+  };
+
   i3-py = buildPythonPackage rec {
     version = "0.6.4";
     name = "i3-py-${version}";
@@ -4558,6 +4590,19 @@ let
   };
 
 
+  ssdeep = buildPythonPackage rec {
+    name = "ssdeep-3.1.1";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/ssdeep/${name}.tar.gz";
+      sha256 = "1p9dpykmnfb73cszdiic5wbz5bmbbmkiih08pb4dah5mwq4n7im6";
+    };
+
+    buildInputs = with pkgs; [ ssdeep ];
+    propagatedBuildInputs = with self; [ cffi six ];
+  };
+
+
   statsd = buildPythonPackage rec {
     name = "statsd-2.0.2";
 
@@ -8449,14 +8494,16 @@ let
   };
 
   numexpr = buildPythonPackage rec {
-    version = "2.4";
+    version = "2.4.3";
     name = "numexpr-${version}";
 
-    src = pkgs.fetchgit {
-      url = https://github.com/pydata/numexpr.git;
-      rev = "606cc9a110711e947d35ac2770749c00dab184c8";
-      sha256 = "1gxgkg7ncgjhnifn444iha5nrjhyr8sr6w5yp204186a1ysz858g";
+    src = pkgs.fetchurl {
+      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;
 
     propagatedBuildInputs = with self; [ numpy ];
 
@@ -9304,6 +9351,29 @@ let
     propagatedBuildInputs = with self; [ unittest2 ];
   };
 
+  pysftp = buildPythonPackage rec {
+    name = "pysftp-${version}";
+    version = "0.2.8";
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pysftp/${name}.tar.gz";
+      sha256 = "1d69z8yngciksch1i8rivy1xl8f6g6sb7c3kk5cm3pf8304q6hhm";
+    };
+
+    propagatedBuildInputs = with self; [ paramiko ];
+
+    meta = {
+      homepage = https://bitbucket.org/dundeemt/pysftp;
+      description = "A friendly face on SFTP";
+      license = licenses.mit;
+      longDescription = ''
+        A simple interface to SFTP. The module offers high level abstractions
+        and task based routines to handle your SFTP needs. Checkout the Cook
+        Book, in the docs, to see what pysftp can do for you.
+      '';
+    };
+  };
 
   python3pika = buildPythonPackage {
     name = "python3-pika-0.9.14";
@@ -9524,15 +9594,21 @@ let
 
 
 
-  praw = pythonPackages.buildPythonPackage rec {
-    name = "praw-2.1.21";
+  praw = buildPythonPackage rec {
+    name = "praw-3.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/praw/praw-2.1.21.tar.gz";
-      md5 = "3b0388c9105662f8be8f1a4d3a38216d";
+      url = "https://pypi.python.org/packages/source/p/praw/${name}.zip";
+      sha256 = "1dilb3vr5llqy344i6nh7gl07wcssb5dmqrhjwhfqi1mais7b953";
     };
 
-    propagatedBuildInputs = with pythonPackages; [ update_checker six mock flake8 ];
+    propagatedBuildInputs = with self; [
+      decorator
+      flake8
+      mock
+      six
+      update_checker
+    ];
 
     # can't find the tests module?
     doCheck = false;
@@ -9541,6 +9617,8 @@ let
       description = "Python Reddit API wrapper";
       homepage = http://praw.readthedocs.org/;
       license = licenses.gpl3;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ jgeerds ];
     };
   };
 
@@ -10486,6 +10564,7 @@ let
       homepage = https://github.com/seb-m/pyinotify/wiki;
       description = "Monitor filesystems events on Linux platforms with inotify";
       license = licenses.mit;
+      platforms = platforms.linux;
     };
   };
 
@@ -11522,6 +11601,37 @@ let
     };
   };
 
+  qscintilla = pkgs.stdenv.mkDerivation rec {
+    # TODO: Qt5 support
+    name = "qscintilla-${version}";
+    version = pkgs.qscintilla.version;
+    disabled = isPy3k || isPyPy;
+
+    src = pkgs.qscintilla.src;
+
+    buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
+
+    preConfigure = ''
+      mkdir -p $out
+      lndir ${pkgs.pyqt4} $out
+      cd Python
+      ${python.executable} ./configure-old.py \
+          --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
+          --apidir $out/api/${python.libPrefix} \
+          -n ${pkgs.qscintilla}/include \
+          -o ${pkgs.qscintilla}/lib \
+          --sipdir $out/share/sip
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A Python binding to QScintilla, Qt based text editing control";
+      license = licenses.lgpl21Plus;
+      maintainers = [ "abcz2.uprola@gmail.com" ];
+      platforms = platforms.linux;
+    };
+  };
+
+
   qserve = buildPythonPackage rec {
     name = "qserve-0.2.8";
     disabled = isPy3k;
@@ -15138,16 +15248,15 @@ let
     doCheck = false;
   };
   tornado = buildPythonPackage rec {
-    name = "tornado-4.1";
+    name = "tornado-${version}";
+    version = "4.2.1";
 
     propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
-      sha256 = "0a12f00h277zbifibnj46wf14801f573irvf6hwkgja5vspd7awr";
+      sha256 = "a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969";
     };
-
-    doCheck = false;
   };
 
   tokenlib = buildPythonPackage rec {
@@ -15243,6 +15352,22 @@ let
     propagatedBuildInputs = with self; [ pkgs.libarchive ];
   };
 
+  libarchive-c = buildPythonPackage rec {
+    name = "libarchive-c-2.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/libarchive-c/${name}.tar.gz";
+      sha256 = "089lrz6xyrfnk55v35vis6jyqyyl77w093057djyspnd2744wi2n";
+    };
+
+    patchPhase = ''
+      substituteInPlace libarchive/ffi.py --replace \
+        "find_library('archive')" "'${pkgs.libarchive}/lib/libarchive.so'"
+    '';
+
+    buildInputs = [ pkgs.libarchive ];
+  };
+
   pybrowserid = buildPythonPackage rec {
     name = "PyBrowserID-${version}";
     version = "0.9.2";
@@ -16021,12 +16146,12 @@ let
     };
   };
 
-  pythonefl_1_14 = buildPythonPackage rec {
+  pythonefl_1_15 = buildPythonPackage rec {
     name = "python-efl-${version}";
-    version = "1.14.0";
+    version = "1.15.0";
     src = pkgs.fetchurl {
       url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz";
-      sha256 = "1pns5mdyc069z6j1pywjasdd6v9xka5kjdl2yxpd6ds948dia0q0";
+      sha256 = "1k3vb7pb70l2v1s2mzg91wvmncq93vb04vn60pzdlrnbcns0grhi";
     };
     preConfigure = ''
       export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
@@ -16901,6 +17026,7 @@ let
   
   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";