diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f8df6ae7ca5d..5b72e4d9a335 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -193,6 +193,7 @@ self: super: {
 
   # These packages try to access the network.
   amqp = dontCheck super.amqp;
+  amqp-conduit = dontCheck super.amqp-conduit;
   concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
   dbus = dontCheck super.dbus;                          # http://hydra.cryp.to/build/498404/log/raw
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 055c2c10999b..9dd694387fbe 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -59,7 +59,7 @@ self: super: {
   imports = super.imports.override { mtl = self.mtl_2_2_1; };
 
   # Newer versions require mtl 2.2.x.
-  mtl-prelude = self.mtl-prelude_1_0_2;
+  mtl-prelude = self.mtl-prelude_1_0_3;
 
   # The test suite pulls in mtl 2.2.x
   command-qq = dontCheck super.command-qq;
@@ -71,8 +71,9 @@ self: super: {
   seqid = super.seqid_0_1_0;
   seqid-streams = super.seqid-streams_0_1_0;
 
-  # Requires mtl 2.2.x: https://github.com/tatac1/amqp-conduit/issues/1
-  amqp-conduit = markBroken super.amqp-conduit;
+  # Need binary >= 0.7.2, but our compiler has only 0.7.1.0.
+  hosc = dontDistribute super.hosc;
+  tidal-midi = dontDistribute super.tidal-midi;
 
 }
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0cc198365a3b..c2fb2db12c61 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3661,6 +3661,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "DynamicTimeWarp" = callPackage
+    ({ mkDerivation, array, base, criterion, QuickCheck, random, vector
+     }:
+     mkDerivation {
+       pname = "DynamicTimeWarp";
+       version = "0.1.0.0";
+       sha256 = "0m58bq2jvnr17kdapfydd063af6w5vdyzxad5izk0cj0gids5hk7";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ array base criterion QuickCheck random vector ];
+       jailbreak = true;
+       homepage = "https://github.com/zombiecalypse/DynamicTimeWarp";
+       description = "Dynamic time warping of sequences";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "DysFRP" = callPackage
     ({ mkDerivation, base, contravariant, mtl, time, transformers }:
      mkDerivation {
@@ -18151,8 +18167,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp";
-       version = "0.11";
-       sha256 = "1brvr8qzkhv7c2j5zzqwfpzw5n2b1l1d92idn2bs4yjzn3c1ama7";
+       version = "0.12";
+       sha256 = "0bivp7lfnsazd0ng080jf85x9jqzna3r82kxzxy2f12pc5xawn9v";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -18178,8 +18194,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp-conduit";
-       version = "0.1.0.0";
-       sha256 = "01c7pksg173ramh0kksyrzpaz661d82d6s0lpfdhi0lgh2qqnw3l";
+       version = "0.1.0.1";
+       sha256 = "167dkak5hg4q5b7i58mw6bl0mh38nyqbzyrhplmil9nins7cvqmv";
        buildDepends = [
          amqp base conduit exceptions lifted-base monad-control mtl
          resourcet text transformers transformers-base
@@ -21940,8 +21956,8 @@ self: {
     ({ mkDerivation, base, bytestring, entropy }:
      mkDerivation {
        pname = "bcrypt";
-       version = "0.0.5";
-       sha256 = "1dcaq81anjj91jwl90dap6sy8b88igy8iyfd6226mdqlh5zyvafg";
+       version = "0.0.6";
+       sha256 = "032la7v7kp0k26s3lj006hgc7a99ylqpp5qi27jxnac10yjl5bi5";
        buildDepends = [ base bytestring entropy ];
        description = "Haskell bindings to the bcrypt password hash";
        license = stdenv.lib.licenses.bsd3;
@@ -26430,8 +26446,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "0.9.2";
-       sha256 = "1i47vm27vp55dl0qybx5r152w6mfr94zzdr6h2kp49xc8ccvh469";
+       version = "0.9.3";
+       sha256 = "0xsq77qawvvi2nbxc9z9czyph3pkswvkcclf7xxls1pj254fq4yc";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -27305,8 +27321,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.2.0.2";
-       sha256 = "0cw1vk0zgml4czhbnafqsz3ipy43wnzfnmkxhr1qr022s03nhwyi";
+       version = "2.2.0.3";
+       sha256 = "1f2xwwrn63wnffhblxwzpvbr7vqi2sz2v2bb3bbs9bf03mb78pja";
        buildDepends = [
          base casadi-bindings-core casadi-bindings-internal containers
          linear vector
@@ -31577,22 +31593,32 @@ self: {
      }) {};
 
   "configuration-tools" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-unicode-symbols
-     , bytestring, Cabal, case-insensitive, directory, dlist, errors
-     , mtl, network-uri, optparse-applicative, process, profunctors
-     , text, transformers, unordered-containers, yaml
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+     , base-unicode-symbols, base64-bytestring, bytestring, Cabal
+     , case-insensitive, connection, data-default, directory, dlist
+     , enclosed-exceptions, errors, http-client, http-client-tls
+     , http-types, monad-control, mtl, network-uri, optparse-applicative
+     , process, profunctors, text, tls, transformers
+     , unordered-containers, wai, warp, warp-tls, x509, x509-system
+     , x509-validation, yaml
      }:
      mkDerivation {
        pname = "configuration-tools";
-       version = "0.2.8";
-       sha256 = "1xg36kdzh80c1npk43g95pyy08rlldy736a78ihzdhsrqf45jasz";
+       version = "0.2.9";
+       sha256 = "18ckc18y785xlvywy13lm8whxgqc8kgcgq72cl3rq83mf7iq6ahn";
        buildDepends = [
-         aeson attoparsec base base-unicode-symbols bytestring Cabal
-         case-insensitive directory dlist errors mtl network-uri
-         optparse-applicative process profunctors text transformers
-         unordered-containers yaml
+         aeson ansi-wl-pprint attoparsec base base-unicode-symbols
+         base64-bytestring bytestring Cabal case-insensitive connection
+         data-default directory dlist enclosed-exceptions errors http-client
+         http-client-tls monad-control mtl network-uri optparse-applicative
+         process profunctors text tls transformers unordered-containers x509
+         x509-system x509-validation yaml
+       ];
+       testDepends = [
+         base base-unicode-symbols bytestring Cabal enclosed-exceptions
+         errors http-types monad-control mtl text unordered-containers wai
+         warp warp-tls yaml
        ];
-       testDepends = [ base base-unicode-symbols errors mtl ];
        jailbreak = true;
        homepage = "https://github.com/alephcloud/hs-configuration-tools";
        description = "Tools for specifying and parsing configurations";
@@ -46375,8 +46401,8 @@ self: {
      }:
      mkDerivation {
        pname = "friday";
-       version = "0.2.0.1";
-       sha256 = "1xnngcd3xsj70y3fwklxxy28yd5g9a9xxf5nfi7cbkxakkwk9bc3";
+       version = "0.2.0.2";
+       sha256 = "1warjzy5ciabyd3wkfaxz82y893vri3zbn8i8xhf7018fcgkna0b";
        buildDepends = [
          base bytestring convertible deepseq primitive ratio-int
          transformers vector
@@ -48725,8 +48751,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150113";
-       sha256 = "16lvw2sh0i69ryf43yl7rh1x1vkvwfqibkbzwvnkcjm9rzga5kxg";
+       version = "5.20150205";
+       sha256 = "1idmm5psg6dllpazri7xnpgcjrn6z2dcddnvylfsq2vypsh1kirv";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -49190,8 +49216,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitlib-libgit2";
-       version = "3.1.0.2";
-       sha256 = "15x0fgzmb483qiky3c3yg2sd4w96xqkaj04qvirh4g2ba5qvib73";
+       version = "3.1.0.3";
+       sha256 = "19lly5nrxa05gj6mv887d419mm65ha40rggv2a8y1jd6s7z6drfi";
        buildDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions fast-logger filepath gitlib hlibgit2 lifted-async
@@ -61726,6 +61752,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "horizon" = callPackage
+    ({ mkDerivation, AC-Angle, base, time }:
+     mkDerivation {
+       pname = "horizon";
+       version = "0.1.0";
+       sha256 = "0yzchd0kfszwf0dwr8vbg7zbr6an5zk0hw658mj82d89jmzldwjv";
+       buildDepends = [ AC-Angle base time ];
+       homepage = "https://github.com/intractable/horizon";
+       description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hosc" = callPackage
     ({ mkDerivation, base, binary, blaze-builder, bytestring
      , data-binary-ieee754, network, QuickCheck, test-framework
@@ -67434,8 +67472,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyphenation";
-       version = "0.4.1";
-       sha256 = "1hcpjjyid7a2kg42xgf6pskfvhz3gfj4iikwzngpmg1xib2ggv6v";
+       version = "0.4.2";
+       sha256 = "05nhspfsf6nzkv9jivzrf39l24mmm7sb3p8k3sabgb058k3a4h28";
        buildDepends = [ base containers unordered-containers ];
        testDepends = [
          base containers directory doctest filepath unordered-containers
@@ -69098,8 +69136,8 @@ self: {
      }:
      mkDerivation {
        pname = "intervals";
-       version = "0.7.0.1";
-       sha256 = "02qb44ga2yfsymkfixy3fdp943r2flwrsaqhb0pjddr3ixzm4ap9";
+       version = "0.7.1";
+       sha256 = "03ra3jkch26x4crsq6nh2wnj51jrx7zmwafmq22xqrpsg7hpav92";
        buildDepends = [ array base distributive ghc-prim ];
        testDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/intervals";
@@ -70816,8 +70854,8 @@ self: {
      }:
      mkDerivation {
        pname = "jose-jwt";
-       version = "0.3";
-       sha256 = "15harxg4zdvm0ffwls74grjlf9942sy5hl37plamc7iriln4w1ic";
+       version = "0.3.1";
+       sha256 = "0s57xks5fp0hvi52kyfcb06pyf31424pa63y2n73qprf0gbm6chb";
        buildDepends = [
          aeson base base64-bytestring byteable bytestring cereal cipher-aes
          containers crypto-cipher-types crypto-numbers crypto-pubkey
@@ -72677,8 +72715,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacms-core";
-       version = "0.0.7.3";
-       sha256 = "1a5i0jvqsvi0jvz1v3mvj6ip1fxi6000fzw4jl7qb87b0y3cggxm";
+       version = "0.0.8.0";
+       sha256 = "1aayf3gfv0lpyx5di3m9n0py25ldv6c666z8bkd4kcb8k0ay5bs7";
        buildDepends = [
          base blaze-html bytestring containers data-default esqueleto
          file-embed friendly-time gravatar lists mime-mail old-locale
@@ -75854,8 +75892,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-t";
-       version = "0.4.2";
-       sha256 = "0n6zc7n5znjas9mgh3a9bn44xv55910i6c3b2l83n4pl9fnad03v";
+       version = "0.4.3";
+       sha256 = "0di3w397cib37snazjvqgfsaapcwa136xcn032p5f5s5njkn3sid";
        buildDepends = [
          base-prelude mmorph monad-control transformers transformers-base
        ];
@@ -81900,6 +81938,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mtl-compat" = callPackage
+    ({ mkDerivation, base, mtl, transformers-compat }:
+     mkDerivation {
+       pname = "mtl-compat";
+       version = "0.1.1";
+       sha256 = "0yajq85gdziwm8fcwh78w1br793yk8rk1pp8kb2yx1ijabmn3xdr";
+       buildDepends = [ base mtl transformers-compat ];
+       homepage = "https://github.com/RyanGlScott/mtl-compat";
+       description = "Orphan mtl instances for ExceptT from transformers-compat";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mtl-evil-instances" = callPackage
     ({ mkDerivation, base, monad-control, mtl, transformers
      , transformers-base
@@ -81916,25 +81966,25 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "mtl-prelude_1_0_2" = callPackage
-    ({ mkDerivation, mtl, transformers }:
+  "mtl-prelude_1_0_3" = callPackage
+    ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "mtl-prelude";
-       version = "1.0.2";
-       sha256 = "0rw0yr8xlkq3pnn3r1sa5v570qp993j7s62y907i8cylx1a1xpfy";
-       buildDepends = [ mtl transformers ];
+       version = "1.0.3";
+       sha256 = "1qr0bwcg9rlj53gbnji969s86qh8laaiibkfy2msziqnp011108x";
+       buildDepends = [ 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;
      }) {};
 
   "mtl-prelude" = callPackage
-    ({ mkDerivation, mtl, transformers }:
+    ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "mtl-prelude";
-       version = "2.0.1";
-       sha256 = "0z56ycpfgbrxhk8k74rk254yyhqix8ryz6ni8i7aki294wh2cvwn";
-       buildDepends = [ mtl transformers ];
+       version = "2.0.2";
+       sha256 = "1j42pdkiiqjkdmidgmgpfbwh2i8dwsc40labw4pm86qzsi0r8m2v";
+       buildDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
@@ -87981,8 +88031,8 @@ self: {
      }:
      mkDerivation {
        pname = "paypal-adaptive-hoops";
-       version = "0.5.3.0";
-       sha256 = "0bsm5gvjgjgdm3isyhvdzkcgzx3yvnaiz5ll5xq5w7q7vi8nc62v";
+       version = "0.6.0.0";
+       sha256 = "0blkzga2wagsivspji6xa2ciqnrc7wzh3kr1qqsh8rmil687sn6x";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -104914,8 +104964,8 @@ self: {
      }:
      mkDerivation {
        pname = "som";
-       version = "7.5.0";
-       sha256 = "16bfgfd5wz60ji5rj2znx58ha1i73n376x52xdz46s71x67jzv3j";
+       version = "8.0.0";
+       sha256 = "030vb8blgcbky6yrxmlgrjq68mm95x91cg2yqk0vd5c412rrnwwl";
        buildDepends = [ base containers grid MonadRandom ];
        testDepends = [
          base containers grid MonadRandom QuickCheck random test-framework
@@ -110262,15 +110312,14 @@ self: {
      }:
      mkDerivation {
        pname = "tellbot";
-       version = "0.4.0.3";
-       sha256 = "0n0gfszxz92v1vlkdfq32yzj4lcxph2yymzfkbdaz7y4bjjpikkl";
+       version = "0.4.0.4";
+       sha256 = "1d5jdkk82y1xj22rpaz42ph3gp0fclghg5wbd8p7z2d9vas4p36n";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base bifunctors containers errors mtl network split time
          transformers
        ];
-       jailbreak = true;
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -112270,6 +112319,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tidal-midi" = callPackage
+    ({ mkDerivation, alsa-core, alsa-seq, base, containers, hashable
+     , hosc, process, tidal
+     }:
+     mkDerivation {
+       pname = "tidal-midi";
+       version = "0.0.1";
+       sha256 = "0j2smcjbnsa6ksrgfmcjbm6sjq9ps0l8fqzaib60pgi34b6dnzv8";
+       buildDepends = [
+         alsa-core alsa-seq base containers hashable hosc process tidal
+       ];
+       homepage = "http://tidal.lurk.org/";
+       description = "MIDI support for tidal";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "tidal-vis" = callPackage
     ({ mkDerivation, base, cairo, colour, tidal }:
      mkDerivation {
@@ -120287,8 +120352,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets-snap";
-       version = "0.9.0.0";
-       sha256 = "051y62xga7drrfllv10giyr49z1z9ql8681dgwynmdad5x6asf85";
+       version = "0.9.1.0";
+       sha256 = "170bivzyqr46s9l7l6dd1nwx3wai9pv0qpf7bw3rxh2y6lxk2546";
        buildDepends = [
          base bytestring enumerator mtl snap-core snap-server websockets
        ];
@@ -124196,19 +124261,20 @@ self: {
 
   "yesod-purescript" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, directory
-     , filepath, formatting, fsnotify, parsec, purescript, shakespeare
-     , system-fileio, system-filepath, template-haskell, text, time
-     , transformers, utf8-string, yesod-core
+     , filepath, formatting, fsnotify, parsec, purescript, regex-tdfa
+     , regex-tdfa-text, shakespeare, system-fileio, system-filepath
+     , template-haskell, text, time, transformers, utf8-string
+     , yesod-core
      }:
      mkDerivation {
        pname = "yesod-purescript";
-       version = "0.0.4.1";
-       sha256 = "0waz49xxhipycq0i8q8pz8g2d3sk3ch65x3rbvdip53j6jnz5dlv";
+       version = "0.0.4.2";
+       sha256 = "0gs90x2c89rqbp480slkcpr93waym08hy9lnsm0vp93cpf0jk30f";
        buildDepends = [
          aeson base containers data-default directory filepath formatting
-         fsnotify parsec purescript shakespeare system-fileio
-         system-filepath template-haskell text time transformers utf8-string
-         yesod-core
+         fsnotify parsec purescript regex-tdfa regex-tdfa-text shakespeare
+         system-fileio system-filepath template-haskell text time
+         transformers utf8-string yesod-core
        ];
        homepage = "https://github.com/mpietrzak/yesod-purescript";
        description = "PureScript integration for Yesod";