diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
commit | 5b132f6e96a9794018ae1c085da482b381d1e039 (patch) | |
tree | ff54ae514799540c093adcfeca0d501b75cde506 /pkgs/development/libraries/haskell/pretty-show | |
parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/development/libraries/haskell/pretty-show')
-rw-r--r-- | pkgs/development/libraries/haskell/pretty-show/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix index deb9e731ebda7..19398be7ac7d1 100644 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pretty-show"; - version = "1.1.1"; - sha256 = "0w6r68l1452vh9aqnlh4066y62h8ylh45gbsl5l558wjgchlna5k"; + version = "1.2"; + sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; isLibrary = true; isExecutable = true; buildDepends = [ haskellLexer ]; |