about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2024-03-13 07:46:45 +0200
committerGitHub <noreply@github.com>2024-03-13 07:46:45 +0200
commit39160e127b7c85f7d19f80c73a2329d6885cd06d (patch)
treeb03c64a2616c6a6b0654af6ce8d33bf772be19b8
parent9c94126ca4940e69e9c57ac567da5ce96b3059c7 (diff)
parentaab285e925744742efdc3584300384ab38c82bda (diff)
downloadnixlib-39160e127b7c85f7d19f80c73a2329d6885cd06d.tar
nixlib-39160e127b7c85f7d19f80c73a2329d6885cd06d.tar.gz
nixlib-39160e127b7c85f7d19f80c73a2329d6885cd06d.tar.bz2
nixlib-39160e127b7c85f7d19f80c73a2329d6885cd06d.tar.lz
nixlib-39160e127b7c85f7d19f80c73a2329d6885cd06d.tar.xz
nixlib-39160e127b7c85f7d19f80c73a2329d6885cd06d.tar.zst
nixlib-39160e127b7c85f7d19f80c73a2329d6885cd06d.zip
Merge pull request #295063 from r-ryantm/auto-update/libqalculate
{qalculate-{qt,gtk},libqalculate}: 4.9.0 -> 5.0.0, 
-rw-r--r--pkgs/applications/kde/cantor.nix3
-rw-r--r--pkgs/applications/science/math/qalculate-gtk/default.nix4
-rw-r--r--pkgs/applications/science/math/qalculate-qt/default.nix4
-rw-r--r--pkgs/development/libraries/libqalculate/default.nix4
4 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix
index 0acfa430eaa7..1805ed8a5234 100644
--- a/pkgs/applications/kde/cantor.nix
+++ b/pkgs/applications/kde/cantor.nix
@@ -95,6 +95,9 @@ mkDerivation {
     "--prefix PATH : ${placeholder "out"}/bin"
   ] ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin";
 
+  # Causes failures on Hydra and ofborg from some reason
+  enableParallelBuilding = false;
+
   meta = with lib; {
     description = "Front end to powerful mathematics and statistics packages";
     homepage = "https://cantor.kde.org/";
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 0c859fd95bea..2a2b4617d24b 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-gtk";
-  version = "4.9.0";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss=";
+    hash = "sha256-hlGNL7aMzxBxtATWJBqJTFEQqMv10oC3sRCdtRLHOww=";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix
index 9932c7c2dcd9..296fc5f783f3 100644
--- a/pkgs/applications/science/math/qalculate-qt/default.nix
+++ b/pkgs/applications/science/math/qalculate-qt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "4.9.0";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ac8RRxLheaenlR7JqKzfBpPxsq7PHfE9qXFf3Vx4GSg=";
+    hash = "sha256-X7IY2yXpZiyE+T2dl0G4tWpJ5O6MVCy/sOY3v9inma0=";
   };
 
   nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 84623e7459fc..34e34a7eeebf 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqalculate";
-  version = "4.9.0";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E=";
+    hash = "sha256-VhaGgtSU6+7eMY7ksQMpybmt2JBI80Nwgu7PCKrTorA=";
   };
 
   outputs = [ "out" "dev" "doc" ];