Merge remote-tracking branch 'origin/master' into hkm/wasm

hamishmack · hamishmack · commit e72a907fab27 · 2025-06-13T05:53:04.000+12:00
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -239,7 +239,7 @@ jobs:
       - name: "Check hix -- run github:haskell/cabal/3.10#cabal-install:exe:cabal -- --version"
         run: "HIX_DIR=$(mktemp -d) nix run .#hix --accept-flake-config -- run github:haskell/cabal/3.10#cabal-install:exe:cabal --accept-flake-config --override-input haskellNix . -- --version"
 
-  nix-tools:
+  check-nix-tools:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/upload-artifacts.yml b/.github/workflows/upload-artifacts.yml
@@ -1,4 +1,4 @@
-name: Wait for Hydra Build
+name: Update Static Nix Tools
 
 on:
   push:
diff --git a/build.nix b/build.nix
@@ -57,10 +57,10 @@ in rec {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-2.2";
       };
-    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.10.2") {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.13") {
       "hls" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
-        src = pkgs.haskell-nix.sources."hls-2.10";
+        src = pkgs.haskell-nix.sources."hls-2.11";
       };
     })
   );
diff --git a/builder/haddock-builder.nix b/builder/haddock-builder.nix
@@ -109,6 +109,12 @@ let
 
       # If we don't have any source files, no need to run haddock
       [[ -n $(find . -name "*.hs" -o -name "*.lhs") ]] && {
+      # Run any preprocessor in the custom build step
+      $SETUP_HS build \
+        "--with-ghc=false" \
+        ${lib.optionalString (haskellLib.isTest componentId) "--tests"} \
+        ${lib.concatStringsSep " " setupHaddockFlags} || true
+
       $SETUP_HS haddock \
         "--html" \
         ${lib.optionalString (haskellLib.isTest componentId) "--tests"} \
diff --git a/ci.nix b/ci.nix
@@ -66,10 +66,10 @@
       # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
       # Update supported-ghc-versions.md to reflect any changes made here.
       nixpkgs.lib.optionalAttrs (builtins.elem nixpkgsName ["R2411" "R2505"]) {
-        ghc96 = true;
-        ghc98 = true;
-        ghc910 = true;
-        ghc912 = true;
+        ghc96 = false;
+        ghc98 = false;
+        ghc910 = false;
+        ghc912 = false;
       } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
         ghc96 = true;
         ghc98 = true;
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -21,6 +21,7 @@
     "hls-2.8" = { url = "github:haskell/haskell-language-server/2.8.0.0"; flake = false; };
     "hls-2.9" = { url = "github:haskell/haskell-language-server/2.9.0.1"; flake = false; };
     "hls-2.10" = { url = "github:haskell/haskell-language-server/2.10.0.0"; flake = false; };
+    "hls-2.11" = { url = "github:haskell/haskell-language-server/2.11.0.0"; flake = false; };
     "hls"     = { url = "github:haskell/haskell-language-server"; flake = false; };
     hackage = {
       url = "github:input-output-hk/hackage.nix";
diff --git a/lib/call-cabal-project-to-nix.nix b/lib/call-cabal-project-to-nix.nix
@@ -465,6 +465,8 @@ let
                 cabal_file=${ghcSrc}/compiler/${name}.cabal.in
               elif [ -f ${ghcSrc}/libraries/${name}/${name}.cabal.in ]; then
                 cabal_file=${ghcSrc}/libraries/${name}/${name}.cabal.in
+              elif [ -f ${ghcSrc}/utils/haddock/${name}/${name}.cabal ]; then
+                cabal_file=${ghcSrc}/utils/haddock/${name}/${name}.cabal
               fi
               if [[ "$cabal_file" != "" ]]; then
                 fixed_cabal_file=$(mktemp)
diff --git a/nix-tools-static.nix b/nix-tools-static.nix
@@ -1,22 +1,22 @@
-pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.3.2/"; in {
+pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.3.5/"; in {
   aarch64-darwin = pkgs.fetchurl { 
      name = "aarch64-darwin-nix-tools-static";
      url = "${baseurl}aarch64-darwin-nix-tools-static.zip";
-     sha256 = "sha256-SlTAgNj3YjZpobl/aIZLI+o8EpxznW5X90UBTtHDwbw=";
+     sha256 = "sha256-umzS70a8h1pigTzBJdkChEPqIk83NXfi02zIDQIDrzI=";
   };
   x86_64-darwin = pkgs.fetchurl { 
      name = "x86_64-darwin-nix-tools-static";
      url = "${baseurl}x86_64-darwin-nix-tools-static.zip";
-     sha256 = "sha256-6m2f3DoARyoxR5Fh+87TfVCLkewwhozVLKbUzfXvUxs=";
+     sha256 = "sha256-O0T0tI+vD5ZuozKvqlfQR93UO6p4P0HyPQDLvhUIChs=";
   };
   aarch64-linux = pkgs.fetchurl { 
      name = "aarch64-linux-nix-tools-static";
      url = "${baseurl}aarch64-linux-nix-tools-static.zip";
-     sha256 = "sha256-MX4u23nzjByT9zcSN+HlKOAgQNtYvcuR8iOh54wR41U=";
+     sha256 = "sha256-J3z5WbEm96k25UyOK3kKRtecQvTQIORRhoROKFSULZI=";
   };
   x86_64-linux = pkgs.fetchurl { 
      name = "x86_64-linux-nix-tools-static";
      url = "${baseurl}x86_64-linux-nix-tools-static.zip";
-     sha256 = "sha256-QzTCy7HPY5xN6VFKJcibE1gWLsT4u8OPfJHvDMK3v7M=";
+     sha256 = "sha256-CKf8Drj1UOwlAg16S4kuyVp25O7al/5YzxwrLawVnwQ=";
   };
 }
diff --git a/nix-tools/nix-tools/lib-cabal2nix/Cabal2Nix.hs b/nix-tools/nix-tools/lib-cabal2nix/Cabal2Nix.hs
@@ -453,6 +453,7 @@ instance {-# OVERLAPS #-} ToNixExpr a => ToNixExpr [a] where
 -- condtional statements in .cabal files.
 fixSystem :: String -> String
 fixSystem "isJavascript" = "isJavaScript"
+fixSystem "isDragonfly" = "isDragonFly"
 fixSystem s = s
 
 instance ToNixExpr ConfVar where
diff --git a/overlays/haskell.nix b/overlays/haskell.nix
@@ -827,10 +827,11 @@ final: prev: {
             #     ];
             #   }
             #
-            shellFor = extraArgs: shellFor' (rawProject.args.shell // extraArgs).crossPlatforms extraArgs;
-            shellFor' = crossPlatforms: extraArgs:
+            shellFor = extraArgs: (appendModule { shell = extraArgs; }).shell;
+            shell = shellFor' rawProject.args.shell.crossPlatforms;
+            shellFor' = crossPlatforms:
               let
-                shellArgs = builtins.removeAttrs (rawProject.args.shell // extraArgs) [ "crossPlatforms" ];
+                shellArgs = builtins.removeAttrs rawProject.args.shell [ "crossPlatforms" ];
                 # These are the args we will pass to the shells for the corss compiler
                 argsCross =
                   # These things should match main shell
@@ -848,9 +849,6 @@ final: prev: {
                   inputsFrom = shellArgs.inputsFrom or [] ++ crossShells;
                 });
 
-            # Default shell
-            shell = shellFor {};
-
             # Like `.hsPkgs.${packageName}` but when compined with `getComponent` any
             # cabal configure errors are defered until the components derivation builds.
             getPackage = packageName:
@@ -1053,6 +1051,14 @@ final: prev: {
                     setupBuildFlags = final.lib.mkForce [];
                   };
                 }];
+              } // final.lib.optionalAttrs (
+                     final.stdenv.hostPlatform.isAarch64
+                  && builtins.compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8" < 0) {
+                # The th-dlls test fails for aarch64 cross GHC 9.6.7 when the threaded rts is used
+                cabalProjectLocal = ''
+                  package iserv-proxy
+                    flags: -threaded
+                '';
               } // final.lib.optionalAttrs (__compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.10" > 0) {
                   cabalProjectLocal = ''
                     allow-newer: *:base, *:bytestring
@@ -1120,6 +1126,9 @@ final: prev: {
             "xhtml"
           ] ++ final.lib.optionals (builtins.compareVersions ghc.version "9.4" > 0) [
             "system-cxx-std-lib"
+          ] ++ final.lib.optionals (builtins.compareVersions ghc.version "9.12" > 0) [
+            "haddock-api"
+            "haddock-library"
           ] ++ final.lib.optionals (
                   !final.stdenv.targetPlatform.isGhcjs
                && !final.stdenv.targetPlatform.isWindows
diff --git a/test/cabal.project.local b/test/cabal.project.local
@@ -1,3 +1,10 @@
+-- See https://github.com/haskellari/splitmix/pull/97
+source-repository-package
+  type: git
+  location: https://github.com/hamishmack/splitmix.git
+  tag: e3549473b124a7ba078408ac0d2c8aa8111c3888
+  --sha256: sha256-o18DEF4+z3/jGhMZbow8PFtYBiIm6+b4B+6o5tM6ez0=
+
 if impl(ghc>=9.12.1)
   -- allow newer packages, that are bound to be newer due to
   -- being shipped with a newer compiler.  If you extend this
diff --git a/test/haskell-language-server/cabal.nix b/test/haskell-language-server/cabal.nix
@@ -3,7 +3,7 @@ let
   project = haskell-nix.cabalProject' {
     inherit compiler-nix-name evalPackages;
     name = "haskell-language-server";
-    src = haskell-nix.sources."hls-2.10";
+    src = haskell-nix.sources."hls-2.11";
     configureArgs = "--disable-benchmarks --disable-tests"; # This makes cabalProject' more like the `tool` function
   };
 in recurseIntoAttrs {
@@ -16,5 +16,5 @@ in recurseIntoAttrs {
   meta.disabled =
     stdenv.hostPlatform != stdenv.buildPlatform
     || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.0.1" < 0
-    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.10.2" >= 0;
+    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.13" >= 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Wait for Hydra Build`
	`1`	`+name: Update Static Nix Tools`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`