From 7512018a46a9f4fe7dd6cfcf8db2e3f7d1488ca6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Apr 2025 19:39:43 +0000
Subject: [PATCH 1/3] hobbits: 0.54.1 -> 0.55.0

---
 pkgs/tools/graphics/hobbits/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/tools/graphics/hobbits/default.nix
index 6a429f9e7065..8ffbf9a6084e 100644
--- a/pkgs/tools/graphics/hobbits/default.nix
+++ b/pkgs/tools/graphics/hobbits/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hobbits";
-  version = "0.54.1";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "Mahlet-Inc";
     repo = "hobbits";
     rev = "v${version}";
-    hash = "sha256-SbSuw5e2ll/wU5UBV0MOlvCXb4rvPtsE4l8XzRbBiLI=";
+    hash = "sha256-W6QBLj+GkmM88cOVSIc1PLiVXysjv74J7citFW6SRDM=";
   };
 
   postPatch = ''

From 640b6763555a1211a7775eedf4e2a2891f5d9c61 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 17 Apr 2025 00:27:56 +0400
Subject: [PATCH 2/3] hobbits: modernize

---
 pkgs/tools/graphics/hobbits/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/tools/graphics/hobbits/default.nix
index 8ffbf9a6084e..46b72e5b92d5 100644
--- a/pkgs/tools/graphics/hobbits/default.nix
+++ b/pkgs/tools/graphics/hobbits/default.nix
@@ -12,22 +12,22 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hobbits";
   version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "Mahlet-Inc";
     repo = "hobbits";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-W6QBLj+GkmM88cOVSIc1PLiVXysjv74J7citFW6SRDM=";
   };
 
   postPatch = ''
     substituteInPlace src/hobbits-core/settingsdata.cpp \
-      --replace "pythonHome = \"/usr\"" "pythonHome = \"${python3}\""
+      --replace-warn "pythonHome = \"/usr\"" "pythonHome = \"${python3}\""
     substituteInPlace cmake/gitversion.cmake \
-      --replace "[Mystery Build]" "${version}"
+      --replace-warn "[Mystery Build]" "${finalAttrs.version}"
   '';
 
   buildInputs = [
@@ -43,15 +43,15 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  cmakeFlags = [ "-DUSE_SYSTEM_PFFFT=ON" ];
+  cmakeFlags = [ (lib.cmakeBool "USE_SYSTEM_PFFFT" true) ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing";
 
-  meta = with lib; {
+  meta = {
     description = "Multi-platform GUI for bit-based analysis, processing, and visualization";
     homepage = "https://github.com/Mahlet-Inc/hobbits";
-    license = licenses.mit;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 6bc52f475d8a0f6a607245a39bea8f18aaca55d7 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 17 Apr 2025 00:47:53 +0400
Subject: [PATCH 3/3] hobbits: migrate to by-name

---
 .../hobbits/default.nix => by-name/ho/hobbits/package.nix}   | 5 ++---
 pkgs/top-level/all-packages.nix                              | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)
 rename pkgs/{tools/graphics/hobbits/default.nix => by-name/ho/hobbits/package.nix} (95%)

diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/by-name/ho/hobbits/package.nix
similarity index 95%
rename from pkgs/tools/graphics/hobbits/default.nix
rename to pkgs/by-name/ho/hobbits/package.nix
index 46b72e5b92d5..40afc2fbbadc 100644
--- a/pkgs/tools/graphics/hobbits/default.nix
+++ b/pkgs/by-name/ho/hobbits/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -9,7 +8,7 @@
   libpcap,
   libusb1,
   python3,
-  wrapQtAppsHook,
+  qt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [ (lib.cmakeBool "USE_SYSTEM_PFFFT" true) ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74de04a60503..edb35316c35e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3810,8 +3810,6 @@ with pkgs;
     buildGoModule = buildGo123Module;
   };
 
-  hobbits = libsForQt5.callPackage ../tools/graphics/hobbits { };
-
   highlight = callPackage ../tools/text/highlight {
     lua = lua5;
   };