Merge remote-tracking branch 'origin/master' into static-nix-tools

Author: hamishmack

flake.lock

@@ -53,10 +53,10 @@ let
         # Not sure why this `unset` helps.  It might avoids some kind of overflow issue.  We see `wine` fail to start when building `cardano-wallet-cli` test `unit`.
         unset pkgsHostTargetAsString
         unset LINK_DLL_FOLDERS
-        WINEDLLOVERRIDES="winemac.drv=d" WINEDEBUG=warn-all,fixme-all,-menubuilder,-mscoree,-ole,-secur32,-winediag WINEPREFIX=$TMP ${wine}/bin/wine64 $REMOTE_ISERV/${interpreter.exeName} tmp $PORT $ISERV_ARGS &
+        WINEDLLOVERRIDES="winemac.drv=d" WINEDEBUG=warn-all,fixme-all,-menubuilder,-mscoree,-ole,-secur32,-winediag WINEPREFIX=$TMP ${wine}/bin/wine64 $REMOTE_ISERV/${interpreter.exeName} tmp $PORT --no-load-call $ISERV_ARGS &
         (>&2 echo "---| ${interpreter.exeName} should have started on $PORT")
         RISERV_PID="$!"
-        ISERV_TARGET=WINE ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT" $PROXY_ARGS
+        ISERV_TARGET=WINE ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT" --no-load-call $PROXY_ARGS
         (>&2 echo "---> killing ${interpreter.exeName}...")
         kill $RISERV_PID
       '';

overlays/mingw_w64.nix

@@ -211,6 +211,7 @@ let
     githash = haskell-nix.callPackage ./githash { inherit compiler-nix-name evalPackages; testSrc = testSrcWithGitDir; };
     c-ffi = callTest ./c-ffi { inherit util; };
     th-dlls = callTest ./th-dlls { inherit util; };
+    th-dlls-minimal = callTest ./th-dlls-minimal { inherit util; };
     external-static-plugin = callTest ./external-static-plugin {};
     exe-dlls = callTest ./exe-dlls { inherit util; };
     exe-lib-dlls = callTest ./exe-lib-dlls { inherit util; };

test/default.nix

@@ -0,0 +1,9 @@
+{-# LANGUAGE TemplateHaskell #-}
+module Main where
+
+import Language.Haskell.TH
+
+main :: IO ()
+main = putStrLn "Hello, Haskell!"
+
+[d|y = 0|]

test/th-dlls-minimal/apps/Main.hs

@@ -0,0 +1,3 @@
+packages:
+ ./.
+ ./test-lib

test/th-dlls-minimal/cabal.project

@@ -0,0 +1,43 @@
+# Test building TH code that needs DLLs when cross compiling for windows
+{ stdenv, lib, util, project', haskellLib, recurseIntoAttrs, testSrc, compiler-nix-name, evalPackages, buildPackages }:
+
+with lib;
+
+let
+  project = externalInterpreter: project' {
+    inherit compiler-nix-name evalPackages;
+    src = testSrc "th-dlls-minimal";
+    cabalProjectLocal = builtins.readFile ../cabal.project.local;
+    modules = [
+     ({pkgs, ...}: {
+      packages.test-lib.components.library.libs = mkForce [
+        (pkgs.stdenv.mkDerivation {
+          name = "test-clib";
+          version = "1.0";
+          src = testSrc "th-dlls-minimal/test-clib";
+        })
+      ];
+     })
+     ({pkgs, ...}: lib.optionalAttrs externalInterpreter {
+      packages.th-dlls-minimal.components.library.ghcOptions = [ "-fexternal-interpreter" ];
+    })];
+  };
+
+  packages = (project false).hsPkgs;
+  packages-ei = (project true).hsPkgs;
+
+in recurseIntoAttrs {
+  # This test is just for windows currently (the full th-dlls test runs on other platforms)
+  meta.disabled = !stdenv.hostPlatform.isWindows;
+
+  ifdInputs = {
+    inherit (project true) plan-nix;
+  };
+
+  build = packages.th-dlls-minimal.components.library;
+  build-profiled = packages.th-dlls-minimal.components.library.profiled;
+  just-template-haskell = packages.th-dlls-minimal.components.exes.just-template-haskell;
+  build-ei = packages-ei.th-dlls-minimal.components.library;
+  build-profiled-ei = packages-ei.th-dlls-minimal.components.library.profiled;
+  just-template-haskell-ei = packages-ei.th-dlls-minimal.components.exes.just-template-haskell;
+}

test/th-dlls-minimal/default.nix

@@ -0,0 +1,8 @@
+{-# LANGUAGE TemplateHaskell #-}
+module Lib where
+
+import Control.Monad.IO.Class (liftIO)
+import Language.Haskell.TH.Syntax (Exp(..), Lit(..))
+import MyLib (someFunc)
+
+a = $(liftIO (LitE . IntegerL . fromIntegral <$> someFunc))

test/th-dlls-minimal/src/Lib.hs

@@ -0,0 +1,16 @@
+test.o: test.c
+	$(CC) -o test.o -c test.c
+
+test.a: test.o
+	$(AR) -rs test-clib.a test.o
+
+test.dll: test.o
+	$(CC) -o test-clib.dll -shared test.o
+
+.PHONY: install
+install: test.a test.dll
+	mkdir $(out)/bin
+	mkdir $(out)/lib
+	mv test-clib.dll $(out)/bin
+	mv test-clib.a $(out)/lib
+

test/th-dlls-minimal/test-clib/Makefile

@@ -0,0 +1,5 @@
+int f()
+{
+	return 42;
+}
+

test/th-dlls-minimal/test-clib/test.c

@@ -0,0 +1,11 @@
+{-# LANGUAGE ForeignFunctionInterface #-}
+module MyLib (someFunc) where
+
+import Foreign.C.Types (CInt(..))
+
+foreign import ccall "f" c_f :: IO CInt
+
+someFunc :: IO CInt
+someFunc = do
+  putStrLn "someFunc called"
+  c_f

test/th-dlls-minimal/test-lib/src/MyLib.hs

@@ -0,0 +1,15 @@
+cabal-version:       >=1.10
+name:                test-lib
+version:             0.1.0.0
+license:             PublicDomain
+author:              Hamish Mackenzie
+maintainer:          [email protected]
+build-type:          Simple
+
+library
+  build-depends:       base
+  exposed-modules:     MyLib
+  hs-source-dirs:      src
+  extra-libraries:     test-clib
+  default-language:    Haskell2010
+

test/th-dlls-minimal/test-lib/test-lib.cabal

@@ -0,0 +1,21 @@
+cabal-version:       >=1.10
+name:                th-dlls-minimal
+version:             0.1.0.0
+license:             PublicDomain
+author:              Hamish Mackenzie
+maintainer:          [email protected]
+build-type:          Simple
+
+library
+  build-depends:       base
+                     , template-haskell
+                     , test-lib
+  exposed-modules:     Lib
+  hs-source-dirs:      src
+  default-language:    Haskell2010
+
+executable just-template-haskell
+  build-depends:       base, template-haskell
+  hs-source-dirs:      apps
+  default-language:    Haskell2010
+  main-is:             Main.hs