Merge branch 'master' of github.com:input-output-hk/haskell.nix into circuithub

ocharles · ocharles · commit 32e5b80bb397 · 2023-11-13T09:27:23.000Z
diff --git a/flake.lock b/flake.lock
diff --git a/modules/cabal-project.nix b/modules/cabal-project.nix
@@ -25,7 +25,7 @@ in {
           ghc99FullName = pkgs.haskell-nix.resolve-compiler-name "ghc99";
         in
         # cabal-install from hackage (3.10.1.0) does not build with GHC HEAD
-        if fullName == ghc99FullName && config.name == "cabal-install" && config.version == "3.10.1.0"
+        if fullName == ghc99FullName && config.name == "cabal-install" && (builtins.elem config.version ["3.10.1.0" "3.10.2.0" "3.10.2.1"])
           then "ghc963"
           else pkgs.haskell-nix.resolve-compiler-name name;
     };
diff --git a/overlays/armv6l-linux.nix b/overlays/armv6l-linux.nix
@@ -6,7 +6,8 @@ final: prev:
       let
         withTH = import ./linux-cross.nix {
           inherit (pkgs.stdenv) hostPlatform buildPlatform;
-          inherit (pkgs) stdenv lib writeScriptBin;
+          inherit (pkgs) stdenv lib;
+          inherit (pkgs.pkgsBuildBuild) writeShellScriptBin symlinkJoin;
           inherit (pkgs.haskell-nix) haskellLib;
           # qemu for linux
           # Using `buildPackages.buildPackages` here fixes `python3Packages.pygobject3` issue.
diff --git a/overlays/linux-cross.nix b/overlays/linux-cross.nix
@@ -1,34 +1,42 @@
 { stdenv
 , lib
 , haskellLib
-, writeScriptBin
+, writeShellScriptBin
 , qemu
 , qemuSuffix ? (haskellLib.qemuByHostPlatform hostPlatform)
 , iserv-proxy
 , iserv-proxy-interpreter
 , gmp
 , buildPlatform
 , hostPlatform
+, symlinkJoin
 , ...
 }:
 let
 
   # we want this to hold only for arm (32 and 64bit) for now.
   isLinuxCross = haskellLib.isCrossHost && hostPlatform.isLinux && (hostPlatform.isAarch32 || hostPlatform.isAarch64);
-  qemuIservWrapper = writeScriptBin "iserv-wrapper" ''
-    #!${stdenv.shell}
+  qemuIservWrapperScript = enableProfiling:
+    let
+      interpreter =
+        if enableProfiling
+          then iserv-proxy-interpreter.override { inherit enableProfiling; }
+          else iserv-proxy-interpreter;
+    in
+      writeShellScriptBin ("iserv-wrapper" + lib.optionalString enableProfiling "-prof") ''
     set -euo pipefail
     # Unset configure flags as configure should have run already
     unset configureFlags
     PORT=$((5000 + $RANDOM % 5000))
-    (>&2 echo "---> Starting ${iserv-proxy-interpreter.exeName} on port $PORT")
-    ${qemu}/bin/qemu-${qemuSuffix} ${iserv-proxy-interpreter.override (lib.optionalAttrs hostPlatform.isAndroid { setupBuildFlags = ["--ghc-option=-optl-static" ];})}/bin/${iserv-proxy-interpreter.exeName} tmp $PORT &
-    (>&2 echo "---| ${iserv-proxy-interpreter.exeName} should have started on $PORT")
+    (>&2 echo "---> Starting ${interpreter.exeName} on port $PORT")
+    ${qemu}/bin/qemu-${qemuSuffix} ${interpreter.override (lib.optionalAttrs hostPlatform.isAndroid { setupBuildFlags = ["--ghc-option=-optl-static" ];})}/bin/${interpreter.exeName} tmp $PORT &
+    (>&2 echo "---| ${interpreter.exeName} should have started on $PORT")
     RISERV_PID="$!"
     ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT"
-    (>&2 echo "---> killing ${iserv-proxy-interpreter.exeName}...")
+    (>&2 echo "---> killing ${interpreter.exeName}...")
     kill $RISERV_PID
     '';
+  qemuIservWrapper = symlinkJoin { name = "iserv-wrapper"; paths = [ (qemuIservWrapperScript false) (qemuIservWrapperScript true) ]; };
   configureFlags = lib.optional hostPlatform.isAarch32 "--disable-split-sections";
   setupBuildFlags = map (opt: "--ghc-option=" + opt) ((lib.optionals isLinuxCross
     [ "-fexternal-interpreter"
@@ -39,8 +47,7 @@ let
     ++ lib.optionals hostPlatform.isAarch32 (map (opt: "--gcc-option=" + opt) [ "-fno-pic" "-fno-plt" ])
        # Also for GHC #15275
     ++ lib.optionals hostPlatform.isAarch64 ["--gcc-option=-fPIC"];
-  qemuTestWrapper = writeScriptBin "test-wrapper" ''
-    #!${stdenv.shell}
+  qemuTestWrapper = writeShellScriptBin "test-wrapper" ''
     set -euo pipefail
     ${qemu}/bin/qemu-${qemuSuffix} $@*
     '';
diff --git a/test/cabal-simple-prof/default.nix b/test/cabal-simple-prof/default.nix
@@ -18,7 +18,10 @@ let
   project = cabalProject' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "cabal-simple-prof";
-    cabalProjectLocal = builtins.readFile ../cabal.project.local;
+    cabalProjectLocal = builtins.readFile ../cabal.project.local
+      + lib.optionalString (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64) ''
+        constraints: text -simdutf, text source
+    '';
     inherit modules;
   };
 
diff --git a/test/cabal-simple/default.nix b/test/cabal-simple/default.nix
@@ -15,7 +15,10 @@ let
   project = project' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "cabal-simple";
-    cabalProjectLocal = builtins.readFile ../cabal.project.local;
+    cabalProjectLocal = builtins.readFile ../cabal.project.local
+      + lib.optionalString (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64) ''
+        constraints: text -simdutf, text source
+    '';
     inherit modules;
   };
 
diff --git a/test/cabal-source-repo-comments/default.nix b/test/cabal-source-repo-comments/default.nix
@@ -6,7 +6,10 @@ let
   project = cabalProject' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "cabal-source-repo-comments";
-    cabalProjectLocal = builtins.readFile ../cabal.project.local;
+    cabalProjectLocal = builtins.readFile ../cabal.project.local
+      + lib.optionalString (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64) ''
+        constraints: text -simdutf, text source
+    '';
   };
   packages = project.hsPkgs;
 in recurseIntoAttrs {
diff --git a/test/cabal-source-repo/default.nix b/test/cabal-source-repo/default.nix
@@ -6,7 +6,10 @@ let
   project = cabalProject' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "cabal-source-repo";
-    cabalProjectLocal = builtins.readFile ../cabal.project.local;
+    cabalProjectLocal = builtins.readFile ../cabal.project.local
+      + lib.optionalString (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64) ''
+        constraints: text -simdutf, text source
+    '';
   };
   packages = project.hsPkgs;
 in recurseIntoAttrs {
diff --git a/test/cabal-sublib/default.nix b/test/cabal-sublib/default.nix
@@ -16,7 +16,10 @@ let
   project = cabalProject' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "cabal-sublib";
-    cabalProjectLocal = builtins.readFile ../cabal.project.local;
+    cabalProjectLocal = builtins.readFile ../cabal.project.local
+      + lib.optionalString (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64) ''
+        constraints: text -simdutf, text source
+    '';
     inherit modules;
   };
 
diff --git a/test/call-cabal-project-to-nix/default.nix b/test/call-cabal-project-to-nix/default.nix
@@ -9,7 +9,10 @@ let
     inherit compiler-nix-name evalPackages;
     # reuse the cabal-simple test project
     src = testSrc "cabal-simple";
-    cabalProjectLocal = builtins.readFile ../cabal.project.local;
+    cabalProjectLocal = builtins.readFile ../cabal.project.local
+      + lib.optionalString (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64) ''
+        constraints: text -simdutf, text source
+    '';
   };
   pkgSet = mkCabalProjectPkgSet {
     plan-pkgs = importAndFilterProject {
diff --git a/test/exe-only/default.nix b/test/exe-only/default.nix
@@ -7,7 +7,10 @@ let
   project = haskell-nix.cabalProject' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "exe-only";
-    cabalProjectLocal = builtins.readFile ../cabal.project.local;
+    cabalProjectLocal = builtins.readFile ../cabal.project.local
+      + lib.optionalString (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64) ''
+        constraints: text -simdutf, text source
+    '';
   };
 
   packages = project.hsPkgs;
diff --git a/test/ghcjs-overlay/default.nix b/test/ghcjs-overlay/default.nix
@@ -41,6 +41,7 @@ in recurseIntoAttrs {
       touch $out
     '';
     meta.platforms = platforms.all;
+    meta.disabled = haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64;
     passthru = {
       inherit project;
     };
diff --git a/test/shell-for/default.nix b/test/shell-for/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, cabal-install, mkCabalProjectPkgSet, recurseIntoAttrs, runCommand, testSrc, compiler-nix-name, evalPackages }:
+{ stdenv, lib, haskellLib, cabal-install, mkCabalProjectPkgSet, recurseIntoAttrs, runCommand, testSrc, compiler-nix-name, evalPackages }:
 
 with lib;
 
@@ -54,7 +54,7 @@ let
 in recurseIntoAttrs {
   # Does not work on ghcjs because it needs zlib.
   # Does not work on windows because it needs mintty.
-  meta.disabled = stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWindows
+  meta.disabled = stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWindows || (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)
     || compiler-nix-name != ((import ./pkgs.nix).pkgs null).compiler.nix-name;
   inherit env envPkga envDefault;
   run = stdenv.mkDerivation {
diff --git a/test/th-dlls/default.nix b/test/th-dlls/default.nix
@@ -23,6 +23,8 @@ in recurseIntoAttrs {
   meta.disabled = stdenv.hostPlatform.isGhcjs
     # On aarch64 this test also breaks form musl builds (including cross compiles on x86_64-linux)
     || (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl)
+    # Failed to lookup symbol: __aarch64_swp8_acq_rel
+    || (compiler-nix-name == "ghc947" && haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)
     ;
 
   ifdInputs = {
diff --git a/test/with-packages/default.nix b/test/with-packages/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, util, cabalProject', recurseIntoAttrs, testSrc, compiler-nix-name, evalPackages, buildPackages }:
+{ stdenv, lib, haskellLib, util, cabalProject', recurseIntoAttrs, testSrc, compiler-nix-name, evalPackages, buildPackages }:
 
 with lib;
 with util;
@@ -76,7 +76,7 @@ in recurseIntoAttrs {
 
       printf "checking that the 'library' with doExactConfig works... " >& 2
       echo ${decLibrary} >& 2
-    '' + (if stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isGhcjs
+    '' + (if haskellLib.isCrossHost
       then ''
         printf "runghc tests are not working yet for windows or ghcjs. skipping. " >& 2
       ''
