From 37f4d335679494a69f48282d86d9d07992d07143 Mon Sep 17 00:00:00 2001
From: GueLaKais <koroyeldiores@gmail.com>
Date: Mon, 11 Aug 2025 13:40:07 +0200
Subject: [PATCH 1/2] gz-cmake: 4.2.0 -> 5.0.0

---
 pkgs/by-name/gz/gz-cmake/package.nix | 29 +++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix
index c5995dae8250..34d9fefd9806 100644
--- a/pkgs/by-name/gz/gz-cmake/package.nix
+++ b/pkgs/by-name/gz/gz-cmake/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  cppcheck,
   doxygen,
   graphviz,
   pkg-config,
@@ -10,7 +11,7 @@
   nix-update-script,
 }:
 let
-  version = "4.2.0";
+  version = "5.0.0";
   versionPrefix = "gz-cmake${lib.versions.major version}";
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -21,33 +22,42 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "gazebosim";
     repo = "gz-cmake";
     tag = "${versionPrefix}_${finalAttrs.version}";
-    hash = "sha256-+bMOcGWfcwPhxR9CBp4iH02CZC4oplCjsTDpPDsDnSs=";
+    hash = "sha256-XF7oglj9Xr6F8a+6uowrY5a040yl4FZlFfW/Y0BJwOs=";
   };
 
   postPatch = ''
     patchShebangs examples/test_c_child_requires_c_no_deps.bash
-    substituteInPlace examples/CMakeLists.txt --replace-fail \
-      "$""{CMAKE_INSTALL_LIBDIR}" "${if stdenv.hostPlatform.isDarwin then "lib" else "lib64"}"
+    substituteInPlace examples/CMakeLists.txt \
+    --replace-fail "$""{CMAKE_INSTALL_LIBDIR}" "${
+      if stdenv.hostPlatform.isDarwin then "lib" else "lib64"
+    }"
   '';
 
   nativeBuildInputs = [
     cmake
+    cppcheck
     doxygen
     graphviz
     pkg-config
+    python3
   ];
 
+  doBuildExamples = false;
+
   cmakeFlags = [
     (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck)
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
+    (lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.doBuildExamples)
   ];
 
-  nativeCheckInputs = [ python3 ];
-
   doCheck = true;
 
-  # Extract the version by matching the tag's prefix.
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version-regex=${versionPrefix}_([\\d\\.]+)" ];
+  passthru = {
+    # bulk updater selects wrong tag
+    skipBulkUpdates = true;
+    updateScript = nix-update-script {
+      extraArgs = [ "--version-regex=gz-cmake(.*)" ];
+    };
   };
 
   meta = {
@@ -57,5 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ guelakais ];
+    badPlatforms = lib.platforms.darwin; # hard replicable building error
   };
 })

From 800e1a3129201658cc6a49a0d3520b78b674130b Mon Sep 17 00:00:00 2001
From: GueLaKais <koroyeldiores@gmail.com>
Date: Thu, 4 Dec 2025 09:37:08 +0100
Subject: [PATCH 2/2] gz-utils: 3.1.1 -> 4.0.0

---
 pkgs/by-name/gz/gz-utils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gz/gz-utils/package.nix b/pkgs/by-name/gz/gz-utils/package.nix
index c41ec4ef71d7..6ce8d479f672 100644
--- a/pkgs/by-name/gz/gz-utils/package.nix
+++ b/pkgs/by-name/gz/gz-utils/package.nix
@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "gz-utils";
-  version = "3.1.1";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "gazebosim";
     repo = "gz-utils";
     tag = "gz-utils${lib.versions.major finalAttrs.version}_${finalAttrs.version}";
-    hash = "sha256-fYzysdB608jfMb/EbqiGD4hXmPxcaVTUrt9Wx0dBlto=";
+    hash = "sha256-fZonC/o5CNHdK/R3IgEoo1llehy36MwvXPQCgFnP8Ls=";
   };
 
   outputs = [