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

Author: ocharles

README.md

@@ -29,3 +29,5 @@ Haskell packages in Nix. It depends on other repos, which are:
 
 - [`stackage.nix`](https://github.com/input-output-hk/stackage.nix) — all of the [Stackage](https://www.stackage.org/) snapshots, converted to Nix expressions.
 
+> [!NOTE]
+> For commercial support, please don't hesitate to reach out at [email protected]

build.nix

@@ -42,6 +42,7 @@ in rec {
             "ghc8105" = "3.4.1";
             "ghc8106" = "3.4.1";
             "ghc8107" = "3.4.1";
+            "ghc928" = "3.6.1";
           }.${compiler-nix-name} or "latest";
       };
     } // pkgs.lib.optionalAttrs (ghcFromTo "9.2" "9.6") {

compiler/ghc/default.nix

@@ -311,8 +311,10 @@ let
       # For cross compilers only the RTS should be built with -mno-outline-atomics
       + lib.optionalString (!hostPlatform.isAarch64 && targetPlatform.isLinux && targetPlatform.isAarch64)
         " '*.rts.ghc.c.opts += -optc-mno-outline-atomics'"
-      + lib.optionalString enableRelocatedStaticLibs
+      # PIC breaks GHC annotations on windows (see test/annotations for a test case)
+      + lib.optionalString (enableRelocatedStaticLibs && !targetPlatform.isWindows)
         " '*.*.ghc.*.opts += -fPIC' '*.*.cc.*.opts += -fPIC'"
+      # `-fexternal-dynamic-refs` causes `undefined reference` errors when building GHC cross compiler for windows
       + lib.optionalString (enableRelocatedStaticLibs && targetPlatform.isx86_64 && !targetPlatform.isWindows)
         " '*.*.ghc.*.opts += -fexternal-dynamic-refs'"
       # The following is required if we build on aarch64-darwin for aarch64-iOS. Otherwise older
@@ -791,6 +793,19 @@ stdenv.mkDerivation (rec {
       then ''
         mkdir $out
         cp -r _build/stage1/bin $out
+        ${
+          # These are needed when building the reinstallable lib ghc
+          if targetPlatform.isMusl
+            then ''
+              cp _build/stageBoot/bin/genprimopcode $out/bin
+              cp _build/stageBoot/bin/deriveConstants $out/bin
+            '' else ''
+              cp _build/stageBoot/bin/${targetPrefix}genprimopcode $out/bin
+              ln -s $out/bin/${targetPrefix}genprimopcode $out/bin/genprimopcode
+              cp _build/stageBoot/bin/${targetPrefix}deriveConstants $out/bin
+              ln -s $out/bin/${targetPrefix}deriveConstants $out/bin/deriveConstants
+            ''
+        }
         cp -r _build/stage1/lib $out
         mkdir $doc
         cp -r _build/stage1/share $doc

flake.lock

@@ -39,6 +39,10 @@
       url = "github:input-output-hk/stackage.nix";
       flake = false;
     };
+    nix-tools-static = {
+      url = "github:input-output-hk/haskell-nix-example/nix";
+      flake = false;
+    };
     cabal-32 = {
       url = "github:haskell/cabal/3.2";
       flake = false;

flake.nix

@@ -401,7 +401,7 @@ let
         exit 1
       ''}
     else
-      cp -r ${cleanedSource}/* .
+      rsync -a ${cleanedSource}/ ./
     fi
     chmod +w -R .
     # Decide what to do for each `package.yaml` file.