From 849cf8cfbef7f719e00d628cd5dff1c2e3ec4f37 Mon Sep 17 00:00:00 2001
From: Victor Luft <victor@luft.io>
Date: Tue, 17 Jun 2025 10:00:10 -0400
Subject: [PATCH 1/2] minikube: 1.34.0 -> 1.36.0

---
 pkgs/by-name/mi/minikube/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix
index 74788f7c5224..8b6369696010 100644
--- a/pkgs/by-name/mi/minikube/package.nix
+++ b/pkgs/by-name/mi/minikube/package.nix
@@ -15,9 +15,9 @@
 
 buildGoModule rec {
   pname = "minikube";
-  version = "1.34.0";
+  version = "1.36.0";
 
-  vendorHash = "sha256-gw5Ol7Gp26KyIaiMvwik8FJpABpMT86vpFnZnAJ6hhs=";
+  vendorHash = "sha256-ro4QwvTf1O6/iffxEKi6pAenX8E3fPu4omqbLcigsTk=";
 
   doCheck = false;
 
@@ -25,10 +25,14 @@ buildGoModule rec {
     owner = "kubernetes";
     repo = "minikube";
     rev = "v${version}";
-    sha256 = "sha256-Z7x3MOQUF3a19X4SSiIUfSJ3xl3482eKH700m/9pqcU=";
+    sha256 = "sha256-We5EyEWvrQ/k27920kE1XMijQWSYvLle7N3KUOsTfbc=";
   };
   postPatch =
-    (lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) ''
+    ''
+      substituteInPlace Makefile \
+        --replace-fail "export GOTOOLCHAIN := go\$(GO_VERSION)" "export GOTOOLCHAIN := local"
+    ''
+    + (lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) ''
       substituteInPlace \
         pkg/minikube/registry/drvs/qemu2/qemu2.go \
         --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \

From 4f47440a891845d0b2349b47ac956b4f0634a2d4 Mon Sep 17 00:00:00 2001
From: Victor Luft <victor@luft.io>
Date: Tue, 17 Jun 2025 10:29:57 -0400
Subject: [PATCH 2/2] use `local` GOTOOLCHAIN for docker-machine-*

---
 .../networking/cluster/docker-machine/hyperkit.nix        | 1 +
 .../networking/cluster/docker-machine/kvm2.nix            | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
index a0ebcefe31ed..9d164878dfce 100644
--- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
@@ -12,6 +12,7 @@ buildGoModule rec {
     buildInputs
     vendorHash
     doCheck
+    postPatch
     ;
 
   pname = "docker-machine-hyperkit";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index 803f7033bc23..bf4bb2734f42 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -16,9 +16,11 @@ buildGoModule rec {
 
   pname = "docker-machine-kvm2";
 
-  postPatch = ''
-    sed -i '/GOARCH=$*/d' Makefile
-  '';
+  postPatch =
+    minikube.postPatch
+    + ''
+      sed -i '/GOARCH=$*/d' Makefile
+    '';
 
   buildPhase = ''
     make docker-machine-driver-kvm2 COMMIT=${src.rev}