From a8058cdc4f509b65d7b962c3d2c694f856bdc04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 31 May 2026 16:57:43 -0700 Subject: [PATCH] gnumeric: 1.12.60 -> 1.12.61 Diff: https://gitlab.gnome.org/GNOME/gnumeric/-/compare/GNUMERIC_1_12_60...GNUMERIC_1_12_61 Changelog: https://gitlab.gnome.org/GNOME/gnumeric/-/blob/GNUMERIC_1_12_61/ChangeLog --- pkgs/by-name/gn/gnumeric/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/gn/gnumeric/package.nix b/pkgs/by-name/gn/gnumeric/package.nix index c970c80a1bf2..5aa2168a73b3 100644 --- a/pkgs/by-name/gn/gnumeric/package.nix +++ b/pkgs/by-name/gn/gnumeric/package.nix @@ -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/";