flake.*: upgrade to nixpkgs 25.05, use nixpkgs android SDK

Signed-off-by: Elias Naur <mail@eliasnaur.com>

flake.lock

@@ -1,86 +1,25 @@
 {
   "nodes": {
-    "android": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733430059,
-        "narHash": "sha256-o3O5tjrMMebRLuHQt7BbEw3jZgWRW5vnOptNXv8WdO4=",
-        "owner": "tadfisher",
-        "repo": "android-nixpkgs",
-        "rev": "d2f3c1ea99c0bea9d28a0e59daeb482f50d4cd35",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tadfisher",
-        "repo": "android-nixpkgs",
-        "type": "github"
-      }
-    },
-    "devshell": {
-      "inputs": {
-        "nixpkgs": [
-          "android",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1728330715,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733261153,
+        "lastModified": 1747953325,
-        "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
+        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
-        "android": "android",
+        "nixpkgs": "nixpkgs",
-        "nixpkgs": "nixpkgs"
+        "utils": "utils"
       }
     },
     "systems": {
@@ -97,6 +36,24 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -3,42 +3,38 @@
   description = "Gio build environment";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
-    android.url = "github:tadfisher/android-nixpkgs";
+    utils.url = "github:numtide/flake-utils";
-    android.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, android }:
+  outputs = { self, nixpkgs, utils }:
-    let
+    utils.lib.eachDefaultSystem (system:
-      supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      let
-      forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
+        pkgs = import nixpkgs {
-    in
+          inherit system;
-    {
+
-      devShells = forAllSystems
+          # allow unfree Android packages.
-        (system:
+          config.allowUnfree = true;
-          let
+          # accept the Android SDK license.
-            pkgs = import nixpkgs {
+          config.android_sdk.accept_license = true; 
-              inherit system;
+        };
+      in {
+        devShells = let
+          android-sdk = let
+            androidComposition = pkgs.androidenv.composeAndroidPackages {
+              platformVersions = [ "latest" ];
+              abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+               # Omit the deprecated tools package.
+              toolsVersion = null;
+              includeNDK = true;
             };
-            android-sdk = android.sdk.${system} (sdkPkgs: with sdkPkgs;
+          in androidComposition.androidsdk;
-              [
+        in {
-                build-tools-31-0-0
+          default = with pkgs;
-                cmdline-tools-latest
+            mkShell (rec {
-                platform-tools
+              ANDROID_HOME = "${android-sdk}/libexec/android-sdk";
-                platforms-android-31
+              packages = [ android-sdk jdk clang ]
-                ndk-bundle
+                ++ (if stdenv.isLinux then [
-              ]);
-          in
-          {
-            default = with pkgs; mkShell
-              ({
-                ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk";
-                JAVA_HOME = jdk17.home;
-                packages = [
-                  android-sdk
-                  jdk17
-                  clang
-                ] ++ (if stdenv.isLinux then [
                   vulkan-headers
                   libxkbcommon
                   wayland
@@ -47,11 +43,12 @@
                   xorg.libXfixes
                   libGL
                   pkg-config
-                ] else [ ]);
+                ] else
-              } // (if stdenv.isLinux then {
+                  [ ]);
-                LD_LIBRARY_PATH = "${vulkan-loader}/lib";
+            } // (if stdenv.isLinux then {
-              } else { }));
+              LD_LIBRARY_PATH = "${vulkan-loader}/lib";
-          }
+            } else
-        );
+              { }));
-    };
+        };
+      });
 }