Merge pull request #839 from IntersectMBO/smelc/fix-static-binaries-r…

…eleasing Fix production of Linux static binaries in release workflow
IntersectMBO · Jul 16, 2024 · d4c08cf · d4c08cf
2 parents e5bb0ad + de24c5b
commit d4c08cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml
@@ -159,10 +159,10 @@ jobs:
               derivation+="${{ matrix.arch }}"
               ;;
             "x86_64-linux")
-              derivation+="x86_64-linux.x86_64-unknown-linux-musl"
+              derivation+="x86_64-linux.ghc965-x86_64-unknown-linux-musl"
               ;;
             "aarch64-linux")
-              derivation+="x86_64-linux.aarch64-unknown-linux-musl"
+              derivation+="x86_64-linux.ghc965-aarch64-unknown-linux-musl"
               ;;
             *)
               echo "Unexpected matrix.arch value: ${{ matrix.arch }}"

diff --git a/flake.nix b/flake.nix
@@ -23,7 +23,7 @@
     # see flake `variants` below for alternative compilers
     defaultCompiler = "ghc982";
     haddockShellCompiler = defaultCompiler;
-    mingwVersion = "ghc965";
+    mingwVersion = "ghc965"; # Used for cross compilation, and so referenced in .github/workflows/release-upload.yml. Adapt the latter if you change this value.
     cabalHeadOverlay = final: prev: {
       cabal-head =
         (final.haskell-nix.cabalProject {