From 7f92acd21570e0ba4558e88d782dffb2d53f30b8 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 1 Sep 2025 12:41:49 +0800
Subject: [PATCH 1/3] tytools: 0.9.8 -> 0.9.9

---
 pkgs/development/embedded/tytools/default.nix | 42 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index 14fcec5ac5ea..8f459c038c2a 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -2,32 +2,50 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  cmake,
-  pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  installShellFiles,
+  qt6,
 }:
 
 stdenv.mkDerivation rec {
   pname = "tytools";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "Koromix";
-    repo = "tytools";
-    rev = "v${version}";
-    sha256 = "sha256-MKhh0ooDZI1Ks8vVuPRiHhpOqStetGaAhE2ulvBstxA=";
+    repo = "rygel";
+    tag = "tytools/${version}";
+    hash = "sha256-nQZaNYOTkx79UC0RHencKIQFSYUnQ9resdmmWTmgQxA=";
   };
 
   nativeBuildInputs = [
-    cmake
-    pkg-config
-    wrapQtAppsHook
+    installShellFiles
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    qt6.qtbase
   ];
 
+  buildPhase = ''
+    runHook preBuild
+
+    ./bootstrap.sh
+    ./felix -pFast tycmd tycommander tyuploader
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    installBin bin/Fast/tycmd bin/Fast/tycommander bin/Fast/tyuploader
+    install -D --mode 0644 src/tytools/tycommander/tycommander_linux.desktop $out/share/applications/tycommander.desktop
+    install -D --mode 0644 src/tytools/tyuploader/tyuploader_linux.desktop $out/share/applications/tyuploader.desktop
+    install -D --mode 0644 src/tytools/assets/images/tycommander.png $out/share/icons/hicolor/512x512/apps/tycommander.png
+    install -D --mode 0644 src/tytools/assets/images/tyuploader.png $out/share/icons/hicolor/512x512/apps/tyuploader.png
+
+    runHook postInstall
+  '';
+
   meta = with lib; {
     description = "Collection of tools to manage Teensy boards";
     homepage = "https://koromix.dev/tytools";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7929573bb49d..879cdff644f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6935,7 +6935,7 @@ with pkgs;
     withTeensyduino = true;
   };
 
-  tytools = libsForQt5.callPackage ../development/embedded/tytools { };
+  tytools = callPackage ../development/embedded/tytools { };
 
   texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
   inherit (texinfoPackages)

From 0b9d155f2b79b6486166189707f8f06b51c792ce Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 1 Sep 2025 13:21:51 +0800
Subject: [PATCH 2/3] tytools: use finalAttrs

---
 pkgs/development/embedded/tytools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index 8f459c038c2a..cbc30ece670c 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -6,14 +6,14 @@
   qt6,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tytools";
   version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "Koromix";
     repo = "rygel";
-    tag = "tytools/${version}";
+    tag = "tytools/${finalAttrs.version}";
     hash = "sha256-nQZaNYOTkx79UC0RHencKIQFSYUnQ9resdmmWTmgQxA=";
   };
 
@@ -53,4 +53,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ ahuzik ];
   };
-}
+})

From 519811a3ca78659c49955b9053a3c990dc59e37a Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 1 Sep 2025 13:22:55 +0800
Subject: [PATCH 3/3] tytools: remove with lib

---
 pkgs/development/embedded/tytools/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index cbc30ece670c..b69880f20822 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -46,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Collection of tools to manage Teensy boards";
     homepage = "https://koromix.dev/tytools";
-    license = licenses.unlicense;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ahuzik ];
+    license = lib.licenses.unlicense;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ahuzik ];
   };
 })