{libqalculate,qalculate-gtk,qalculate-qt}: 5.4.0 -> 5.5.0 (#373519)

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 = [

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" ];

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 ''

pkgs/top-level/all-packages.nix

@@ -4858,8 +4858,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 { } ;