Merge branch 'master' into angerman/fix-aarch64-musl

Author: angerman

.github/workflows/publish.yaml

@@ -0,0 +1,22 @@
+name: "Publish a flake to flakestry"
+on:
+    push:
+        tags:
+        - "v?[0-9]+.[0-9]+.[0-9]+"
+        - "v?[0-9]+.[0-9]+"
+    workflow_dispatch:
+        inputs:
+            tag:
+                description: "The existing tag to publish"
+                type: "string"
+                required: true
+jobs:
+    publish-flake:
+        runs-on: ubuntu-latest
+        permissions:
+            id-token: "write"
+            contents: "read"
+        steps:
+            - uses: flakestry/flakestry-publish@main
+              with:
+                version: "${{ inputs.tag || github.ref_name }}"

README.md

@@ -25,9 +25,9 @@ The troubleshooting documentation also contains some help for other common issue
 The `haskell.nix` repository contains the runtime system for building
 Haskell packages in Nix. It depends on other repos, which are:
 
-- [`nix-tools`](https://github.com/input-output-hk/nix-tools) — provides the programs for generating Nix expressions from  Haskell projects.
-
 - [`hackage.nix`](https://github.com/input-output-hk/hackage.nix) — the latest contents of the [Hackage](https://hackage.haskell.org/) databases, converted to Nix expressions.
 
 - [`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

@@ -20,6 +20,7 @@ let
   haskell = pkgs.haskell-nix;
   buildHaskell = pkgs.buildPackages.haskell-nix;
   tool = buildHaskell.tool;
+  ghcFromTo = from: to: __compareVersions haskell.compiler.${compiler-nix-name}.version from >= 0 && __compareVersions haskell.compiler.${compiler-nix-name}.version to < 0;
 in rec {
   tests = import ./test/default.nix { inherit pkgs evalPackages ifdLevel compiler-nix-name; };
 
@@ -41,55 +42,26 @@ 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 (
-             __compareVersions haskell.compiler.${compiler-nix-name}.version "9.2" >= 0
-          && __compareVersions haskell.compiler.${compiler-nix-name}.version "9.6" < 0) {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "9.2" "9.6") {
       stack =
         tool compiler-nix-name "stack" {
           version = "2.11.1";
           inherit evalPackages;
         };
-    } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.0" < 0) {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "8.10.7" "9.0") {
       # This version will build for ghc < 9.8, but we are only going to test it for
       # ghc < 9.0 (since newer versions do not work with ghc 8.10.7).
       "hls-22" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-2.2";
       };
-    } // pkgs.lib.optionalAttrs (
-      __compareVersions haskell.compiler.${compiler-nix-name}.version "9.0" >= 0 &&
-      __compareVersions haskell.compiler.${compiler-nix-name}.version "9.8" < 0
-    ) {
-      "hls-23" = tool compiler-nix-name "haskell-language-server" {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.8") {
+      "hls-26" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
-        src = pkgs.haskell-nix.sources."hls-2.3";
-      };
-    } // pkgs.lib.optionalAttrs (
-      __compareVersions haskell.compiler.${compiler-nix-name}.version "9.0" >= 0 &&
-      __compareVersions haskell.compiler.${compiler-nix-name}.version "9.9" < 0
-    ) {
-      "hls-24" = tool compiler-nix-name "haskell-language-server" {
-        inherit evalPackages;
-        src = pkgs.haskell-nix.sources."hls-2.4";
-        # Even though this is in the cabal.project it is inside a condional
-        # and so haskell.nix cannot parse it properly.  Luckily adding it
-        # again seems to work fine.
-        cabalProjectLocal = ''
-          repository head.hackage.ghc.haskell.org
-            url: https://ghc.gitlab.haskell.org/head.hackage/
-            secure: True
-            key-threshold: 3
-            root-keys:
-               f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-               26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-               7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-            --sha256: sha256-aVI93DtHziicNn2mGli0YE+bC5BeT7mOQQETp2Thi68=
-
-          if impl(ghc < 9.7)
-            active-repositories: hackage.haskell.org
-        '';
+        src = pkgs.haskell-nix.sources."hls-2.6";
       };
     })
   );

compiler/ghc/default.nix

@@ -316,6 +316,12 @@ let
       # fall back to non-dynamic. We only have x86_64 dynamic linker with musl.
       + lib.optionalString (targetPlatform.isAndroid || (targetPlatform.isMusl && !targetPlatform.isx86))
         " '*.ghc.cabal.configure.opts += --flags=-dynamic-system-linker'"
+      # 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
       # iPhones/iPads/... won't understand the compiled code, as the compiler will emit LDSETALH
       # + lib.optionalString (targetPlatform.???) "'*.rts.ghc.c.opts += -optc-mcpu=apple-a7 -optc-march=armv8-a+norcpc'"
@@ -792,6 +798,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

docs/SUMMARY.md

@@ -4,8 +4,6 @@
 - [Tutorials](./tutorials/index.md)
     - [Creating a development environment](./tutorials/development.md)
     - [Getting started](./tutorials/getting-started.md)
-    - [Getting started with Flakes](./tutorials/getting-started-flakes.md)
-    - [Getting started with Hix](./tutorials/getting-started-hix.md)
     - [Sourcing files only part of git repository using cleanGit](./tutorials/clean-git.md)
     - [Handling git repositories in projects](./tutorials/source-repository-hashes.md)
     - [Mapping non-Haskell dependencies to Nixpkgs](./tutorials/pkg-map.md)