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: 8c1a5a336ca1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c1966522d7d5
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 15, 2019

  1. gnumeric: 1.12.45 → 1.12.46 

    goffice: 0.10.45 → 0.10.46
    @vbgl
    vbgl committed Nov 15, 2019
    Copy the full SHA
    c196652 View commit details
Showing with 6 additions and 15 deletions.
  1. +4 −13 pkgs/applications/office/gnumeric/default.nix
  2. +2 −2 pkgs/development/libraries/goffice/default.nix
17 changes: 4 additions & 13 deletions pkgs/applications/office/gnumeric/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
, itstool, autoreconfHook
, itstool
}:

let
inherit (pythonPackages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook
version = "1.12.46";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h";
sha256 = "9fdc67377af52dfe69a7db4f533938024a75f454fc5d25ab43b8e6739be0b5e1";
};

patches = stdenv.lib.optional stdenv.isDarwin
# https://gitlab.gnome.org/GNOME/gnumeric/issues/402
(fetchurl {
name = "math-gamma.patch";
url = "https://gitlab.gnome.org/GNOME/gnumeric/uploads/cf8d162bc719de92e97d01cb0ba5b637/ppp";
sha256 = "17wiigs06qc86a1nghwcg3pcnpa28123jblgsxpy3j7drardgnlp";
});

configureFlags = [ "--disable-component" ];

nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]
++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];

# ToDo: optional libgda, introspection?
buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/goffice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "goffice";
version = "0.10.45";
version = "0.10.46";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "702ba567e9ec0bbdd9b1a8161cd24648b4868d57a6cb89128f13c125f6f31947";
sha256 = "058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9";
};

nativeBuildInputs = [ pkgconfig intltool ];