From 9d1eed54452dad4b95268256c31727bbbee67fe4 Mon Sep 17 00:00:00 2001
From: Cabia Rangris <cab@cab.moe>
Date: Mon, 14 Jul 2025 02:09:02 +0400
Subject: [PATCH] klipper: 0.13.0-unstable-2025-05-22 ->
 0.13.0-unstable-2025-07-12

KConfig is now getting refreshed automatically, making it easier to bump
versions.
---
 pkgs/servers/klipper/default.nix          |  6 +++---
 pkgs/servers/klipper/klipper-firmware.nix | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index 82d51341c9fa..25b241970662 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "0.13.0-unstable-2025-05-22";
+  version = "0.13.0-unstable-2025-07-12";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "b1011e3fb14df7470d9b74e59042383012b199c6";
-    sha256 = "sha256-gDOGGTS0UPe0ni+zcRUz9CRhkL6hq1PXCzYC9RpqNU8=";
+    rev = "9323a5dfe28619a53c7f350c2e894d299c342bca";
+    sha256 = "sha256-m6A8a3lR8aeMudA/kz1wCynm+6jZY3w6v2Pag54lQd8=";
   };
 
   sourceRoot = "${src.name}/klippy";
diff --git a/pkgs/servers/klipper/klipper-firmware.nix b/pkgs/servers/klipper/klipper-firmware.nix
index b314379be190..63feb8b07455 100644
--- a/pkgs/servers/klipper/klipper-firmware.nix
+++ b/pkgs/servers/klipper/klipper-firmware.nix
@@ -33,7 +33,14 @@ stdenv.mkDerivation rec {
     wxGTK32 # Required for bossac
   ];
 
-  preBuild = "cp ${firmwareConfig} ./.config";
+  configurePhase = ''
+    cp ${firmwareConfig} ./.config
+    chmod +w ./.config
+    echo qy | { make menuconfig >/dev/null || true; }
+    if ! diff ${firmwareConfig} ./.config; then
+      echo " !!! Menuconfig has changed. Please update your configuration."
+    fi
+  '';
 
   postPatch = ''
     patchShebangs .
@@ -41,7 +48,6 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "V=1"
-    "KCONFIG_CONFIG=${firmwareConfig}"
     "WXVERSION=3.2"
   ];
 
@@ -58,7 +64,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     inherit (klipper.meta) homepage license;
     description = "Firmware part of Klipper";
-    maintainers = with maintainers; [ vtuan10 ];
+    maintainers = with maintainers; [ vtuan10 cab404 ];
     platforms = platforms.linux;
   };
 }