From 721e14e957e2978843327f14d6556e59b134c25d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Apr 2025 13:16:09 +0000
Subject: [PATCH 1/3] qlog: 0.43.0 -> 0.43.1

---
 pkgs/applications/radio/qlog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix
index 309ca8bf0f6a..d14fdbed752c 100644
--- a/pkgs/applications/radio/qlog/default.nix
+++ b/pkgs/applications/radio/qlog/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qlog";
-  version = "0.43.0";
+  version = "0.43.1";
 
   src = fetchFromGitHub {
     owner = "foldynl";
     repo = "QLog";
     rev = "v${version}";
-    hash = "sha256-gCXLZ00klyjisLxSvs4wKD0Sg8CFvF0xR+eHpc1D0Jc=";
+    hash = "sha256-D3WtvSHDauo/9py9To2Kn+20vrSvgw+b1+H0inNnRJI=";
     fetchSubmodules = true;
   };
 

From 099fd91a385d8e39f2321222abdcedd1c27fb7ed Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 19 Apr 2025 18:56:19 +0400
Subject: [PATCH 2/3] qlog: migrate to by-name

---
 .../ql/qlog/package.nix}                      | 40 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 17 insertions(+), 25 deletions(-)
 rename pkgs/{applications/radio/qlog/default.nix => by-name/ql/qlog/package.nix} (62%)

diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/by-name/ql/qlog/package.nix
similarity index 62%
rename from pkgs/applications/radio/qlog/default.nix
rename to pkgs/by-name/ql/qlog/package.nix
index d14fdbed752c..8d64864c4841 100644
--- a/pkgs/applications/radio/qlog/default.nix
+++ b/pkgs/by-name/ql/qlog/package.nix
@@ -1,18 +1,12 @@
 {
   fetchFromGitHub,
-  qtbase,
   stdenv,
   lib,
-  wrapQtAppsHook,
-  qmake,
-  qtcharts,
-  qtwebengine,
-  qtserialport,
-  qtwebchannel,
-  hamlib,
-  qtkeychain,
-  pkg-config,
   cups,
+  hamlib,
+  pkg-config,
+  qt6,
+  qt6Packages,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "foldynl";
     repo = "QLog";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-D3WtvSHDauo/9py9To2Kn+20vrSvgw+b1+H0inNnRJI=";
     fetchSubmodules = true;
   };
@@ -31,33 +25,33 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [
-      qtbase
-      qtcharts
-      qtwebengine
-      qtserialport
-      qtwebchannel
       hamlib
-      qtkeychain
+      qt6.qtbase
+      qt6.qtcharts
+      qt6.qtserialport
+      qt6.qtwebchannel
+      qt6.qtwebengine
+      qt6Packages.qtkeychain
     ]
     ++ (lib.optionals stdenv.hostPlatform.isDarwin [
       cups
     ]);
 
   nativeBuildInputs = [
-    wrapQtAppsHook
-    qmake
     pkg-config
+    qt6.qmake
+    qt6.wrapQtAppsHook
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Amateur radio logbook software";
     mainProgram = "qlog";
-    license = with licenses; [ gpl3Only ];
+    license = with lib.licenses; [ gpl3Only ];
     homepage = "https://github.com/foldynl/QLog";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       oliver-koss
       mkg20001
     ];
-    platforms = with platforms; unix;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f437d305aa12..bc7f16478daa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4975,8 +4975,6 @@ with pkgs;
 
   qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
 
-  qlog = qt6Packages.callPackage ../applications/radio/qlog { };
-
   quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { };
 
   qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { };

From 1067399806ae2d37c0e26482f17f2e6011e326c5 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 20 Apr 2025 20:13:22 +0400
Subject: [PATCH 3/3] qlog: fix installation on darwin

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

diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix
index 8d64864c4841..b6aef313ad21 100644
--- a/pkgs/by-name/ql/qlog/package.nix
+++ b/pkgs/by-name/ql/qlog/package.nix
@@ -43,6 +43,12 @@ stdenv.mkDerivation rec {
     qt6.wrapQtAppsHook
   ];
 
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv $out/{qlog.app,Applications}
+    ln -s $out/Applications/qlog.app/Contents/MacOS/qlog $out/bin/qlog
+  '';
+
   meta = {
     description = "Amateur radio logbook software";
     mainProgram = "qlog";