From 517ecd6bed313b35e36fd1b8dc9c074dec375f0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 02:00:26 +0000
Subject: [PATCH 1/3] savvycan: 213 -> 220

---
 pkgs/applications/networking/sniffers/savvycan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/savvycan/default.nix b/pkgs/applications/networking/sniffers/savvycan/default.nix
index 195412111d0e..d30ddc8907b4 100644
--- a/pkgs/applications/networking/sniffers/savvycan/default.nix
+++ b/pkgs/applications/networking/sniffers/savvycan/default.nix
@@ -14,13 +14,13 @@
 stdenv.mkDerivation rec {
 
   pname = "savvycan";
-  version = "213";
+  version = "220";
 
   src = fetchFromGitHub {
     owner = "collin80";
     repo = "SavvyCAN";
     rev = "V${version}";
-    hash = "sha256-duITY6s/uadeBCFuG42JbLCaq7yaYv1qB8Q3GA8UJ0A=";
+    hash = "sha256-Du6Pc0JePdJNwBaWKKjTMWOmKCnk6Azojh8IJ7I+ngY=";
   };
 
   buildInputs = [

From 6828aea0537cc33948e44e03551d01849efa8b0d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 10 May 2025 23:07:42 +0400
Subject: [PATCH 2/3] savvycan: migrate to by-name

---
 .../sa/savvycan/package.nix}                  | 24 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 8 insertions(+), 18 deletions(-)
 rename pkgs/{applications/networking/sniffers/savvycan/default.nix => by-name/sa/savvycan/package.nix} (91%)

diff --git a/pkgs/applications/networking/sniffers/savvycan/default.nix b/pkgs/by-name/sa/savvycan/package.nix
similarity index 91%
rename from pkgs/applications/networking/sniffers/savvycan/default.nix
rename to pkgs/by-name/sa/savvycan/package.nix
index d30ddc8907b4..34f7d95d92e5 100644
--- a/pkgs/applications/networking/sniffers/savvycan/default.nix
+++ b/pkgs/by-name/sa/savvycan/package.nix
@@ -2,17 +2,10 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qtbase,
-  qttools,
-  qmake,
-  qtserialbus,
-  qtserialport,
-  qtdeclarative,
-  wrapQtAppsHook,
+  qt5,
 }:
 
 stdenv.mkDerivation rec {
-
   pname = "savvycan";
   version = "220";
 
@@ -24,16 +17,16 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qtbase
-    qttools
-    qtserialbus
-    qtserialport
-    qtdeclarative
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtserialbus
+    qt5.qtserialport
+    qt5.qtdeclarative
   ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   meta = with lib; {
@@ -70,5 +63,4 @@ stdenv.mkDerivation rec {
         it!
     '';
   };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aada23abf900..f7f94a27569e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13987,8 +13987,6 @@ with pkgs;
 
   rusty-psn-gui = rusty-psn.override { withGui = true; };
 
-  savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan { };
-
   sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
 
   scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { };

From 99b679d4b41b5a11e7553b44bb011bb7d34f4e37 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 10 May 2025 23:25:26 +0400
Subject: [PATCH 3/3] savvycan: fix installation on darwin

---
 pkgs/by-name/sa/savvycan/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/sa/savvycan/package.nix b/pkgs/by-name/sa/savvycan/package.nix
index 34f7d95d92e5..210bf16bbbed 100644
--- a/pkgs/by-name/sa/savvycan/package.nix
+++ b/pkgs/by-name/sa/savvycan/package.nix
@@ -29,6 +29,12 @@ stdenv.mkDerivation rec {
     qt5.wrapQtAppsHook
   ];
 
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    mv $out/bin/SavvyCAN.app $out/Applications
+    ln -s $out/Applications/SavvyCAN.app/Contents/MacOS/SavvyCAN $out/bin/SavvyCAN
+  '';
+
   meta = with lib; {
     description = "QT based cross platform canbus tool";
     homepage = "https://savvycan.com/";