From 841017d03f0ed68a10f28924a27c638bf39e1369 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 2 Dec 2025 11:01:17 +1300 Subject: [PATCH 1/4] Add nixpkgs-2511 --- ci.nix | 4 ++-- default.nix | 3 +++ flake.lock | 29 +++++++++++++++++++++++------ flake.nix | 1 + 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/ci.nix b/ci.nix index 706ea92613..4caed38a05 100644 --- a/ci.nix +++ b/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,7 +64,7 @@ # 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; diff --git a/default.nix b/default.nix index c43181eb30..38feea8bdf 100644 --- a/default.nix +++ b/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; }; }); diff --git a/flake.lock b/flake.lock index caa7594a74..2764e54adb 100644 --- a/flake.lock +++ b/flake.lock @@ -468,11 +468,11 @@ }, "nixpkgs-2505": { "locked": { - "lastModified": 1762303001, - "narHash": "sha256-6Q5fx8I7kI+uHL97pdpUnTm1Uu+OazpHfnv+DCAihtE=", + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "139de9c2cb757650424fe8aa2a980eaa93a9e733", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", "type": "github" }, "original": { @@ -482,13 +482,29 @@ "type": "github" } }, + "nixpkgs-2511": { + "locked": { + "lastModified": 1764572236, + "narHash": "sha256-hLp6T/vKdrBQolpbN3EhJOKTXZYxJZPzpnoZz+fEGlE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b0924ea1889b366de6bb0018a9db70b2c43a15f8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-25.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762286042, - "narHash": "sha256-OD5HsZ+sN7VvNucbrjiCz7CHF5zf9gP51YVJvPwYIH8=", + "lastModified": 1764587062, + "narHash": "sha256-hdFa0TAVQAQLDF31cEW3enWmBP+b592OvHs6WVe3D8k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12c1f0253aa9a54fdf8ec8aecaafada64a111e24", + "rev": "c1cb7d097cb250f6e1904aacd5f2ba5ffd8a49ce", "type": "github" }, "original": { @@ -549,6 +565,7 @@ "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-2505": "nixpkgs-2505", + "nixpkgs-2511": "nixpkgs-2511", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" diff --git a/flake.nix b/flake.nix index b1fa5d5af3..d94ea7fb03 100644 --- a/flake.nix +++ b/flake.nix @@ -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; }; From 35b54b1b9343b4711621ea9218f7c5f373e6c0f1 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 2 Dec 2025 16:39:57 +1300 Subject: [PATCH 2/4] Skip tests for GHC using older LLVM versions no longer in nispkgs --- ci.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci.nix b/ci.nix index 4caed38a05..0f92f1c440 100644 --- a/ci.nix +++ b/ci.nix @@ -67,9 +67,7 @@ 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; From 7bf8dacf811b8ad4f077e8a1b4fc118178d4be5b Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 2 Dec 2025 22:19:58 +1300 Subject: [PATCH 3/4] Use NDK 27 --- overlays/android.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/android.nix b/overlays/android.nix index 46b460e7d9..0ad2ab870a 100644 --- a/overlays/android.nix +++ b/overlays/android.nix @@ -5,11 +5,11 @@ final: prev: { examples = prev.lib.systems.examples // { aarch64-android = prev.lib.systems.examples.aarch64-android // { androidSdkVersion = "269"; - androidNdkVersion = "24"; + androidNdkVersion = "27"; }; armv7a-android-prebuilt = prev.lib.systems.examples.armv7a-android-prebuilt // { androidSdkVersion = "26"; - androidNdkVersion = "24"; + androidNdkVersion = "27"; }; }; }; From 39972b4fc4288fd948e80b6135d628ef614ef5cc Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 3 Dec 2025 18:19:02 +1300 Subject: [PATCH 4/4] Skip android tests that require old LLVM versions --- ci.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci.nix b/ci.nix index 5de353b5e9..480877ca1c 100644 --- a/ci.nix +++ b/ci.nix @@ -91,7 +91,7 @@ inherit (lib.systems.examples) ghcjs; } // lib.optionalAttrs (nixpkgsName == "unstable" && (__match ".*llvm" compiler-nix-name == null) - && !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9102" "ghc9103"] + && !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103"] && system != "x86_64-darwin") { inherit (lib.systems.examples) wasi32; } // lib.optionalAttrs (nixpkgsName == "unstable" @@ -111,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" "ghc9103" "ghc9103llvm" "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)