Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c2be816ca8b9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 380962732179
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 26, 2020

  1. libqalculate: 3.6.0 -> 3.7.0

    @r-ryantm @gebner
    r-ryantm authored and gebner committed Jan 26, 2020
    Copy the full SHA
    0fee572 View commit details

  2. qalculate-gtk: 3.6.0 -> 3.7.0

    @gebner
    gebner committed Jan 26, 2020
    Copy the full SHA
    8161fe2 View commit details

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

    libqalculate: 3.6.0 -> 3.7.0
    @gebner
    gebner authored Jan 26, 2020
    Copy the full SHA
    3809627 View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/applications/science/math/qalculate-gtk/default.nix
  2. +3 −3 pkgs/development/libraries/libqalculate/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/qalculate-gtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 3 deletions pkgs/development/libraries/libqalculate/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ''