Merge remote-tracking branch 'origin/master' into hkm/wasm

Author: hamishmack

compiler/ghc/default.nix

@@ -329,6 +329,18 @@ let
         subDir = "hadrian";
         includeSiblings = true;
       };
+      # When building the plan we do not need a patched version
+      # of the source and `buildPackages.srcOnly` requires introduces
+      # a dependency on a build machine.
+      evalSrc = haskell-nix.haskellLib.cleanSourceWith {
+        src = {
+          name = "hadrian";
+          outPath = src;
+          filterPath = { path, ... }: path;
+        };
+        subDir = "hadrian";
+        includeSiblings = true;
+      };
     };
 
   hadrian = hadrianProject.hsPkgs.hadrian.components.exes.hadrian;
@@ -718,7 +730,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
     '';
 
   passthru = {
-    inherit bootPkgs targetPrefix libDir llvmPackages enableShared useLLVM hadrian hadrianProject;
+    inherit bootPkgs targetPrefix libDir llvmPackages enableShared enableTerminfo useLLVM hadrian hadrianProject;
 
     # Our Cabal compiler name
     haskellCompilerName = "ghc-${version}";

flake.lock

@@ -1,6 +1,7 @@
 { pkgs, cacert, index-state-hashes, haskellLib }:
 { name          ? src.name or null # optional name for better error messages
 , src
+, evalSrc ? src
 , materialized-dir ? ../materialized
 , compiler-nix-name    # The name of the ghc compiler to use eg. "ghc884"
 , index-state   ? null # Hackage index-state, eg. "2019-10-10T00:00:00Z"
@@ -94,13 +95,13 @@ in let
   ghc = if ghc' ? latestVersion
     then __trace "WARNING: ${ghc'.version} is out of date, consider using upgrading to ${ghc'.latestVersion}." ghc'
     else ghc';
-  subDir' = src.origSubDir or "";
+  subDir' = evalSrc.origSubDir or "";
   subDir = pkgs.lib.strings.removePrefix "/" subDir';
 
   cleanedSource = haskellLib.cleanSourceWith {
     name = if name != null then "${name}-root-cabal-files" else "source-root-cabal-files";
-    src = src.origSrc or src;
-    filter = path: type: (!(src ? filter) || src.filter path type) && (
+    src = evalSrc.origSrc or evalSrc;
+    filter = path: type: (!(evalSrc ? filter) || evalSrc.filter path type) && (
       type == "directory" ||
       pkgs.lib.any (i: (pkgs.lib.hasSuffix i path)) [ ".cabal" "package.yaml" ]); };
 
@@ -544,7 +545,17 @@ let
                 ''}
                 ${pkgs.lib.optionalString (!pkgs.stdenv.targetPlatform.isWindows) ''
                 deps+=" $(jq -r '.components.lib."build-depends"[]|select(._if.not.os == "windows")|._then[]|.package' $json_cabal_file)"
-                ''}
+                ''
+                # Fix problem with `haskeline` using a `terminfo` flag
+                # For haskell-nix ghc we can use ghc.enableTerminfo to get the flag setting
+                + pkgs.lib.optionalString (name == "haskeline" && !pkgs.stdenv.targetPlatform.isWindows && ghc.enableTerminfo or true) ''
+                deps+=" terminfo"
+                ''
+                # Similar issue for Win32:filepath build-depends (hidden behind `if impl(ghc >= 8.0)`)
+                + pkgs.lib.optionalString (name == "Win32" && pkgs.stdenv.targetPlatform.isWindows) ''
+                deps+=" filepath"
+                ''
+                }
                 DEPS_${varname name}="$(tr '\n' ' ' <<< "$deps")"
                 VER_${varname name}="$(jq -r '.version' $json_cabal_file)"
                 PKGS+=" ${name}"