Merge pull request #69886 from NixOS/haskell-updates

Haskell updates
2019-10-02 15:51:55 +02:00
parent 643b6a8c76 bf22c802e1
commit cb4332e3eb
8 changed files with 2415 additions and 612 deletions
@@ -94,11 +94,9 @@ self: super: builtins.intersectAttrs super {
  # Won't find it's header files without help.
  sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";

-  cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: {
-    postPatch = (drv.postPatch or "") + ''
-      substituteInPlace cachix.cabal --replace "c++14" "c++17"
-    '';
-  });
+  cachix = enableSeparateBinOutput super.cachix;
+
+  niv = enableSeparateBinOutput super.niv;

  ghcid = enableSeparateBinOutput super.ghcid;

@@ -589,7 +587,6 @@ self: super: builtins.intersectAttrs super {
  snap-server = dontCheck super.snap-server;

  # Tests require internet
-  dhall_1_26_0 = dontCheck super.dhall_1_26_0;
  http-download = dontCheck super.http-download;
  pantry = dontCheck super.pantry;