@@ -25,12 +25,13 @@
2525 # Update supported-ghc-versions.md to reflect any changes made here.
2626 {
2727 ghc865 = true;
28− ghc884 = false; # Just included because the native version is needed at eval time
28+ ghc8104 = false; # Just included because the native version is needed at eval time
2929 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
30+ ghc865 = false;
3031 ghc884 = true;
3132 ghc8104 = true;
3233 } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
33− ghc884 = false;
34+ ghc865 = false;
3435 ghc8104 = true;
3536 ghc901 = true;
3637 ghc810420210212 = false;
@@ -52,10 +53,10 @@
5253 # Windows cross compilation is currently broken on macOS
5354 inherit (lib.systems.examples) mingwW64;
5455 } // lib.optionalAttrs (system == "x86_64-linux"
55− && !(nixpkgsName == "R2003" && compiler-nix-name == "ghc884")) {
56+ && !(nixpkgsName == "R2003" && compiler-nix-name == "ghc8104")) {
5657 # Musl cross only works on linux
5758 # aarch64 cross only works on linux
58− # We also skip these for the R2003 was build of ghc884 (we only need the
59+ # We also skip these for the R2003 was build of ghc8104 (we only need the
5960 # native so ifdLevel 1 includes compiler needed in ifdLevel2 eval)
6061 inherit (lib.systems.examples) musl64 aarch64-multiplatform;
6162 };