Merge remote-tracking branch 'origin/master' into enableIPE

Author: hamishmack

build.nix

@@ -20,7 +20,7 @@ in rec {
   tests = import ./test/default.nix { inherit pkgs evalPackages ifdLevel compiler-nix-name; };
 
   tools = pkgs.lib.optionalAttrs (ifdLevel >= 3) (
-    pkgs.recurseIntoAttrs ({
+    pkgs.lib.recurseIntoAttrs ({
       cabal-latest = tool compiler-nix-name "cabal" ({
         inherit evalPackages;
       } // pkgs.lib.optionalAttrs (ghcFromTo "9.13" "9.14") {
@@ -100,8 +100,8 @@ in rec {
 
   # These are pure parts of maintainer-script so they can be built by hydra
   # and added to the cache to speed up buildkite.
-  maintainer-script-cache = pkgs.recurseIntoAttrs (
-      (pkgs.lib.optionalAttrs (pkgs.system == "x86_64-linux") {
+  maintainer-script-cache = pkgs.lib.recurseIntoAttrs (
+      (pkgs.lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "x86_64-linux") {
         inherit (maintainer-scripts) check-hydra;
       })
     // (pkgs.lib.optionalAttrs (ifdLevel > 2) {

builder/hspkg-builder.nix

@@ -62,7 +62,7 @@ let
 
 in rec {
   components = haskellLib.applyComponents (buildComp pkg.allComponent) pkg;
-  checks = pkgs.recurseIntoAttrs (builtins.mapAttrs
+  checks = pkgs.lib.recurseIntoAttrs (builtins.mapAttrs
     (_: d: haskellLib.check d)
       (lib.filterAttrs (_: d: d.config.doCheck) components.tests));
   inherit (package) identifier detailLevel isLocal isProject buildType;

ci.nix

@@ -18,7 +18,7 @@
 
   # short names for nixpkgs versions
   nixpkgsVersions = {
-    "R2505" = inputs.nixpkgs-2505;
+    "R2511" = inputs.nixpkgs-2511;
     "unstable" = inputs.nixpkgs-unstable;
   };
 
@@ -64,12 +64,10 @@
       # cabal-install and nix-tools plans.  When removing a ghc version
       # 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"]) {
+      nixpkgs.lib.optionalAttrs (builtins.elem nixpkgsName ["R2411" "R2505" "R2511"]) {
         ghc96 = false;
         ghc98 = false;
-        ghc98llvm = false;
         ghc910 = false;
-        ghc910llvm = false;
         ghc912 = false;
       } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
         ghc96 = true;
@@ -89,11 +87,11 @@
         static = p: p.pkgsStatic;
       } // lib.optionalAttrs (nixpkgsName == "unstable"
           && (__match ".*llvm" compiler-nix-name == null)
-          && !builtins.elem compiler-nix-name ["ghc9102"]) {
+          && !builtins.elem compiler-nix-name ["ghc9102" "ghc9103"]) {
         inherit (lib.systems.examples) ghcjs;
       } // lib.optionalAttrs (nixpkgsName == "unstable"
           && (__match ".*llvm" compiler-nix-name == null)
-          && !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9102"]
+          && !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103"]
           && system != "x86_64-darwin") {
         inherit (lib.systems.examples) wasi32;
       } // lib.optionalAttrs (nixpkgsName == "unstable"
@@ -113,9 +111,12 @@
       } // lib.optionalAttrs (__match ".*llvm" compiler-nix-name == null && system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) {
         # Out llvm versions of GHC seem to break for musl32
         inherit (lib.systems.examples) musl32;
-      } // lib.optionalAttrs (system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) {
+      } // lib.optionalAttrs (system == "x86_64-linux"
+          && !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103"]) {
         inherit (lib.systems.examples) aarch64-android-prebuilt;
-      } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName != "unstable" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc91320250523"]) {
+      } // lib.optionalAttrs (system == "x86_64-linux"
+          && nixpkgsName != "unstable"
+          && !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103" "ghc91320250523"]) {
         inherit (lib.systems.examples) armv7a-android-prebuilt;
       } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc8107" "ghc902"]) {
         # TODO fix this for the compilers we build with hadrian (ghc >=9.4)
@@ -134,15 +135,15 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: pinnedNixpkgsSrc:
       in filterAttrsOnlyRecursive (_: v: platformFilter v && !(isDisabled v)) ({
         # Native builds
         # TODO: can we merge this into the general case by picking an appropriate "cross system" to mean native?
-        native = pkgs.recurseIntoAttrs ({
+        native = pkgs.lib.recurseIntoAttrs ({
           roots = pkgs.haskell-nix.roots' { inherit compiler-nix-name evalPackages; } ifdLevel;
         } // pkgs.lib.optionalAttrs runTests {
           inherit (build) tests tools maintainer-scripts maintainer-script-cache;
         } // pkgs.lib.optionalAttrs (ifdLevel >= 3) rec {
           hello = (pkgs.haskell-nix.hackage-package ({ name = "hello"; version = "1.0.0.2"; inherit evalPackages compiler-nix-name; }
             // lib.optionalAttrs (builtins.compareVersions pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.13" >= 0) {
               shell.tools.hoogle.cabalProjectLocal = ''
-                allow-newer: *:*
+                allow-newer: hashable:ghc-bignum, integer-logarithms:ghc-bignum
               '';
           })).getComponent "exe:hello";
           # Make sure the default shell tools (hoogle) are built
@@ -156,7 +157,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: pinnedNixpkgsSrc:
                 then import pinnedNixpkgsSrc (nixpkgsArgs // { inherit system crossSystem; })
                 else crossSystem (import pinnedNixpkgsSrc (nixpkgsArgs // { inherit system; }));
             build = import ./build.nix { inherit pkgs evalPackages ifdLevel compiler-nix-name haskellNix; };
-        in pkgs.recurseIntoAttrs (pkgs.lib.optionalAttrs (ifdLevel >= 1) ({
+        in pkgs.lib.recurseIntoAttrs (pkgs.lib.optionalAttrs (ifdLevel >= 1) ({
             roots = pkgs.haskell-nix.roots' { inherit compiler-nix-name evalPackages; } ifdLevel // {
               ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.override { ghcEvalPackages = evalPackages; };
             };

default.nix

@@ -100,6 +100,9 @@ self // {
   pkgs-2505 = import self.inputs.nixpkgs-2505 (nixpkgsArgs // {
     localSystem = { inherit system; };
   });
+  pkgs-2511 = import self.inputs.nixpkgs-2511 (nixpkgsArgs // {
+    localSystem = { inherit system; };
+  });
   pkgs-unstable = import self.inputs.nixpkgs-unstable (nixpkgsArgs // {
     localSystem = { inherit system; };
   });

docs/reference/supported-ghc-versions.md

@@ -24,7 +24,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
 |------------------|--------------------|-------------|-----------------------|---------------|
 | unstable         | `nixpkgs-unstable` | 9.6.7       | `ghc96` or `ghc967`   | Yes           |
 | unstable         | `nixpkgs-unstable` | 9.8.4       | `ghc98` or `ghc984`   | Yes           |
-| unstable         | `nixpkgs-unstable` | 9.10.2      | `ghc910` or `ghc9102` | Yes           |
+| unstable         | `nixpkgs-unstable` | 9.10.3      | `ghc910` or `ghc9103` | Yes           |
 | unstable         | `nixpkgs-unstable` | 9.12.2      | `ghc912` or `ghc9122` | Yes           |
 
 See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix)

flake.lock

@@ -8,6 +8,7 @@
     nixpkgs-2405 = { url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; };
     nixpkgs-2411 = { url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin"; };
     nixpkgs-2505 = { url = "github:NixOS/nixpkgs/nixpkgs-25.05-darwin"; };
+    nixpkgs-2511 = { url = "github:NixOS/nixpkgs/nixpkgs-25.11-darwin"; };
     nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
     flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
     "hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };

flake.nix

@@ -37,6 +37,7 @@ in {
       inherit ((callFlake { pkgs = final; src = ./ghc984; }).defaultNix) ghc984;
       inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
       inherit ((callFlake { pkgs = final; src = ./ghc9102; }).defaultNix) ghc9102;
+      inherit ((callFlake { pkgs = final; src = ./ghc9103; }).defaultNix) ghc9103;
       inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
       inherit ((callFlake { pkgs = final; src = ./ghc9122; }).defaultNix) ghc9122;
       inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;

lazy-inputs/default.nix

@@ -0,0 +1,12 @@
+{
+  description = "Lazy Input for Haskell.nix";
+
+  inputs = {
+    ghc9103 = {
+      flake = false;
+      url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.10.3-iog&submodules=1";
+    };
+  };
+
+  outputs = inputs: inputs;
+}