git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #95998 from gebner/qalc3121
commit8518de5fe3609437d2f67bd9c61e24234714f28b authorGabriel Ebner <gebner@gebner.org> dateSat 22 Aug 2020, 17:27 (6 years ago) parentd686e30294cd72
2 files changed+6−5
pkgs/applications/science/math/qalculate-gtk/default.nix+4−3 pkgs/development/libraries/libqalculate/default.nix+2−2
pkgs/applications/science/math/qalculate-gtk/default.nix+4−3
@@ -2,17 +2,18 @@
22
33stdenv.mkDerivation rec {
44 pname = "qalculate-gtk";
5− version = "3.8.0a";
5+ version = "3.12.1";
66
77 src = fetchFromGitHub {
88 owner = "qalculate";
99 repo = "qalculate-gtk";
1010 rev = "v${version}";
11− sha256 = "0bjd61bbc5b2i09kz3ss01c0xmxrhmiv5wpbhhplkp3yhw2qrf3m";
11+ sha256 = "0ylsxj9rn3dc1grn9w6jisci3ak0hxgbwzqp54azs3aj5cmvkfgg";
1212 };
1313
1414 patchPhase = ''
15− substituteInPlace src/main.cc --replace 'getPackageDataDir().c_str()' \"$out/share\"
15+ # https://github.com/Qalculate/qalculate-gtk/pull/178
16+ substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0'
1617 '';
1718
1819 hardeningDisable = [ "format" ];
pkgs/development/libraries/libqalculate/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "libqalculate";
6− version = "3.8.0";
6+ version = "3.12.1";
77
88 src = fetchFromGitHub {
99 owner = "qalculate";
1010 repo = "libqalculate";
1111 rev = "v${version}";
12− sha256 = "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df";
12+ sha256 = "0g3ipl6ynhclmwny54zgdh721v0fs9dzj6j7r8dz91s86jva3chb";
1313 };
1414
1515 outputs = [ "out" "dev" "doc" ];