diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:49 +0200 |
| commit | f64d84698eb3f4d833e846336ff99a73331c31f7 (patch) | |
| tree | 1120886b680851bc8b8f8d337af3503ecd4a3d71 /pkgs/development/libraries/haskell/MFlow/default.nix | |
| parent | 3e4a382d6753a057256c7ef1e9f52ae9e07bd677 (diff) | |
| parent | 30431e71608576baf880567b2894ad2a542f8d5e (diff) | |
| download | nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.gz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.bz2 nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.lz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.xz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.zst nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/MFlow/default.nix')
| -rw-r--r-- | pkgs/development/libraries/haskell/MFlow/default.nix | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index 4a8f7a91bbab..8e5969bbf271 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -1,21 +1,29 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession -, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes -, monadloc, mtl, parsec, random, RefSerialize, stm, TCache, text -, time, transformers, utf8String, vector, wai, warp, warpTls +{ cabal, acidState, aws, blazeHtml, blazeMarkup, caseInsensitive +, clientsession, conduit, conduitExtra, cpphs, extensibleExceptions +, hamlet, hscolour, httpConduit, httpTypes, monadloc, monadLogger +, mtl, network, parsec, persistent, persistentSqlite +, persistentTemplate, pwstoreFast, random, RefSerialize, resourcet +, safecopy, shakespeare, stm, TCache, tcacheAWS, text, time +, transformers, utf8String, vector, wai, waiExtra, warp, warpTls , Workflow }: cabal.mkDerivation (self: { pname = "MFlow"; - version = "0.4.5.4"; - sha256 = "1ih9ni14xmqvcfvayjkggmpmw3s9yzp17gf4xzygldmjcs35j4n3"; + version = "0.4.5.5"; + sha256 = "0ggwzjxhw2xmp2m6a560pn5m0qfn80x5q23vrd2k9aqxh8n2k6i5"; + isLibrary = true; + isExecutable = true; buildDepends = [ - blazeHtml blazeMarkup caseInsensitive clientsession conduit - conduitExtra extensibleExceptions httpTypes monadloc mtl parsec - random RefSerialize stm TCache text time transformers utf8String - vector wai warp warpTls Workflow + acidState aws blazeHtml blazeMarkup caseInsensitive clientsession + conduit conduitExtra extensibleExceptions hamlet hscolour + httpConduit httpTypes monadloc monadLogger mtl network parsec + persistent persistentSqlite persistentTemplate pwstoreFast random + RefSerialize resourcet safecopy shakespeare stm TCache tcacheAWS + text time transformers utf8String vector wai waiExtra warp warpTls + Workflow ]; buildTools = [ cpphs ]; meta = { |