diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:45:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 18:34:53 +0100 |
| commit | 9443129b08b37a6f4267d257cd8d42dd92a2539c (patch) | |
| tree | aec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/development/libraries/haskell/monad-logger/default.nix | |
| parent | f78534ca0f8ec63d79370eb2367605579efba088 (diff) | |
| parent | f6d51f7717cffd8b220ce02498db8b8359b5964c (diff) | |
| download | nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2 nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip | |
Merge master into stdenv-updates
Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/development/libraries/haskell/monad-logger/default.nix')
| -rw-r--r-- | pkgs/development/libraries/haskell/monad-logger/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index afd968227103..a66ad0faf01f 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -1,15 +1,15 @@ -{ cabal, conduit, fastLogger, liftedBase, monadControl, monadLoops -, mtl, resourcet, stm, stmChans, text, transformers -, transformersBase +{ cabal, blazeBuilder, conduit, fastLogger, liftedBase +, monadControl, monadLoops, mtl, resourcet, stm, stmChans, text +, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.3.2"; - sha256 = "0s75q974q6jwp89xj5kkqziy4crm9484dqvrpgd8ms7rw613jjz6"; + version = "0.3.4.0"; + sha256 = "16nrzms87klbs26rbaw4j8xal5k7glpbhg7r2x1m3gxbdhsp696n"; buildDepends = [ - conduit fastLogger liftedBase monadControl monadLoops mtl resourcet - stm stmChans text transformers transformersBase + blazeBuilder conduit fastLogger liftedBase monadControl monadLoops + mtl resourcet stm stmChans text transformers transformersBase ]; meta = { homepage = "https://github.com/kazu-yamamoto/logger"; |