Skip to content

Add nixpkgs-2511 #2456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add nixpkgs-2511 #2456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
841017d
Add nixpkgs-2511
hamishmack Dec 1, 2025
35b54b1
Skip tests for GHC using older LLVM versions no longer in nispkgs
hamishmack Dec 2, 2025
7bf8dac
Use NDK 27
hamishmack Dec 2, 2025
e44ea44
Merge remote-tracking branch 'origin/master' into hkm/add-nixpkgs-2511
hamishmack Dec 3, 2025
39972b4
Skip android tests that require old LLVM versions
hamishmack Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ci.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# short names for nixpkgs versions
nixpkgsVersions = {
"R2505" = inputs.nixpkgs-2505;
"R2511" = inputs.nixpkgs-2511;
"unstable" = inputs.nixpkgs-unstable;
};

Expand Down Expand Up @@ -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;
Expand All @@ -93,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"
Expand All @@ -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" "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)
Expand Down
3 changes: 3 additions & 0 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
});
Expand Down
29 changes: 23 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down
4 changes: 2 additions & 2 deletions overlays/android.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
};
};
Expand Down
Loading