summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell/mtl/default.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-04-22 21:44:33 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-04-22 21:44:33 +0000
commit6f2fac6466cbc684f01093364e60bb96b79c120f (patch)
tree2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/development/libraries/haskell/mtl/default.nix
parent6d62947d71342aa29441a720d4eeb2f003126c76 (diff)
parent93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff)
downloadnixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.zip
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/development/libraries/haskell/mtl/default.nix')
-rw-r--r--pkgs/development/libraries/haskell/mtl/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/haskell/mtl/default.nix b/pkgs/development/libraries/haskell/mtl/default.nix
index 5881a2cd3df..6c8b1cf960d 100644
--- a/pkgs/development/libraries/haskell/mtl/default.nix
+++ b/pkgs/development/libraries/haskell/mtl/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "mtl";
-  version = "1.1.0.2"; # Haskell Platform 2009.0.0
+  version = "1.1.0.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0
   sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36";
   meta = {
     description = "Monad transformer library";