Merge branch 'clean-up-nixpkgs-protoc-java-2233'

2 files changed, 12 insertions, 21 deletions

diff --git a/android/flake.lock b/android/flake.lock
index 63e963fc21..ea89b92606 100644
--- a/android/flake.lock
+++ b/android/flake.lock
@@ -9,11 +9,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753647747,
-        "narHash": "sha256-Sh339Czv6XtpOmMDWqQhS2GEAlqevz3bfDqzrvIueD0=",
+        "lastModified": 1759868461,
+        "narHash": "sha256-25Jy39J1/aTjUiSU4zZF44x19ZTmmsLFH/B9UawXk0c=",
         "owner": "tadfisher",
         "repo": "android-nixpkgs",
-        "rev": "d7eb36518bab45d29815a763965a0c5d9dff69e2",
+        "rev": "023a70642315854ac38cf7053ba77fbaba4c16f1",
         "type": "github"
       },
       "original": {
@@ -115,16 +115,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1753549186,
-        "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=",
+        "lastModified": 1759826507,
+        "narHash": "sha256-vwXL9H5zDHEQA0oFpww2one0/hkwnPAjc47LRph6d0I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "17f6bd177404d6d43017595c5264756764444ab8",
+        "rev": "bce5fe2bb998488d8e7e7856315f90496723793c",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "type": "indirect"
       }
     },
@@ -144,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753671061,
-        "narHash": "sha256-IU4eBWfe9h2QejJYST+EAlhg8a1H6mh9gbcmWgZ2/mQ=",
+        "lastModified": 1759890791,
+        "narHash": "sha256-KN1xkrQ4x6u8plgg43ZiYbQmESxeCKKOzALKjqbn4LM=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "40065d17ee4dbec3ded8ca61236132aede843fab",
+        "rev": "74fcbc183aa6685f86008606bb7824bf2f40adbd",
         "type": "github"
       },
       "original": {
diff --git a/android/flake.nix b/android/flake.nix
index b48befe941..87da13b673 100644
--- a/android/flake.nix
+++ b/android/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
     # Unstable is currently needed for protoc-gen-grpc-java.
     # We should switch to a stable channel once it's avaiable on those.
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
     devshell.url = "github:numtide/devshell";
     flake-utils.url = "github:numtide/flake-utils";
     rust-overlay = {
@@ -31,15 +31,6 @@
         overlays = [
           (import rust-overlay)
           devshell.overlays.default
-          # Fix that disables autoPatchelfHook on macOS.
-          # Should be addressed upstream in nixpkgs.
-          (final: prev: {
-            protoc-gen-grpc-java = prev.protoc-gen-grpc-java.overrideAttrs (old: {
-              nativeBuildInputs =
-                pkgs.lib.remove prev.autoPatchelfHook (old.nativeBuildInputs or [])
-                ++ pkgs.lib.optionals prev.stdenv.isLinux [prev.autoPatchelfHook];
-            });
-          })
         ];
       };
 
@@ -104,7 +95,7 @@
             pkgs.gnumake
             pkgs.protobuf
             pkgs.jdk17
-            pkgs.python3Full
+            pkgs.python314
           ]
           ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [pkgs.libiconv];