Fix tests

input-output-hk · May 17, 2022 · 656818e · 656818e
1 parent bb75d5a
commit 656818e
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 5 deletions.
diff --git a/lib/system-nixpkgs-map.nix b/lib/system-nixpkgs-map.nix
@@ -7,8 +7,10 @@ pkgs:
 with pkgs;
 
 let
-  stdcplusplus = if pkgs.stdenv.hostPlatform.isWindows then [
+  # On windows systems we need these to be propagatedBuildInputs so that the DLLs will be found.
+  gcclibs = if pkgs.stdenv.hostPlatform.isWindows then [
     pkgs.windows.mcfgthreads
+    # If we just use `pkgs.buildPackages.gcc.cc` here it breaks the `th-dlls` test. TODO figure out why exactly.
     (pkgs.evalPackages.runCommand "gcc-only" { nativeBuildInputs = [ pkgs.evalPackages.xorg.lndir ]; } ''
       mkdir $out
       lndir ${pkgs.buildPackages.gcc.cc} $out
@@ -18,8 +20,11 @@ in
 # -- linux
 { crypto = [ openssl ];
   "c++" = []; # no libc++
-  "stdc++" = stdcplusplus;
-  "stdc++-6" = stdcplusplus;
+  "stdc++" = gcclibs;
+  "stdc++-6" = gcclibs;
+  gcc_s_seh-1 = gcclibs;
+  gcc_s = gcclibs;
+  gcc = gcclibs;
   ssl = [ openssl ];
   z = [ zlib ];
   pcap = [ libpcap ];
@@ -106,8 +111,6 @@ in
      # this should be bundled with gcc.
      # if it's not we have more severe
      # issues anyway.
-     gcc_s_seh-1 = null;
-     gcc_s = null;
      ssl32 = null; eay32 = [ openssl ];
      iphlpapi = null; # IP Help API
      msvcrt = null; # this is the libc

diff --git a/overlays/windows.nix b/overlays/windows.nix
@@ -108,6 +108,9 @@ final: prev:
           network.setupBuildFlags = [];
           unix.setupBuildFlags = [];
 
+          # Newer Win32 includes hsc2hs, but we can get that that from the ghc derivation and
+          # if the cabal plan included hsc2hs it winds up trying to build a windows version.
+          Win32.components.library.build-tools = pkgs.lib.mkForce [];
         }
         # Fix dependencies and case-sensitive filesystem builds for unix-time.
         // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isWindows {

diff --git a/test/cabal-simple-prof/default.nix b/test/cabal-simple-prof/default.nix
@@ -6,6 +6,7 @@ with lib;
 let
   modules = [
     {
+      reinstallableLibGhc = true;
       # Package has no exposed modules which causes
       #   haddock: No input file(s)
       packages.cabal-simple.doHaddock = false;

diff --git a/test/cabal-simple/default.nix b/test/cabal-simple/default.nix
@@ -6,6 +6,7 @@ with lib;
 let
   modules = [
      {
+       reinstallableLibGhc = true;
        # Package has no exposed modules which causes
        #   haddock: No input file(s)
        packages.cabal-simple.doHaddock = false;

diff --git a/test/cabal-source-repo-comments/default.nix b/test/cabal-source-repo-comments/default.nix
@@ -6,6 +6,7 @@ let
   project = cabalProject' {
     inherit compiler-nix-name;
     src = testSrc "cabal-source-repo-comments";
+    modules = [{ reinstallableLibGhc = true; }];
   };
   packages = project.hsPkgs;
 in recurseIntoAttrs {

diff --git a/test/cabal-source-repo/default.nix b/test/cabal-source-repo/default.nix
@@ -6,6 +6,7 @@ let
   project = cabalProject' {
     inherit compiler-nix-name;
     src = testSrc "cabal-source-repo";
+    modules = [{ reinstallableLibGhc = true; }];
   };
   packages = project.hsPkgs;
 in recurseIntoAttrs {

diff --git a/test/cabal-sublib/default.nix b/test/cabal-sublib/default.nix
@@ -6,6 +6,7 @@ with lib;
 let
   modules = [
     {
+      reinstallableLibGhc = true;
       # Package has no exposed modules which causes
       #   haddock: No input file(s)
       packages.cabal-sublib.doHaddock = false;

diff --git a/test/call-cabal-project-to-nix/default.nix b/test/call-cabal-project-to-nix/default.nix
@@ -18,6 +18,7 @@ let
     plan-pkgs = importAndFilterProject {
       inherit (callProjectResults) projectNix sourceRepos src;
     };
+    modules = [{ reinstallableLibGhc = true; }];
   };
   packages = pkgSet.config.hsPkgs;
 

diff --git a/test/th-dlls/default.nix b/test/th-dlls/default.nix
@@ -7,6 +7,7 @@ let
   project = project' {
     inherit compiler-nix-name;
     src = testSrc "th-dlls";
+    modules = [{ reinstallableLibGhc = true; }];
   };
 
   packages = project.hsPkgs;