Merge pull request #193248 from romildo/upd.generic-updater

generic-updater: more flexible with name, pname, version and attr path, and cleanups

pkgs/applications/audio/furnace/default.nix

@@ -81,7 +81,6 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gitUpdater {
-      inherit pname version;
       rev-prefix = "v";
     };
     tests.version = testers.testVersion {

pkgs/applications/audio/r128gain/default.nix

@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
   # sandbox to be disabled.
   doCheck = false;
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)";

pkgs/applications/misc/bottles/default.nix

@@ -96,9 +96,7 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  passthru.updateScript = gitUpdater {
-    inherit pname version;
-  };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "An easy-to-use wineprefix manager";

pkgs/applications/misc/diffuse/default.nix

@@ -53,7 +53,6 @@ python3.pkgs.buildPythonApplication rec {
 
   passthru = {
     updateScript = gitUpdater {
-      inherit pname version;
       rev-prefix = "v";
     };
   };

pkgs/applications/misc/fbmenugen/default.nix

@@ -66,7 +66,7 @@ perlPackages.buildPerlPackage rec {
     wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB"
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/trizen/fbmenugen";

pkgs/applications/misc/gnome-firmware/default.nix

@@ -55,7 +55,6 @@ stdenv.mkDerivation rec {
   ];
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
     ignoredVersions = "(alpha|beta|rc).*";
   };
 

pkgs/applications/misc/pwsafe/default.nix

@@ -53,7 +53,6 @@ stdenv.mkDerivation rec {
   installFlags = [ "PREFIX=${placeholder "out"}" ];
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
     ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x
     url = src.gitRepoUrl;
   };

pkgs/applications/misc/sticky/default.nix

@@ -76,7 +76,6 @@ python3.pkgs.buildPythonApplication rec {
 
   passthru = {
     updateScript = gitUpdater {
-      inherit pname version;
       ignoredVersions = ''master.*'';
     };
   };

pkgs/applications/misc/xdgmenumaker/default.nix

@@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  passthru.updateScript = gitUpdater {inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Command line tool that generates XDG menus for several window managers";

pkgs/applications/networking/newsreaders/liferea/default.nix

@@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
   '';
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
     url = "https://github.com/lwindolf/${pname}";
     rev-prefix = "v";
   };

pkgs/applications/networking/remote/anydesk/default.nix

@@ -30,9 +30,7 @@ in stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = genericUpdater {
-      inherit pname version;
       versionLister = writeShellScript "anydesk-versionLister" ''
-        echo "# Versions for $1:" >> "$2"
         curl -s https://anydesk.com/en/downloads/linux \
           | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \
           | uniq \

pkgs/applications/networking/shellhub-agent/default.nix

@@ -25,7 +25,6 @@ buildGoModule rec {
 
   passthru = {
     updateScript = gitUpdater {
-      inherit pname version;
       rev-prefix = "v";
       ignoredVersions = ".(rc|beta).*";
     };

pkgs/applications/science/electronics/openboardview/default.nix

@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
   '';
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
     ignoredVersions = ''.*\.90\..*'';
   };
 

pkgs/applications/system/monitor/default.nix

@@ -76,7 +76,6 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gitUpdater {
-      inherit pname version;
       ignoredVersions = "ci.*";
     };
   };

pkgs/applications/version-management/git-review/default.nix

@@ -41,7 +41,7 @@ buildPythonApplication rec {
 
   pythonImportsCheck = [ "git_review" ];
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Tool to submit code to Gerrit";

pkgs/applications/version-management/gitqlient/default.nix

@@ -69,7 +69,6 @@ mkDerivation rec {
   ];
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
     rev-prefix = "v";
   };
 

pkgs/applications/video/epgstation/update.nix

@@ -15,8 +15,8 @@ let
     attrPath = lib.toLower pname;
     rev-prefix = "v";
   };
-  updateScript = builtins.elemAt updater 0;
-  updateArgs = map (lib.escapeShellArg) (builtins.tail updater);
+  updateScript = builtins.elemAt updater.command 0;
+  updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command);
 in writers.writeBash "update-epgstation" ''
   set -euxo pipefail
 

pkgs/applications/video/mirakurun/update.nix

@@ -17,8 +17,8 @@ let
     # exclude prerelease versions
     ignoredVersions = "-";
   };
-  updateScript = builtins.elemAt updater 0;
-  updateArgs = map (lib.escapeShellArg) (builtins.tail updater);
+  updateScript = builtins.elemAt updater.command 0;
+  updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command);
 in writers.writeBash "update-mirakurun" ''
   set -euxo pipefail
 

pkgs/applications/video/shotcut/default.nix

@@ -76,7 +76,6 @@ mkDerivation rec {
   '';
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
     rev-prefix = "v";
   };
 

pkgs/applications/window-managers/e16/default.nix

@@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
   '';
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
     url = "https://git.enlightenment.org/e16/e16";
     rev-prefix = "v";
   };

pkgs/applications/window-managers/jwm/default.nix

@@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
     rev-prefix = "v";
   };
 

pkgs/common-updater/generic-updater.nix

@@ -1,8 +1,9 @@
 { stdenv, writeScript, coreutils, gnugrep, gnused, common-updater-scripts, nix }:
 
-{ pname
-, version
-, attrPath ? pname
+{ name ? null
+, pname ? null
+, version ? null
+, attrPath ? null
 , versionLister
 , ignoredVersions ? ""
 , rev-prefix ? ""
@@ -15,22 +16,28 @@ let
   fileForGitCommands = "update-git-commits.txt";
 
   # shell script to update package
-  updateScript = writeScript "update-script.sh" ''
+  updateScript = writeScript "generic-update-script.sh" ''
     #! ${stdenv.shell}
     set -o errexit
     set -x
 
-    pname="$1"
-    version="$2"
-    attr_path="$3"
-    version_lister="$4"
-    ignored_versions="$5"
-    rev_prefix="$6"
-    odd_unstable="$7"
-    patchlevel_unstable="$8"
+    name="$1"
+    pname="$2"
+    version="$3"
+    attr_path="$4"
+    version_lister="$5"
+    ignored_versions="$6"
+    rev_prefix="$7"
+    odd_unstable="$8"
+    patchlevel_unstable="$9"
+
+    [[ -n "$name" ]] || name="$UPDATE_NIX_NAME"
+    [[ -n "$pname" ]] || pname="$UPDATE_NIX_PNAME"
+    [[ -n "$version" ]] || version="$UPDATE_NIX_OLD_VERSION"
+    [[ -n "$attr_path" ]] || attr_path="$UPDATE_NIX_ATTR_PATH"
 
     # print header
-    echo "# $pname-$version" >> ${fileForGitCommands}
+    echo "# $name" >> ${fileForGitCommands}
 
     function version_is_ignored() {
       local tag="$1"
@@ -55,7 +62,7 @@ let
       return 1
     }
 
-    tags=$($version_lister --pname=${pname} --file="${fileForGitCommands}") || exit 1
+    tags=$($version_lister --pname=$pname --attr-path=$attr_path --file="${fileForGitCommands}") || exit 1
 
     # print available tags
     for tag in $tags; do
@@ -104,5 +111,7 @@ let
     echo "" >> ${fileForGitCommands}
   '';
 
-in
-[ updateScript pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ]
+in {
+  name = "generic-update-script";
+  command = [ updateScript name pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ];
+}

pkgs/common-updater/git-updater.nix

@@ -3,9 +3,9 @@
 , common-updater-scripts
 }:
 
-{ pname
-, version
-, attrPath ? pname
+{ pname ? null
+, version ? null
+, attrPath ? null
 , ignoredVersions ? ""
 , rev-prefix ? ""
 , odd-unstable ? false

pkgs/common-updater/http-two-levels-updater.nix

@@ -3,9 +3,9 @@
 , common-updater-scripts
 }:
 
-{ pname
-, version
-, attrPath ? pname
+{ pname ? null
+, version ? null
+, attrPath ? null
 , ignoredVersions ? ""
 , rev-prefix ? ""
 , odd-unstable ? false

pkgs/common-updater/scripts/list-archive-two-levels-versions

@@ -2,20 +2,24 @@
 
 # lists all available versions listed for a package in a site (http)
 
-archive=""  # archive url
 pname=""  # package name
+attr_path=""  # package attribute path
+url=""  # directory list url
 file=""  # file for writing debugging information
 
 while (( $# > 0 )); do
     flag="$1"
     shift 1
     case "$flag" in
-        --url=*)
-            archive="${flag#*=}"
-            ;;
         --pname=*)
             pname="${flag#*=}"
             ;;
+        --attr-path=*)
+            attr_path="${flag#*=}"
+            ;;
+        --url=*)
+            url="${flag#*=}"
+            ;;
         --file=*)
             file="${flag#*=}"
             ;;
@@ -26,29 +30,33 @@ while (( $# > 0 )); do
     esac
 done
 
-# by default set url to the base dir of the first url in src.urls
-if [[ -z "$archive" ]]; then
-    archive="$(nix-instantiate $systemArg --eval -E \
-                   "with import ./. {}; dirOf (dirOf (lib.head $UPDATE_NIX_ATTR_PATH.src.urls))" \
-            | tr -d '"')"
+if [[ -z "$pname" ]]; then
+    pname="$UPDATE_NIX_NAME"
 fi
 
-if [[ -z "$pname" ]]; then
-    pname="$UPDATE_NIX_ATTR_PATH"
+if [[ -z "$attr_path" ]]; then
+    attr_path="$UPDATE_NIX_ATTR_PATH"
+fi
+
+# by default set url to the base dir of the first url in src.urls
+if [[ -z "$url" ]]; then
+    url="$(nix-instantiate $systemArg --eval -E \
+               "with import ./. {}; dirOf (dirOf (lib.head $attr_path.src.urls))" \
+            | tr -d '"')"
 fi
 
 # print a debugging message
 if [[ -n "$file" ]]; then
-    echo "# Listing versions for '$pname' at $archive" >> $file
+    echo "# Listing versions for '$pname' at $url" >> $file
 fi
 
-# list all major-minor versions from archive
-tags1=$(curl -sS "$archive/")
+# list all major-minor versions from url
+tags1=$(curl -sS "$url/")
 tags1=$(echo "$tags1" | sed -rne 's,^<a href="([0-9]+\.[0-9]+)/">.*,\1,p')
 
 # print available versions
 for tag in $tags1; do
-    tags2=$(curl -sS "$archive/$tag/")
+    tags2=$(curl -sS "$url/$tag/")
     tags2=$(echo "$tags2" | sed -rne "s,^<a href=\"$pname-([0-9.]+)\\.[^0-9].*\">.*,\\1,p")
     echo "$tags2"
 done

pkgs/common-updater/scripts/list-git-tags

@@ -2,22 +2,24 @@
 
 # lists all available tags from a git repository
 
-echo "# pname=$UPDATE_NIX_ATTR_PATH" > /tmp/test.txt
-
+pname=""  # package name
+attr_path="" # package attribute path
 url="" # git repository url
-pname="" # package name
 file="" # file for writing debugging information
 
 while (( $# > 0 )); do
     flag="$1"
     shift 1
     case "$flag" in
-        --url=*)
-            url="${flag#*=}"
-            ;;
         --pname=*)
             pname="${flag#*=}"
             ;;
+        --attr-path=*)
+            attr_path="${flag#*=}"
+            ;;
+        --url=*)
+            url="${flag#*=}"
+            ;;
         --file=*)
             file="${flag#*=}"
             ;;
@@ -28,17 +30,21 @@ while (( $# > 0 )); do
     esac
 done
 
+if [[ -z "$pname" ]]; then
+    pname="$UPDATE_NIX_NAME"
+fi
+
+if [[ -z "$attr_path" ]]; then
+    attr_path="$UPDATE_NIX_ATTR_PATH"
+fi
+
 # By default we set url to src.url or src.meta.homepage
 if [[ -z "$url" ]]; then
     url="$(nix-instantiate $systemArg --eval -E \
-               "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.meta.homepage or $UPDATE_NIX_ATTR_PATH.src.url" \
+               "with import ./. {}; $attr_path.src.meta.homepage or $attr_path.src.url" \
         | tr -d '"')"
 fi
 
-if [[ -z "$pname" ]]; then
-    pname="$UPDATE_NIX_ATTR_PATH"
-fi
-
 # print a debugging message
 if [[ -n "$file" ]]; then
     echo "# Listing tags for '$pname' at $url" >> $file

pkgs/data/icons/colloid-icon-theme/default.nix

@@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Colloid icon theme";

pkgs/data/icons/kora-icon-theme/default.nix

@@ -46,7 +46,6 @@ stdenvNoCC.mkDerivation rec  {
   '';
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
     rev-prefix = "v";
   };
 

pkgs/data/icons/luna-icons/default.nix

@@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Icon pack based on marwaita and papirus icons";

pkgs/data/icons/numix-icon-theme-circle/default.nix

@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Numix icon theme (circle version)";

pkgs/data/icons/numix-icon-theme-square/default.nix

@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Numix icon theme (square version)";

pkgs/data/icons/numix-icon-theme/default.nix

@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Numix icon theme";

pkgs/data/icons/qogir-icon-theme/default.nix

@@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Flat colorful design icon theme";

pkgs/data/icons/tela-circle-icon-theme/default.nix

@@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Flat and colorful personality icon theme";

pkgs/data/icons/zafiro-icons/default.nix

@@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Icon pack flat with light colors";

pkgs/data/themes/colloid-gtk-theme/default.nix

@@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "A modern and clean Gtk theme";

pkgs/data/themes/colloid-kde/default.nix

@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "A clean and concise theme for KDE Plasma desktop";

pkgs/data/themes/graphite-gtk-theme/default.nix

@@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Flat Gtk+ theme based on Elegant Design";

pkgs/data/themes/greybird/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     gtk-engine-murrine
   ];
 
-  passthru.updateScript = gitUpdater { inherit pname version; rev-prefix = "v"; };
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   meta = with lib; {
     description = "Grey and blue theme from the Shimmer Project for GTK-based environments";

pkgs/data/themes/layan-kde/default.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "A flat Design theme for KDE Plasma desktop";

pkgs/data/themes/marwaita/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops";

pkgs/data/themes/matcha/default.nix

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "A stylish flat Design theme for GTK based desktop environments";

pkgs/data/themes/mojave/default.nix

@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Mac OSX Mojave like theme for GTK based desktop environments";

pkgs/data/themes/qogir-kde/default.nix

@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "A flat Design theme for KDE Plasma desktop";

pkgs/data/themes/qogir/default.nix

@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater { inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Flat Design theme for GTK based desktop environments";

pkgs/data/themes/vimix/default.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {inherit pname version; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Flat Material Design theme for GTK based desktop environments";

pkgs/desktops/cinnamon/warpinator/default.nix

@@ -74,8 +74,6 @@ python3.pkgs.buildPythonApplication rec  {
   '';
 
   passthru.updateScript = gitUpdater {
-    inherit pname version;
-    attrPath = "cinnamon.warpinator";
     ignoredVersions = "^master.*";
   };
 

pkgs/desktops/gnome/extensions/dash-to-dock/default.nix

@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
     extensionPortalSlug = "dash-to-dock";
 
     updateScript = gitUpdater {
-      pname = "gnomeExtensions.dash-to-dock";
-      inherit version;
       rev-prefix = "extensions.gnome.org-v";
     };
   };

pkgs/desktops/lxqt/compton-conf/default.nix

@@ -8,6 +8,7 @@
 , qttools
 , lxqt
 , libconfig
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -38,7 +39,7 @@ mkDerivation rec {
       --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
   '';
 
-  passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     broken = stdenv.isDarwin;

pkgs/desktops/lxqt/default.nix

@@ -2,13 +2,6 @@
 let
   packages = self: with self; {
 
-    # Update script tailored to LXQt packages from git repository
-    lxqtUpdateScript = { pname, version, src }:
-      pkgs.gitUpdater {
-        inherit pname version;
-        attrPath = "lxqt.${pname}";
-      };
-
     # For compiling information, see:
     # - https://github.com/lxqt/lxqt/wiki/Building-from-source
 

pkgs/desktops/lxqt/libfm-qt/default.nix

@@ -11,7 +11,7 @@
 , menu-cache
 , qtx11extras
 , qttools
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -43,7 +43,7 @@ mkDerivation rec {
     menu-cache
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/libfm-qt";

pkgs/desktops/lxqt/liblxqt/default.nix

@@ -10,7 +10,7 @@
 , polkit-qt
 , kwindowsystem
 , xorg
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -50,7 +50,7 @@ mkDerivation rec {
     sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
   '';
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Core utility library for all LXQt components";

pkgs/desktops/lxqt/libqtxdg/default.nix

@@ -5,7 +5,7 @@
 , qtbase
 , qtsvg
 , lxqt-build-tools
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -37,7 +37,7 @@ mkDerivation rec {
     )
   '';
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/libqtxdg";

pkgs/desktops/lxqt/libsysstat/default.nix

@@ -5,7 +5,7 @@
 , cmake
 , qtbase
 , lxqt-build-tools
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -28,7 +28,7 @@ mkDerivation rec {
     qtbase
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     broken = stdenv.isDarwin;

pkgs/desktops/lxqt/lximage-qt/default.nix

@@ -13,7 +13,7 @@
 , libfm-qt
 , libexif
 , menu-cache
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -46,7 +46,7 @@ mkDerivation rec {
     menu-cache
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lximage-qt";

pkgs/desktops/lxqt/lxqt-about/default.nix

@@ -9,7 +9,7 @@
 , kwindowsystem
 , liblxqt
 , libqtxdg
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -37,7 +37,7 @@ mkDerivation rec {
     libqtxdg
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-about";

pkgs/desktops/lxqt/lxqt-admin/default.nix

@@ -10,7 +10,7 @@
 , liblxqt
 , libqtxdg
 , polkit-qt
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -47,7 +47,7 @@ mkDerivation rec {
     done
   '';
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-admin";

pkgs/desktops/lxqt/lxqt-archiver/default.nix

@@ -11,7 +11,7 @@
 , qtbase
 , qttools
 , qtx11extras
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -43,7 +43,7 @@ mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-archiver/";

pkgs/desktops/lxqt/lxqt-build-tools/default.nix

@@ -9,7 +9,7 @@
 , qtbase
 , glib
 , perl
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -69,7 +69,7 @@ mkDerivation rec {
     cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
   '';
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-build-tools";

pkgs/desktops/lxqt/lxqt-config/default.nix

@@ -15,7 +15,7 @@
 , libqtxdg
 , xkeyboard_config
 , xorg
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -64,7 +64,7 @@ mkDerivation rec {
                 '${xkeyboard_config}/share/X11/xkb/rules/base.lst'
   '';
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-config";

pkgs/desktops/lxqt/lxqt-globalkeys/default.nix

@@ -10,7 +10,7 @@
 , kwindowsystem
 , liblxqt
 , libqtxdg
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -39,7 +39,7 @@ mkDerivation rec {
     libqtxdg
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-globalkeys";

pkgs/desktops/lxqt/lxqt-notificationd/default.nix

@@ -10,7 +10,7 @@
 , liblxqt
 , libqtxdg
 , qtx11extras
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -39,7 +39,7 @@ mkDerivation rec {
     qtx11extras
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-notificationd";

pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix

@@ -10,7 +10,7 @@
 , kwindowsystem
 , liblxqt
 , libqtxdg
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -39,7 +39,7 @@ mkDerivation rec {
     libqtxdg
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-openssh-askpass";

pkgs/desktops/lxqt/lxqt-panel/default.nix

@@ -17,7 +17,7 @@
 , lxmenu-data
 , lxqt-build-tools
 , lxqt-globalkeys
-, lxqtUpdateScript
+, gitUpdater
 , menu-cache
 , pcre
 , qtbase
@@ -71,7 +71,7 @@ mkDerivation rec {
     xorg.libpthreadstubs
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-panel";

pkgs/desktops/lxqt/lxqt-policykit/default.nix

@@ -14,7 +14,7 @@
 , liblxqt
 , libqtxdg
 , pcre
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -47,7 +47,7 @@ mkDerivation rec {
     pcre
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-policykit";

pkgs/desktops/lxqt/lxqt-powermanagement/default.nix

@@ -13,7 +13,7 @@
 , liblxqt
 , libqtxdg
 , lxqt-globalkeys
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -45,7 +45,7 @@ mkDerivation rec {
     lxqt-globalkeys
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-powermanagement";

pkgs/desktops/lxqt/lxqt-qtplugin/default.nix

@@ -6,7 +6,7 @@
 , libfm-qt
 , libqtxdg
 , lxqt-build-tools
-, lxqtUpdateScript
+, gitUpdater
 , qtbase
 , qtsvg
 , qttools
@@ -44,7 +44,7 @@ mkDerivation rec {
       --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
   '';
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-qtplugin";

pkgs/desktops/lxqt/lxqt-runner/default.nix

@@ -15,7 +15,7 @@
 , menu-cache
 , muparser
 , pcre
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -49,7 +49,7 @@ mkDerivation rec {
     pcre
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-runner";

pkgs/desktops/lxqt/lxqt-session/default.nix

@@ -15,7 +15,7 @@
 , procps
 , xorg
 , xdg-user-dirs
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -50,7 +50,7 @@ mkDerivation rec {
     xdg-user-dirs
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-session";

pkgs/desktops/lxqt/lxqt-sudo/default.nix

@@ -11,7 +11,7 @@
 , liblxqt
 , libqtxdg
 , sudo
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -41,7 +41,7 @@ mkDerivation rec {
     sudo
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-sudo";

pkgs/desktops/lxqt/lxqt-themes/default.nix

@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , cmake
 , lxqt-build-tools
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -22,7 +22,7 @@ mkDerivation rec {
     lxqt-build-tools
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/lxqt-themes";

pkgs/desktops/lxqt/obconf-qt/default.nix

@@ -10,7 +10,7 @@
 , xorg
 , lxqt-build-tools
 , openbox
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -41,7 +41,7 @@ mkDerivation rec {
     openbox
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/obconf-qt";

pkgs/desktops/lxqt/pavucontrol-qt/default.nix

@@ -9,6 +9,7 @@
 , qtbase
 , qttools
 , qtx11extras
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -36,7 +37,7 @@ mkDerivation rec {
     pcre
   ];
 
-  passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/pavucontrol-qt";

pkgs/desktops/lxqt/pcmanfm-qt/default.nix

@@ -12,7 +12,7 @@
 , libfm-qt
 , menu-cache
 , lxmenu-data
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -44,7 +44,7 @@ mkDerivation rec {
     lxmenu-data
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   postPatch = ''
     substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt

pkgs/desktops/lxqt/qlipper/default.nix

@@ -4,7 +4,7 @@
 , cmake
 , qtbase
 , qttools
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -27,7 +27,7 @@ mkDerivation rec {
     qttools
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     description = "Cross-platform clipboard history applet";

pkgs/desktops/lxqt/qps/default.nix

@@ -6,7 +6,7 @@
 , liblxqt
 , libqtxdg
 , lxqt-build-tools
-, lxqtUpdateScript
+, gitUpdater
 , qtbase
 , qttools
 , qtx11extras
@@ -37,7 +37,7 @@ mkDerivation rec {
     qtx11extras
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/qps";

pkgs/desktops/lxqt/qterminal/default.nix

@@ -7,7 +7,7 @@
 , qtbase
 , qttools
 , qtx11extras
-, lxqtUpdateScript
+, gitUpdater
 , nixosTests
 }:
 
@@ -34,7 +34,7 @@ mkDerivation rec {
     qtermwidget
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   passthru.tests.test = nixosTests.terminal-emulators.qterminal;
 

pkgs/desktops/lxqt/qtermwidget/default.nix

@@ -6,7 +6,7 @@
 , qtbase
 , qttools
 , lxqt-build-tools
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -30,7 +30,7 @@ mkDerivation rec {
     qttools
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     broken = stdenv.isDarwin;

pkgs/desktops/lxqt/qtxdg-tools/default.nix

@@ -5,7 +5,7 @@
 , qtbase
 , libqtxdg
 , lxqt-build-tools
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -29,7 +29,7 @@ mkDerivation rec {
     libqtxdg
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/qtxdg-tools";

pkgs/desktops/lxqt/screengrab/default.nix

@@ -12,7 +12,7 @@
 , perl
 , xorg
 , autoPatchelfHook
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -44,7 +44,7 @@ mkDerivation rec {
     xorg.libXdmcp
   ];
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/screengrab";

pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix

@@ -6,7 +6,7 @@
 , libfm-qt
 , lxqt-qtplugin
 , qtx11extras
-, lxqtUpdateScript
+, gitUpdater
 , extraQtStyles ? []
 }:
 
@@ -33,7 +33,7 @@ mkDerivation rec {
   ]
   ++ extraQtStyles;
 
-  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://github.com/lxqt/xdg-desktop-portal-lxqt";

pkgs/desktops/mate/atril/default.nix

@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "A simple multi-page document viewer for the MATE desktop";

pkgs/desktops/mate/caja-dropbox/default.nix

@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Dropbox extension for Caja file manager";

pkgs/desktops/mate/caja-extensions/default.nix

@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Set of extensions for Caja file manager";

pkgs/desktops/mate/caja/default.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "File manager for the MATE desktop";

pkgs/desktops/mate/default.nix

@@ -4,11 +4,10 @@ let
   packages = self: with self; {
 
     # Update script tailored to mate packages from git repository
-    mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }:
+    mateUpdateScript = { pname, odd-unstable ? true, rev-prefix ? "v", url ? null }:
       pkgs.gitUpdater {
-        inherit pname version odd-unstable rev-prefix;
+        inherit odd-unstable rev-prefix;
         url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
-        attrPath = "mate.${pname}";
       };
 
     atril = callPackage ./atril { };

pkgs/desktops/mate/engrampa/default.nix

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Archive Manager for MATE";

pkgs/desktops/mate/eom/default.nix

@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "An image viewing and cataloging program for the MATE desktop";

pkgs/desktops/mate/libmatekbd/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Keyboard management library for MATE";

pkgs/desktops/mate/libmatemixer/default.nix

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Mixer library for MATE";

pkgs/desktops/mate/libmateweather/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Library to access weather information from online services for MATE";

pkgs/desktops/mate/marco/default.nix

@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "MATE default window manager";

pkgs/desktops/mate/mate-applets/default.nix

@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Applets for use with the MATE panel";

pkgs/desktops/mate/mate-backgrounds/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Background images and data for MATE";

pkgs/desktops/mate/mate-calc/default.nix

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Calculator for the MATE desktop";

pkgs/desktops/mate/mate-common/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Common files for development of MATE packages";

pkgs/desktops/mate/mate-control-center/default.nix

@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Utilities to configure the MATE desktop";

pkgs/desktops/mate/mate-desktop/default.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Library with common API for various MATE modules";

pkgs/desktops/mate/mate-icon-theme-faenza/default.nix

@@ -5,7 +5,7 @@
 , gtk3
 , mate
 , hicolor-icon-theme
-, mateUpdateScript
+, gitUpdater
 }:
 
 stdenv.mkDerivation rec {
@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript {
-    inherit pname version;
-    url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza";
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+    url = "https://github.com/mate-desktop-legacy-archive/${pname}";
   };
 
   meta = with lib; {

pkgs/desktops/mate/mate-icon-theme/default.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname version; };
+  passthru.updateScript = mateUpdateScript { inherit pname; };
 
   meta = with lib; {
     description = "Icon themes from MATE";