summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-05-23 19:57:35 +0200
committerPeter Simons <simons@cryp.to>2014-05-23 21:54:27 +0200
commit6962c86135db83d3f78c2b20e5161d99f7ba25a8 (patch)
tree6a8f09faae86049a240984540f74364c0b5507a6
parentda38198b4ff662d41d573c0e71adad690332b676 (diff)
downloadnixlib-6962c86135db83d3f78c2b20e5161d99f7ba25a8.tar
nixlib-6962c86135db83d3f78c2b20e5161d99f7ba25a8.tar.gz
nixlib-6962c86135db83d3f78c2b20e5161d99f7ba25a8.tar.bz2
nixlib-6962c86135db83d3f78c2b20e5161d99f7ba25a8.tar.lz
nixlib-6962c86135db83d3f78c2b20e5161d99f7ba25a8.tar.xz
nixlib-6962c86135db83d3f78c2b20e5161d99f7ba25a8.tar.zst
nixlib-6962c86135db83d3f78c2b20e5161d99f7ba25a8.zip
haskell-defaults.nix: improve configuration for GHC 6.x
-rw-r--r--pkgs/top-level/haskell-defaults.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index a30b91be52e6..296c85b4d074 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -74,18 +74,28 @@
     cabalInstall = self.cabalInstall_1_16_0_2;
     cgi = self.cgi_3001_1_7_5;
     deepseq = self.deepseq_1_2_0_1;
+    dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    exceptions = null;                  # none of our versions compile
     haddock = self.haddock_2_7_2;
+    logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    monadPar = self.monadPar_0_1_0_3;
+    nats = null;                        # none of our versions compile
     parallel = self.parallel_3_2_0_3;
     primitive = self.primitive_0_5_0_1;
+    reflection = super.reflection.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     scientific = null;                  # none of our versions compile
     split = self.split_0_1_4_3;
     stm = self.stm_2_4_2;
     syb = null;                         # core package in ghc < 7
+    tagged = super.tagged.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    temporary = null;                   # none of our versions compile
+    vectorAlgorithms = super.vectorAlgorithms.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
   };
 
   ghc6104Prefs = self : super : ghc6123Prefs self super // {
     alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     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; }; };
     GLUT = self.GLUT_2_2_2_1;
     haddock = self.haddock_2_4_2;