From 1d95eeb1727651967cf1d89a5647ed952444b256 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 11 Oct 2024 22:23:35 +0200
Subject: [PATCH 1/3] welle-io: 2.4 -> 2.5

---
 pkgs/applications/radio/welle-io/default.nix | 16 +++++++---------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index 39ebfe888639..5917aed42a8f 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -1,20 +1,20 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
-, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config,wrapQtAppsHook
+, qtbase, qtcharts, qtmultimedia, qtdeclarative, qt5compat
 , faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123
 } :
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "welle-io";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "AlbrechtL";
     repo = "welle.io";
     rev = "v${version}";
-    sha256 = "sha256-xXiCL/A2SwCSr5SA4AQQEdieRzBksXx9Z78bHtlFiW4=";
+    hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
 
   buildInputs = [
     faad2
@@ -25,9 +25,7 @@ mkDerivation rec {
     qtbase
     qtcharts
     qtmultimedia
-    qtquickcontrols
-    qtquickcontrols2
-    qtgraphicaleffects
+    qt5compat
     rtl-sdr
     soapysdr-with-plugins
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b8d0bc391fe..c2fecb031a1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29395,7 +29395,7 @@ with pkgs;
 
   wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { };
 
-  welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };
+  welle-io = qt6Packages.callPackage ../applications/radio/welle-io { };
 
   wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
     inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration;

From c307ae10cab54de454256a88169ee32e09685e8b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 11 Oct 2024 23:41:11 +0200
Subject: [PATCH 2/3] welle-io: apply nixfmt

---
 pkgs/applications/radio/welle-io/default.nix | 43 ++++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index 5917aed42a8f..b2b2bd86434f 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -1,7 +1,23 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkg-config,wrapQtAppsHook
-, qtbase, qtcharts, qtmultimedia, qtdeclarative, qt5compat
-, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123
-} :
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  qtbase,
+  qtcharts,
+  qtmultimedia,
+  qtdeclarative,
+  qt5compat,
+  faad2,
+  rtl-sdr,
+  soapysdr-with-plugins,
+  libusb-compat-0_1,
+  fftwSinglePrec,
+  lame,
+  mpg123,
+}:
 
 stdenv.mkDerivation rec {
   pname = "welle-io";
@@ -14,7 +30,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
+  ];
 
   buildInputs = [
     faad2
@@ -31,14 +51,21 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DRTLSDR=true" "-DSOAPYSDR=true"
+    "-DRTLSDR=true"
+    "-DSOAPYSDR=true"
   ];
 
   meta = with lib; {
     description = "DAB/DAB+ Software Radio";
     homepage = "https://www.welle.io/";
-    maintainers = with maintainers; [ ck3d markuskowa ];
+    maintainers = with maintainers; [
+      ck3d
+      markuskowa
+    ];
     license = licenses.gpl2Only;
-    platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin;
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ] ++ platforms.darwin;
   };
 }

From aa15d45adf57d41ce3727e8e7088525188f04e7a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 11 Oct 2024 23:44:20 +0200
Subject: [PATCH 3/3] welle-io: remove nested "with lib" in meta.

---
 pkgs/applications/radio/welle-io/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index b2b2bd86434f..5a4ce6a9bca1 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -55,17 +55,17 @@ stdenv.mkDerivation rec {
     "-DSOAPYSDR=true"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "DAB/DAB+ Software Radio";
     homepage = "https://www.welle.io/";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       ck3d
       markuskowa
     ];
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     platforms = [
       "x86_64-linux"
       "i686-linux"
-    ] ++ platforms.darwin;
+    ] ++ lib.platforms.darwin;
   };
 }