diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-11-08 17:57:24 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-11-15 22:50:52 +0000 |
| commit | c1966522d7d5fa54db068140d212cba18731dd98 (patch) | |
| tree | 4a43fe0bed860d803df88856b71b67ed2086e8da /pkgs/applications/office | |
| parent | 8c1a5a336ca104f9ec8419c9a0083901d281604a (diff) | |
| download | nixpkgs-c1966522d7d5fa54db068140d212cba18731dd98.tar nixpkgs-c1966522d7d5fa54db068140d212cba18731dd98.tar.gz nixpkgs-c1966522d7d5fa54db068140d212cba18731dd98.tar.bz2 nixpkgs-c1966522d7d5fa54db068140d212cba18731dd98.tar.lz nixpkgs-c1966522d7d5fa54db068140d212cba18731dd98.tar.xz nixpkgs-c1966522d7d5fa54db068140d212cba18731dd98.tar.zst nixpkgs-c1966522d7d5fa54db068140d212cba18731dd98.zip | |
gnumeric: 1.12.45 → 1.12.46
goffice: 0.10.45 → 0.10.46
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/gnumeric/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 70d1e3d79ba..979c960f7a8 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -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 = [ |