From 45e1048834cd1d8974e3fec4a09a329bd9f0a592 Mon Sep 17 00:00:00 2001
From: thomaslepoix <thomas.lepoix@protonmail.ch>
Date: Sun, 13 Oct 2024 20:01:22 +0200
Subject: [PATCH 1/3] maintainers: add thomaslepoix

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a0df938571f1..af25756413b4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21406,6 +21406,12 @@
     githubId = 1634990;
     name = "Tom McLaughlin";
   };
+  thomaslepoix = {
+    email = "thomas.lepoix@protonmail.ch";
+    github = "thomaslepoix";
+    githubId = 26417323;
+    name = "Thomas Lepoix";
+  };
   ThomasMader = {
     email = "thomas.mader@gmail.com";
     github = "ThomasMader";

From 833cac9d901994c5edc15f9992e6af5fa4404589 Mon Sep 17 00:00:00 2001
From: thomaslepoix <thomas.lepoix@protonmail.ch>
Date: Sun, 13 Oct 2024 23:06:36 +0200
Subject: [PATCH 2/3] qucsator-rf: init at 1.0.3

---
 pkgs/by-name/qu/qucsator-rf/package.nix | 48 +++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pkgs/by-name/qu/qucsator-rf/package.nix

diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix
new file mode 100644
index 000000000000..3667d84b280f
--- /dev/null
+++ b/pkgs/by-name/qu/qucsator-rf/package.nix
@@ -0,0 +1,48 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  bison,
+  flex,
+  dos2unix,
+  gperf,
+  adms,
+  withAdms ? false,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "qucsator-rf";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    owner = "ra3xdh";
+    repo = "qucsator_rf";
+    rev = version;
+    hash = "sha256-IvB4CTvK6x4wwUXMoXIqBku1Hh9em6ITTpwFllYsTEg=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    flex
+    bison
+    gperf
+    dos2unix
+  ];
+
+  buildInputs = lib.optionals withAdms [ adms ];
+
+  cmakeFlags = [
+    "-DBISON_DIR=${bison}/bin"
+    (lib.cmakeBool "WITH_ADMS" withAdms)
+  ];
+
+  meta = {
+    description = "RF circuit simulation kernel for Qucs-S";
+    homepage = "https://github.com/ra3xdh/qucsator_rf";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "qucsator_rf";
+    maintainers = with lib.maintainers; [ thomaslepoix ];
+    platforms = lib.platforms.linux;
+  };
+}

From f9593a4851490ff669a41ae6f647c2653a25bb83 Mon Sep 17 00:00:00 2001
From: thomaslepoix <thomas.lepoix@protonmail.ch>
Date: Wed, 11 Dec 2024 03:56:10 +0100
Subject: [PATCH 3/3] qucs-s: 24.1.0 -> 24.4.1

---
 .../science/electronics/qucs-s/default.nix      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix
index 4117638a1fda..3fd4273fd49a 100644
--- a/pkgs/applications/science/electronics/qucs-s/default.nix
+++ b/pkgs/applications/science/electronics/qucs-s/default.nix
@@ -4,6 +4,7 @@
 , flex
 , bison
 , qtbase
+, qtcharts
 , qttools
 , qtsvg
 , qtwayland
@@ -13,22 +14,27 @@
 , gperf
 , adms
 , ngspice
-, kernels ? [ ngspice ]
+, qucsator-rf
+, kernels ? [ ngspice qucsator-rf ]
 }:
 
 stdenv.mkDerivation rec {
   pname = "qucs-s";
-  version = "24.1.0";
+  version = "24.4.1";
 
   src = fetchFromGitHub {
     owner = "ra3xdh";
     repo = "qucs_s";
     rev = version;
-    sha256 = "sha256-ei9CPlJg+Kfjh7vu5VnT6DNLmmnA8wZ2A1jXnm//Fgo=";
+    hash = "sha256-ll5P8cqJBzoieExElggn5tRbDcmH7L3yvcbtAQ0BBww=";
   };
 
   nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ];
-  buildInputs = [ qtbase qttools qtsvg qtwayland libX11 gperf adms ] ++ kernels;
+  buildInputs = [ qtbase qttools qtcharts qtsvg qtwayland libX11 gperf adms ] ++ kernels;
+
+  cmakeFlags = [
+    "-DWITH_QT6=ON"
+  ];
 
   # Make custom kernels avaible from qucs-s
   qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath kernels) ];
@@ -48,7 +54,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://ra3xdh.github.io/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ mazurel kashw2 ];
+    mainProgram = "qucs-s";
+    maintainers = with maintainers; [ mazurel kashw2 thomaslepoix ];
     platforms = with platforms; linux;
   };
 }