From 64e7ca4eebccc2b965810a63518c7a8a8d2d95b9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 17:09:52 +0200 Subject: [PATCH 1/2] libqalculate: 3.8.0 -> 3.12.1 --- 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 8acfcb4b751..5c520e1c9dd 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.8.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df"; + sha256 = "0g3ipl6ynhclmwny54zgdh721v0fs9dzj6j7r8dz91s86jva3chb"; }; outputs = [ "out" "dev" "doc" ]; From 294cd72be3023f4da3d0f6b8f482a060926d8e1e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 17:10:03 +0200 Subject: [PATCH 2/2] qalculate-gtk: 3.8.0a -> 3.12.1 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 213530b60a9..c3976d5601a 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.8.0a"; + version = "3.12.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0bjd61bbc5b2i09kz3ss01c0xmxrhmiv5wpbhhplkp3yhw2qrf3m"; + sha256 = "0ylsxj9rn3dc1grn9w6jisci3ak0hxgbwzqp54azs3aj5cmvkfgg"; }; patchPhase = '' - substituteInPlace src/main.cc --replace 'getPackageDataDir().c_str()' \"$out/share\" + # https://github.com/Qalculate/qalculate-gtk/pull/178 + substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0' ''; hardeningDisable = [ "format" ];