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: d5a533de9742
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 44464523477c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 23, 2019

  1. libqalculate: 2.9.0 -> 3.0.0 

    http://qalculate.github.io/news.html
    @dtzWill
    dtzWill committed Mar 23, 2019
    Copy the full SHA
    003ad78 View commit details

  2. qalculate-gtk: 2.9.0 -> 3.0.0 

    http://qalculate.github.io/news.html
    @dtzWill
    dtzWill committed Mar 23, 2019
    Copy the full SHA
    24484b2 View commit details

  3. Merge pull request #58163 from dtzWill/update/qalculate-3 

    libqalculate,qalculate-gtk: 2.9.0 -> 3.0.0
    @gebner
    gebner authored Mar 23, 2019
    Copy the full SHA
    4446452 View commit details
Showing with 7 additions and 7 deletions.
  1. +3 −3 pkgs/applications/science/math/qalculate-gtk/default.nix
  2. +4 −4 pkgs/development/libraries/libqalculate/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/science/math/qalculate-gtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }:

stdenv.mkDerivation rec {
name = "qalculate-gtk-${version}";
version = "2.9.0";
pname = "qalculate-gtk";
version = "3.0.0";

src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
sha256 = "0c5s7mz8xwwmzc22yai8vqiww7paafkyi7khp8a2yws78m2nirdx";
sha256 = "00q6y9dgg9wgpgks79snbipn8alfjajlx02a5hm7wl9a20zd0b81";
};

patchPhase = ''
8 changes: 4 additions & 4 deletions pkgs/development/libraries/libqalculate/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }:

stdenv.mkDerivation rec {
name = "libqalculate-${version}";
version = "2.9.0";
pname = "libqalculate";
version = "3.0.0";

src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
sha256 = "1w4fbcc6hh63dp88fy4wvys6i1ydj7ya50r1l69a64qbzby1w32i";
sha256 = "0i21c92r94mp03673cvngvqph268ir4j89d5s9qzxgq2zjw5pc8q";
};

outputs = [ "out" "dev" "doc" ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace libqalculate/Calculator.cc \
--replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
--replace '"gnuplot -"' '"${gnuplot}/bin/gnuplot -"'
--replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
'' + stdenv.lib.optionalString stdenv.cc.isClang ''
substituteInPlace src/qalc.cc \
--replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))'