JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #78511 from r-ryantm/auto-update/libqalculate

Browse Source 
libqalculate: 3.6.0 -> 3.7.0
This commit is contained in:
Gabriel Ebner 2020-01-26 18:47:18 +01:00 committed by GitHub
commit 3809627321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
version = "3.6.0";
version = "3.7.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
sha256 = "1b20sjkv853lqii0dpqg10rgcka3cs57zriihyd463n7dq3hsim5";
sha256 = "1zzvxkpman75lxhhvyggwzvrlc6v0rd5ak76rmcny51i4xirmrc0";
};
patchPhase = ''

6
pkgs/development/libraries/libqalculate/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libqalculate";
version = "3.6.0";
version = "3.7.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
sha256 = "0qfdgxb46c18cp43z67n986xhj6x0sa95hryq42spf1p5ymbylqy";
sha256 = "0g3047lwd0rh0dds196iija3kq06mhkh6y8x5whcbv3s0db66h18";
};
outputs = [ "out" "dev" "doc" ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
'';
patchPhase = ''
substituteInPlace libqalculate/Calculator.cc \
substituteInPlace libqalculate/Calculator-plot.cc \
--replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
--replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
'' + stdenv.lib.optionalString stdenv.cc.isClang ''