From 424872f4a1c91a741d86ac9a9f80ccf9e15e61d8 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:04:52 +0530
Subject: [PATCH 1/3] gummy: move to by-name

---
 .../misc/gummy/default.nix => by-name/gu/gummy/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/gummy/default.nix => by-name/gu/gummy/package.nix} (100%)

diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/by-name/gu/gummy/package.nix
similarity index 100%
rename from pkgs/tools/misc/gummy/default.nix
rename to pkgs/by-name/gu/gummy/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7f8ed8d05a5..8d6e48cad8e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37081,8 +37081,6 @@ with pkgs;
 
   gummi = callPackage ../applications/misc/gummi { };
 
-  gummy = callPackage ../tools/misc/gummy { };
-
   hashpump = callPackage ../tools/misc/hashpump { };
 
   hck = callPackage ../tools/text/hck { };

From fc5b713c20aa29309f55c491a0a761303b7358e7 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:09:05 +0530
Subject: [PATCH 2/3] gummy: add update script, use cmakeFeature

---
 pkgs/by-name/gu/gummy/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix
index 628d5e9e7d16..7761ece19897 100644
--- a/pkgs/by-name/gu/gummy/package.nix
+++ b/pkgs/by-name/gu/gummy/package.nix
@@ -14,6 +14,7 @@
 , fmt
 , nlohmann_json
 , spdlog
+, nix-update-script
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -46,8 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DUDEV_DIR=${placeholder "out"}/lib/udev"
-    "-DUDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d"
+    (lib.mapAttrsToList lib.cmakeFeature {
+      "UDEV_DIR" = "${placeholder "out"}/lib/udev";
+      "UDEV_RULES_DIR" = "${placeholder "out"}/lib/udev/rules.d";
+    })
   ];
 
   # Fixes the "gummy start" command, without this it cannot find the binary.
@@ -65,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+  passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
     homepage = "https://codeberg.org/fusco/gummy";

From 2bbb02137226b75e81658c584513993f17f88e1c Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:40:36 +0000
Subject: [PATCH 3/3] gummy: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix
index 7761ece19897..2b34d02d5b0a 100644
--- a/pkgs/by-name/gu/gummy/package.nix
+++ b/pkgs/by-name/gu/gummy/package.nix
@@ -19,14 +19,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gummy";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "fusco";
     repo = "gummy";
     rev = finalAttrs.version;
-    hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE=";
+    hash = "sha256-ic+kTBoirMX6g79NdNoeFbNNo1LYg/z+nlt/GAB6UyQ=";
   };
 
   nativeBuildInputs = [