Author: andres
Date: Mon Aug 8 18:29:11 2011
New Revision: 28397
URL: https://svn.nixos.org/websvn/nix/?rev=28397&sc=1
Log:
Handle extensible-exceptions correctly.
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 8 17:16:49
2011 (r28396)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 8 18:29:11
2011 (r28397)
@@ -306,6 +306,7 @@
haskellPlatformDefaults_2010_1_0_0 =
self : self.haskellPlatformArgs_2010_1_0_0 self // {
haskellPlatform = self.haskellPlatform_2010_1_0_0;
+ extensibleExceptions = self.extensibleExceptions_0_1_1_0;
};
haskellPlatform_2010_1_0_0 =
@@ -342,6 +343,7 @@
haskellPlatformDefaults_2009_2_0_2 =
self : self.haskellPlatformArgs_2009_2_0_2 self // {
haskellPlatform = self.haskellPlatform_2009_2_0_2;
+ extensibleExceptions = self.extensibleExceptions_0_1_1_0;
};
haskellPlatform_2009_2_0_2 =
@@ -543,7 +545,8 @@
emgm = callPackage ../development/libraries/haskell/emgm {};
- extensibleExceptions = callPackage
../development/libraries/haskell/extensible-exceptions {};
+ extensibleExceptions_0_1_1_0 = callPackage
../development/libraries/haskell/extensible-exceptions {};
+ extensibleExceptions = null; # a core package in recent GHCs
failure = callPackage ../development/libraries/haskell/failure {};
@@ -1117,7 +1120,6 @@
Tensor = callPackage ../development/libraries/haskell/Tensor {};
terminfo = callPackage ../development/libraries/haskell/terminfo {
- inherit (self) extensibleExceptions /* only required for <= ghc6102 ?*/;
inherit (pkgs) ncurses;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
