Skip to content

Commit bc7a401

Browse files
authored
Add nixpkgs-2511 (#2456)
* Add nixpkgs-2511 * Skip tests for GHC using older LLVM versions no longer in nispkgs * Use NDK 27 * Skip android tests that require old LLVM versions
1 parent 79eb591 commit bc7a401

File tree

5 files changed

+37
-15
lines changed

5 files changed

+37
-15
lines changed

ci.nix

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# short names for nixpkgs versions
2020
nixpkgsVersions = {
21-
"R2505" = inputs.nixpkgs-2505;
21+
"R2511" = inputs.nixpkgs-2511;
2222
"unstable" = inputs.nixpkgs-unstable;
2323
};
2424

@@ -64,12 +64,10 @@
6464
# cabal-install and nix-tools plans. When removing a ghc version
6565
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
6666
# Update supported-ghc-versions.md to reflect any changes made here.
67-
nixpkgs.lib.optionalAttrs (builtins.elem nixpkgsName ["R2411" "R2505"]) {
67+
nixpkgs.lib.optionalAttrs (builtins.elem nixpkgsName ["R2411" "R2505" "R2511"]) {
6868
ghc96 = false;
6969
ghc98 = false;
70-
ghc98llvm = false;
7170
ghc910 = false;
72-
ghc910llvm = false;
7371
ghc912 = false;
7472
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
7573
ghc96 = true;
@@ -93,7 +91,7 @@
9391
inherit (lib.systems.examples) ghcjs;
9492
} // lib.optionalAttrs (nixpkgsName == "unstable"
9593
&& (__match ".*llvm" compiler-nix-name == null)
96-
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9102" "ghc9103"]
94+
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103"]
9795
&& system != "x86_64-darwin") {
9896
inherit (lib.systems.examples) wasi32;
9997
} // lib.optionalAttrs (nixpkgsName == "unstable"
@@ -113,9 +111,12 @@
113111
} // lib.optionalAttrs (__match ".*llvm" compiler-nix-name == null && system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) {
114112
# Out llvm versions of GHC seem to break for musl32
115113
inherit (lib.systems.examples) musl32;
116-
} // lib.optionalAttrs (system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) {
114+
} // lib.optionalAttrs (system == "x86_64-linux"
115+
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103"]) {
117116
inherit (lib.systems.examples) aarch64-android-prebuilt;
118-
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName != "unstable" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc9103" "ghc9103llvm" "ghc91320250523"]) {
117+
} // lib.optionalAttrs (system == "x86_64-linux"
118+
&& nixpkgsName != "unstable"
119+
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103" "ghc91320250523"]) {
119120
inherit (lib.systems.examples) armv7a-android-prebuilt;
120121
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc8107" "ghc902"]) {
121122
# TODO fix this for the compilers we build with hadrian (ghc >=9.4)

default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ self // {
100100
pkgs-2505 = import self.inputs.nixpkgs-2505 (nixpkgsArgs // {
101101
localSystem = { inherit system; };
102102
});
103+
pkgs-2511 = import self.inputs.nixpkgs-2511 (nixpkgsArgs // {
104+
localSystem = { inherit system; };
105+
});
103106
pkgs-unstable = import self.inputs.nixpkgs-unstable (nixpkgsArgs // {
104107
localSystem = { inherit system; };
105108
});

flake.lock

Lines changed: 23 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
nixpkgs-2405 = { url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; };
99
nixpkgs-2411 = { url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin"; };
1010
nixpkgs-2505 = { url = "github:NixOS/nixpkgs/nixpkgs-25.05-darwin"; };
11+
nixpkgs-2511 = { url = "github:NixOS/nixpkgs/nixpkgs-25.11-darwin"; };
1112
nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
1213
flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
1314
"hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };

overlays/android.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ final: prev: {
55
examples = prev.lib.systems.examples // {
66
aarch64-android = prev.lib.systems.examples.aarch64-android // {
77
androidSdkVersion = "269";
8-
androidNdkVersion = "24";
8+
androidNdkVersion = "27";
99
};
1010
armv7a-android-prebuilt = prev.lib.systems.examples.armv7a-android-prebuilt // {
1111
androidSdkVersion = "26";
12-
androidNdkVersion = "24";
12+
androidNdkVersion = "27";
1313
};
1414
};
1515
};

0 commit comments

Comments
 (0)