File tree Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change 18
18
19
19
# short names for nixpkgs versions
20
20
nixpkgsVersions = {
21
- "R2411" = inputs . nixpkgs-2411 ;
22
21
"R2505" = inputs . nixpkgs-2505 ;
23
22
"unstable" = inputs . nixpkgs-unstable ;
24
23
} ;
44
43
"libdwarf-20181024"
45
44
"dwarfdump-20181024"
46
45
] ;
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
+ ] ;
47
52
} ;
48
53
} ;
49
54
97
102
} // lib . optionalAttrs ( __match ".*llvm" compiler-nix-name == null && system == "x86_64-linux" && nixpkgsName == "unstable" && ! builtins . elem compiler-nix-name [ "ghc902" "ghc928" "ghc948" ] ) {
98
103
# Out llvm versions of GHC seem to break for musl32
99
104
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" ] ) {
101
106
inherit ( lib . systems . examples ) aarch64-android-prebuilt armv7a-android-prebuilt ;
102
107
} // lib . optionalAttrs ( system == "x86_64-linux" && nixpkgsName == "unstable" && ! builtins . elem compiler-nix-name [ "ghc8107" "ghc902" ] ) {
103
108
# TODO fix this for the compilers we build with hadrian (ghc >=9.4)
You can’t perform that action at this time.
0 commit comments