From b807f0c6592920e452d1f04da5a11e8f36e9cb89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 16:43:41 +0000 Subject: [PATCH 1/4] libqalculate: 4.9.0 -> 5.0.0 --- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" ]; From b668267edd79e47f1a8d4140dc2c1f55fdb76fbf Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 12 Mar 2024 08:14:21 +0200 Subject: [PATCH 2/4] qalculate-gtk: 4.9.0 -> 5.0.0 Diff: https://github.com/qalculate/qalculate-gtk/compare/v4.9.0...v5.0.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" ]; From 4a414671ac1102554b10b6bab511e89ca6cc5dff Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 12 Mar 2024 08:14:29 +0200 Subject: [PATCH 3/4] qalculate-qt: 4.9.0 -> 5.0.0 Diff: https://github.com/qalculate/qalculate-qt/compare/v4.9.0...v5.0.0 --- pkgs/applications/science/math/qalculate-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From aab285e925744742efdc3584300384ab38c82bda Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 12 Mar 2024 17:01:18 +0200 Subject: [PATCH 4/4] cantor: fix build on Hydra by avoiding parallel building --- pkgs/applications/kde/cantor.nix | 3 +++ 1 file changed, 3 insertions(+) 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/";