From f26e356bf1d699a824fd4b92aa4221f196e61b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 12 Jul 2022 09:52:12 -0300 Subject: [PATCH] mate: update script list versions from the git repository --- pkgs/desktops/mate/default.nix | 7 ++++--- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 7 +++++-- pkgs/desktops/mate/mate-themes/default.nix | 5 +---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index b9ce82e345bf..d52066be3f26 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -6,9 +6,10 @@ let self = rec { # Update script tailored to mate packages from git repository - mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }: - pkgs.httpTwoLevelsUpdater { - inherit pname version odd-unstable url; + mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }: + pkgs.gitUpdater { + inherit pname version odd-unstable rev-prefix; + url = if url == null then "https://git.mate-desktop.org/${pname}" else url; attrPath = "mate.${pname}"; }; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 481684ba5bb7..0b46d092c70f 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -37,12 +37,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { + inherit pname version; + url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza"; + }; meta = with lib; { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = teams.mate.members; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 1ae2c74c77e5..af186e4c5a2d 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -48,10 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { - inherit pname version; - url = "https://pub.mate-desktop.org/releases/themes"; - }; + passthru.updateScript = mateUpdateScript { inherit pname version; }; meta = with lib; { description = "A set of themes from MATE";