Skip to content

Commit bbb69ce

Browse files
committed
Drop nixpkgs-2411 from CI
1 parent 2dae835 commit bbb69ce

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

ci.nix

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

1919
# short names for nixpkgs versions
2020
nixpkgsVersions = {
21-
"R2411" = inputs.nixpkgs-2411;
2221
"R2505" = inputs.nixpkgs-2505;
2322
"unstable" = inputs.nixpkgs-unstable;
2423
};
@@ -44,6 +43,12 @@
4443
"libdwarf-20181024"
4544
"dwarfdump-20181024"
4645
];
46+
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
47+
"android-sdk-ndk"
48+
"android-sdk-platform-tools"
49+
"aarch64-unknown-linux-android-ndk-toolchain-wrapper"
50+
"aarch64-unknown-linux-android-ndk-toolchain"
51+
];
4752
};
4853
};
4954

@@ -97,7 +102,7 @@
97102
} // lib.optionalAttrs (__match ".*llvm" compiler-nix-name == null && system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) {
98103
# Out llvm versions of GHC seem to break for musl32
99104
inherit (lib.systems.examples) musl32;
100-
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "R2411" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) {
105+
} // lib.optionalAttrs (system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) {
101106
inherit (lib.systems.examples) aarch64-android-prebuilt armv7a-android-prebuilt;
102107
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc8107" "ghc902"]) {
103108
# TODO fix this for the compilers we build with hadrian (ghc >=9.4)

0 commit comments

Comments
 (0)