Author: simons
Date: Mon May 28 10:53:46 2012
New Revision: 34256
URL: https://nixos.org/websvn/nix/?rev=34256&sc=1
Log:
haskell-defaults.nix: switch ghc 7.4.1 to latest versions of 'mtl' and
'transformers'
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/ltk/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-defaults.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/ltk/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/ltk/default.nix Mon May
28 10:23:20 2012 (r34255)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/ltk/default.nix Mon May
28 10:53:46 2012 (r34256)
@@ -5,6 +5,9 @@
version = "0.12.0.0";
sha256 = "1hlsfi77yypfnvh1alr3rflbffby9pbmc71m507davr6b09v9w9f";
buildDepends = [ Cabal filepath glib gtk mtl parsec transformers ];
+ patchPhase = ''
+ sed -i -e 's|mtl >=1.1.0.2 && <2.1|mtl|' -e 's|transformers >=0.2.2.0 &&
<0.3|transformers|' ltk.cabal
+ '';
meta = {
homepage = "http://www.leksah.org";;
description = "Leksah tool kit";
Modified: nixpkgs/trunk/pkgs/top-level/haskell-defaults.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-defaults.nix Mon May 28 10:23:20
2012 (r34255)
+++ nixpkgs/trunk/pkgs/top-level/haskell-defaults.nix Mon May 28 10:53:46
2012 (r34256)
@@ -26,9 +26,6 @@
ghc741Prefs =
self : ghc741Prefs_pedantic self // {
- # These are necessary at the moment to prevent many packages from
breaking.
- mtl = self.mtl_2_0_1_0;
- transformers = self.transformers_0_2_2_0;
};
ghc722Prefs = ghc741Prefs;
@@ -266,5 +263,5 @@
ghc704Binary;
prefFun = ghcHEADPrefs;
};
-
+
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
