From ad0c23019c380694edc9a3418d65d874e021aa6f Mon Sep 17 00:00:00 2001
From: cyclopentane <cyclopentane@aidoskyneen.eu>
Date: Mon, 13 Jan 2025 19:27:04 +0100
Subject: [PATCH] {libqalculate,qalculate-gtk,qalculate-qt}: 5.4.0 -> 5.5.0

---
 pkgs/by-name/li/libqalculate/package.nix      |  4 +--
 pkgs/by-name/qa/qalculate-gtk/package.nix     |  4 +--
 .../qa/qalculate-qt/package.nix}              | 28 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 17 insertions(+), 21 deletions(-)
 rename pkgs/{applications/science/math/qalculate-qt/default.nix => by-name/qa/qalculate-qt/package.nix} (72%)

diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix
index 81f3d993f852..d4f2af8e42e9 100644
--- a/pkgs/by-name/li/libqalculate/package.nix
+++ b/pkgs/by-name/li/libqalculate/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqalculate";
-  version = "5.4.0.1";
+  version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cx0pl3OEA/dANcGW3obvEnAiR06IcZedyCACwibNThg=";
+    hash = "sha256-lyewx2dc8EywDvLnOkbrys5ObMR7BkEppN/cpWHPBbg=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
index c1ee7e570322..536607034185 100644
--- a/pkgs/by-name/qa/qalculate-gtk/package.nix
+++ b/pkgs/by-name/qa/qalculate-gtk/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-gtk";
-  version = "5.4.0";
+  version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YZfjZxuYnpmIh9dKk1ggLgwww6gCP9F0MnY8BBOWiB0=";
+    hash = "sha256-9/fj+dwnEpbfcqBDQowhU4ltr/h43NQYTMUQnLL4Ut8=";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
similarity index 72%
rename from pkgs/applications/science/math/qalculate-qt/default.nix
rename to pkgs/by-name/qa/qalculate-qt/package.nix
index 2f6992de6927..8f34bd7ec63d 100644
--- a/pkgs/applications/science/math/qalculate-qt/default.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -4,42 +4,40 @@
   fetchFromGitHub,
   intltool,
   pkg-config,
-  qmake,
-  wrapQtAppsHook,
+  qt6,
   libqalculate,
-  qtbase,
-  qttools,
-  qtsvg,
-  qtwayland,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "5.4.0";
+  version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Tpb/ZN5p3JfPug9NpBHguOi6Okek+g87orD4ISkV+ac=";
+    hash = "sha256-IfdD3Nk+feLnILgEpccjEBlWfcW8ps7U+V7pTRG3LwM=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with qt6; [
     qmake
     intltool
     pkg-config
     qttools
     wrapQtAppsHook
   ];
-  buildInputs = [
-    libqalculate
-    qtbase
-    qtsvg
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
+  buildInputs =
+    with qt6;
+    [
+      libqalculate
+      qtbase
+      qtsvg
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
 
   postPatch = ''
     substituteInPlace qalculate-qt.pro\
-      --replace "LRELEASE" "${qttools.dev}/bin/lrelease"
+      --replace "LRELEASE" "${qt6.qttools.dev}/bin/lrelease"
   '';
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 770d6c409fab..9941a572ba30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4869,8 +4869,6 @@ with pkgs;
 
   quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { };
 
-  qalculate-qt = qt6Packages.callPackage ../applications/science/math/qalculate-qt { };
-
   qastools = libsForQt5.callPackage ../tools/audio/qastools { };
 
   qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ;