mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
gnumeric: 1.12.60 -> 1.12.61 (#526558)
This commit is contained in:
commit
c49b175d54
1 changed files with 3 additions and 12 deletions
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
intltool,
|
||||
libxml2,
|
||||
|
|
@ -27,25 +26,16 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnumeric";
|
||||
version = "1.12.60";
|
||||
version = "1.12.61";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gnumeric";
|
||||
tag = "GNUMERIC_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-fv4RlIfJiLY3MbsAsgRgJ010/Ob1X1be29XfoweCMpI=";
|
||||
hash = "sha256-SrAFYLCYacTobOmb+Jk4f4OWVLcWS8aq8OBFrdwYcbE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Replace bool type with gboolean.
|
||||
# See https://gitlab.gnome.org/GNOME/gnumeric/-/merge_requests/39.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnumeric/-/commit/dee6523426b75c10c36b188fafe6e7a27b6631e3.patch";
|
||||
hash = "sha256-a4KgxsrU9m/dZqu2LNC+jWiXvCTcRPzZW/67pg8yLGY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'GLIB_COMPILE_RESOURCES=' 'GLIB_COMPILE_RESOURCES="glib-compile-resources"#'
|
||||
|
|
@ -96,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://gitlab.gnome.org/GNOME/gnumeric/-/blob/${finalAttrs.src.tag}/ChangeLog";
|
||||
description = "GNOME Office Spreadsheet";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
homepage = "http://projects.gnome.org/gnumeric/";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue