Synchronize Haskell infrastructure with master at f93a019.

NixOS · Sep 8, 2017 · 33bdb27 · 33bdb27
1 parent 3a3e0d8
commit 33bdb27
Show file tree

Hide file tree

Showing 9 changed files with 3,062 additions and 626 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -886,4 +886,20 @@ self: super: {
   # missing dependencies: doctest ==0.12.*
   html-entities = doJailbreak super.html-entities;
 
+  # Needs a version that's newer than what we have in lts-9.
+  sbv = super.sbv.override { doctest = self.doctest_0_13_0; };
+
+  # https://github.com/takano-akio/filelock/issues/5
+  filelock = dontCheck super.filelock;
+
+  # https://github.com/alpmestan/taggy/issues/{19,20}
+  taggy = appendPatch super.taggy (pkgs.fetchpatch {
+    name = "blaze-markup.patch";
+    url = "https://github.com/alpmestan/taggy/commit/5456c2fa4d377f7802ec5df3d5f50c4ccab2e8ed.patch";
+    sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7";
+  });
+
+  # happy 1.19.6 and later break some packages.
+  Agda = super.Agda.override { happy = self.happy_1_19_5; };
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -162,4 +162,7 @@ self: super: {
   comonad = dontCheck super.comonad;
   semigroupoids = dontCheck super.semigroupoids;
 
+  # https://github.com/simonmar/happy/issues/103
+  happy = super.happy.override { mtl = self.mtl_2_2_1; };
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -36,6 +36,11 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # Make sure we can still build Cabal 1.x.
+  Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: {
+    prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
+  });
+
   # cabal-install can use the native Cabal library.
   cabal-install = super.cabal-install.override { Cabal = null; };
 
@@ -63,9 +68,26 @@ self: super: {
   protolude = doJailbreak super.protolude;
   quickcheck-instances = doJailbreak super.quickcheck-instances;
 
+  # https://github.com/aristidb/aws/issues/238
+  aws = doJailbreak super.aws;
+
+  # https://github.com/jgm/pandoc/issues/3876
+  pandoc = let fixSetup = pkgs.fetchpatch {
+                            url = "https://github.com/jgm/pandoc/pull/3899.patch";
+                            sha256 = "0lk9vs2l1wc1kr0y8fkdcarfi4sjd3dl81r52n39r25xx9kqawv7";
+                          };
+           in overrideCabal super.pandoc (drv: {
+                editedCabalFile = null;
+                patches = drv.patches or [] ++ [fixSetup];
+                setupHaskellDepends = drv.setupHaskellDepends or [self.Cabal_1_24_2_0];
+                preCompileBuildDriver = "setupCompileFlags+=' -package=Cabal-1.24.2.0'";
+              });
+
   # LTS-9 versions do not compile.
   path = dontCheck super.path;
   path-io = super.path-io_1_3_3;
   trifecta = super.trifecta_1_7_1_1;
+  aeson-compat = dontCheck super.aeson-compat_0_3_7_1;  # test suite needs QuickCheck 2.10.*
+  binary-orphans = dontCheck super.binary-orphans_0_1_7_0; # test suite needs QuickCheck 2.10.*
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -18,6 +18,9 @@ self: super: {
   deepseq = null;
   directory = null;
   filepath = null;
+  ghc-boot = null;
+  ghc-boot-th = null;
+  ghc-compact = null;
   ghc-prim = null;
   ghci = null;
   haskeline = null;
@@ -35,7 +38,7 @@ self: super: {
   xhtml = null;
 
   # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
+  jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;