|
18 | 18 |
|
19 | 19 | # short names for nixpkgs versions |
20 | 20 | nixpkgsVersions = { |
21 | | - "R2505" = inputs.nixpkgs-2505; |
| 21 | + "R2511" = inputs.nixpkgs-2511; |
22 | 22 | "unstable" = inputs.nixpkgs-unstable; |
23 | 23 | }; |
24 | 24 |
|
|
64 | 64 | # cabal-install and nix-tools plans. When removing a ghc version |
65 | 65 | # from here (so that is no longer cached) also remove ./materialized/ghcXXX. |
66 | 66 | # 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"]) { |
68 | 68 | ghc96 = false; |
69 | 69 | ghc98 = false; |
70 | | - ghc98llvm = false; |
71 | 70 | ghc910 = false; |
72 | | - ghc910llvm = false; |
73 | 71 | ghc912 = false; |
74 | 72 | } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") { |
75 | 73 | ghc96 = true; |
|
93 | 91 | inherit (lib.systems.examples) ghcjs; |
94 | 92 | } // lib.optionalAttrs (nixpkgsName == "unstable" |
95 | 93 | && (__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"] |
97 | 95 | && system != "x86_64-darwin") { |
98 | 96 | inherit (lib.systems.examples) wasi32; |
99 | 97 | } // lib.optionalAttrs (nixpkgsName == "unstable" |
|
113 | 111 | } // lib.optionalAttrs (__match ".*llvm" compiler-nix-name == null && system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) { |
114 | 112 | # Out llvm versions of GHC seem to break for musl32 |
115 | 113 | 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"]) { |
117 | 116 | 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"]) { |
119 | 120 | inherit (lib.systems.examples) armv7a-android-prebuilt; |
120 | 121 | } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc8107" "ghc902"]) { |
121 | 122 | # TODO fix this for the compilers we build with hadrian (ghc >=9.4) |
|
0 commit comments