lxqt: use gitUpdater instead of lxqtUpdateScript

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

@@ -8,7 +8,7 @@
 , qtbase
 , glib
 , perl
-, lxqtUpdateScript
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -59,7 +59,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";