From e081cc3b44d071e8c56d8b819c0336788d5fd126 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 20:59:50 +0200 Subject: [PATCH] haskell-defaults.nix: fix hashable and case-insensitive builds with GHC 6.x --- pkgs/top-level/haskell-defaults.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 02357c7eca9..a8f4110fdb3 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -99,10 +99,11 @@ async = null; # none of our versions compile attoparsec = null; # none of our versions compile binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; haddock = self.haddock_2_4_2; happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; - hashable = self.hashable_1_1_2_5; + hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };