From f83d244c459f935993b70d0fbf04a983e60d4e35 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jan 2026 20:57:54 +0800 Subject: [PATCH] mate.marco: 1.28.1 -> 1.28.2 https://github.com/mate-desktop/marco/compare/v1.28.1...v1.28.2 --- pkgs/desktops/mate/marco/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index fdfe06118510..276f473c9af0 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,7 +1,10 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoconf-archive, + autoreconfHook, + mate-common, pkg-config, gettext, itstool, @@ -18,24 +21,31 @@ mate-desktop, mate-settings-daemon, wrapGAppsHook3, + yelp-tools, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "marco"; - version = "1.28.1"; + version = "1.28.2"; - src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/marco-${finalAttrs.version}.tar.xz"; - sha256 = "JJbl5A7pgM1oSUk6w+D4/Q3si4HGdNqNm6GaV38KwuE="; + src = fetchFromGitHub { + owner = "mate-desktop"; + repo = "marco"; + tag = "v${finalAttrs.version}"; + hash = "sha256-k45k49mPxy4vmDtCFHaqk0kwZ5wXVAaTj3kanK79n7I="; }; nativeBuildInputs = [ + autoconf-archive + autoreconfHook pkg-config gettext itstool libxml2 # xmllint + mate-common # mate-common.m4 macros wrapGAppsHook3 + yelp-tools ]; buildInputs = [ @@ -62,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru.updateScript = gitUpdater { - url = "https://git.mate-desktop.org/marco"; odd-unstable = true; rev-prefix = "v"; };