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

gnumeric: 1.12.45 → 1.12.46

Browse Source 
goffice: 0.10.45 → 0.10.46
This commit is contained in:
Vincent Laporte
2019-11-15 22:50:52 +00:00
committed by Vincent Laporte
parent 8c1a5a336c
commit c1966522d7
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/office/gnumeric/default.nix
+4 -13
View File
@@ -1,31 +1,22 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages { stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages , goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
, itstool, autoreconfHook , itstool
}: }:
let let
inherit (pythonPackages) python pygobject3; inherit (pythonPackages) python pygobject3;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gnumeric"; pname = "gnumeric";
version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook version = "1.12.46";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 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" ]; configureFlags = [ "--disable-component" ];
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ] nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];
++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
# ToDo: optional libgda, introspection? # ToDo: optional libgda, introspection?
buildInputs = [ buildInputs = [
pkgs/development/libraries/goffice/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "goffice"; pname = "goffice";
version = "0.10.45"; version = "0.10.46";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "702ba567e9ec0bbdd9b1a8161cd24648b4868d57a6cb89128f13c125f6f31947"; sha256 = "058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];