Nix: apply patch for terminfo issue

IntersectMBO · Oct 19, 2020 · 391d63b · 391d63b
1 parent 4c9da92
commit 391d63b
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/nix/haskell.nix b/nix/haskell.nix
@@ -38,10 +38,13 @@ let
   } // {
     inherit src;
     compiler-nix-name = compiler;
+    cabalProjectLocal = ''
+      allow-newer: terminfo:base
+    '';
     modules = [
-      { compiler.nix-name = compiler; }
       # Allow reinstallation of Win32
-      { nonReinstallablePkgs =
+      ({ pkgs, ... }: lib.mkIf pkgs.stdenv.hostPlatform.isWindows {
+       nonReinstallablePkgs =
         [ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"
           "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"
           # ghcjs custom packages
@@ -55,7 +58,8 @@ let
           "xhtml"
           # "stm" "terminfo"
         ];
-
+      })
+      {
 
         # Tell hydra to skip this test on windows (it does not build)
         packages.cardano-cli.components.tests.cardano-cli-test.platforms =
@@ -137,22 +141,14 @@ let
         }
       ))
 
-      (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
+      ({ pkgs, ... }: lib.mkIf (pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) {
         # Make sure we use a buildPackages version of happy
         packages.pretty-show.components.library.build-tools = [ buildPackages.haskell-nix.haskellPackages.happy ];
 
         # Remove hsc2hs build-tool dependencies (suitable version will be available as part of the ghc derivation)
         packages.Win32.components.library.build-tools = lib.mkForce [];
         packages.terminal-size.components.library.build-tools = lib.mkForce [];
         packages.network.components.library.build-tools = lib.mkForce [];
-
-        # Disable cabal-doctest tests by turning off custom setups
-        packages.comonad.package.buildType = lib.mkForce "Simple";
-        packages.distributive.package.buildType = lib.mkForce "Simple";
-        packages.generic-data.package.buildType = lib.mkForce "Simple";
-        packages.nonempty-vector.package.buildType = lib.mkForce "Simple";
-        packages.semigroupoids.package.buildType = lib.mkForce "Simple";
-        packages.system-filepath.package.buildType = lib.mkForce "Simple";
       })
     ];
     # TODO add flags to packages (like cs-ledger) so we can turn off tests that will