Build android compilers with nixpkgs 24.05

Author: hamishmack

ci.nix

@@ -64,6 +64,7 @@
       nixpkgs.lib.optionalAttrs (nixpkgsName == "R2405") {
         ghc96 = false;
         ghc98 = false;
+        ghc910 = true;
       } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
         ghc810 = true;
         ghc92 = true;
@@ -100,7 +101,9 @@
   } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable") {
     # Musl cross only works on linux
     # aarch64 cross only works on linux
-    inherit (lib.systems.examples) musl32 musl64 aarch64-multiplatform aarch64-android armv7a-android-prebuilt;
+    inherit (lib.systems.examples) musl32 musl64 aarch64-multiplatform;
+  } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "R2405") {
+    inherit (lib.systems.examples) aarch64-android armv7a-android-prebuilt;
   } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc8107" "ghc902"]) {
     # TODO fix this for the compilers we build with hadrian (ghc >=9.4)
     inherit (lib.systems.examples) aarch64-multiplatform-musl;