lxqt: use gitUpdater instead of lxqtUpdateScript

+64 -69
+2 -1
pkgs/desktops/lxqt/compton-conf/default.nix
··· 8 8 , qttools 9 9 , lxqt 10 10 , libconfig 11 + , gitUpdater 11 12 }: 12 13 13 14 mkDerivation rec { ··· 38 39 --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ 39 40 ''; 40 41 41 - passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; 42 + passthru.updateScript = gitUpdater { }; 42 43 43 44 meta = with lib; { 44 45 broken = stdenv.isDarwin;
-7
pkgs/desktops/lxqt/default.nix
··· 2 2 let 3 3 packages = self: with self; { 4 4 5 - # Update script tailored to LXQt packages from git repository 6 - lxqtUpdateScript = { pname, version, src }: 7 - pkgs.gitUpdater { 8 - inherit pname version; 9 - attrPath = "lxqt.${pname}"; 10 - }; 11 - 12 5 # For compiling information, see: 13 6 # - https://github.com/lxqt/lxqt/wiki/Building-from-source 14 7
+2 -2
pkgs/desktops/lxqt/libfm-qt/default.nix
··· 11 11 , menu-cache 12 12 , qtx11extras 13 13 , qttools 14 - , lxqtUpdateScript 14 + , gitUpdater 15 15 }: 16 16 17 17 mkDerivation rec { ··· 43 43 menu-cache 44 44 ]; 45 45 46 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 46 + passthru.updateScript = gitUpdater { }; 47 47 48 48 meta = with lib; { 49 49 homepage = "https://github.com/lxqt/libfm-qt";
+2 -2
pkgs/desktops/lxqt/liblxqt/default.nix
··· 10 10 , polkit-qt 11 11 , kwindowsystem 12 12 , xorg 13 - , lxqtUpdateScript 13 + , gitUpdater 14 14 }: 15 15 16 16 mkDerivation rec { ··· 50 50 sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt 51 51 ''; 52 52 53 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 53 + passthru.updateScript = gitUpdater { }; 54 54 55 55 meta = with lib; { 56 56 description = "Core utility library for all LXQt components";
+2 -2
pkgs/desktops/lxqt/libqtxdg/default.nix
··· 5 5 , qtbase 6 6 , qtsvg 7 7 , lxqt-build-tools 8 - , lxqtUpdateScript 8 + , gitUpdater 9 9 }: 10 10 11 11 mkDerivation rec { ··· 37 37 ) 38 38 ''; 39 39 40 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 40 + passthru.updateScript = gitUpdater { }; 41 41 42 42 meta = with lib; { 43 43 homepage = "https://github.com/lxqt/libqtxdg";
+2 -2
pkgs/desktops/lxqt/libsysstat/default.nix
··· 5 5 , cmake 6 6 , qtbase 7 7 , lxqt-build-tools 8 - , lxqtUpdateScript 8 + , gitUpdater 9 9 }: 10 10 11 11 mkDerivation rec { ··· 28 28 qtbase 29 29 ]; 30 30 31 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 31 + passthru.updateScript = gitUpdater { }; 32 32 33 33 meta = with lib; { 34 34 broken = stdenv.isDarwin;
+2 -2
pkgs/desktops/lxqt/lximage-qt/default.nix
··· 13 13 , libfm-qt 14 14 , libexif 15 15 , menu-cache 16 - , lxqtUpdateScript 16 + , gitUpdater 17 17 }: 18 18 19 19 mkDerivation rec { ··· 46 46 menu-cache 47 47 ]; 48 48 49 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 49 + passthru.updateScript = gitUpdater { }; 50 50 51 51 meta = with lib; { 52 52 homepage = "https://github.com/lxqt/lximage-qt";
+2 -2
pkgs/desktops/lxqt/lxqt-about/default.nix
··· 9 9 , kwindowsystem 10 10 , liblxqt 11 11 , libqtxdg 12 - , lxqtUpdateScript 12 + , gitUpdater 13 13 }: 14 14 15 15 mkDerivation rec { ··· 37 37 libqtxdg 38 38 ]; 39 39 40 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 40 + passthru.updateScript = gitUpdater { }; 41 41 42 42 meta = with lib; { 43 43 homepage = "https://github.com/lxqt/lxqt-about";
+2 -2
pkgs/desktops/lxqt/lxqt-admin/default.nix
··· 10 10 , liblxqt 11 11 , libqtxdg 12 12 , polkit-qt 13 - , lxqtUpdateScript 13 + , gitUpdater 14 14 }: 15 15 16 16 mkDerivation rec { ··· 47 47 done 48 48 ''; 49 49 50 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 50 + passthru.updateScript = gitUpdater { }; 51 51 52 52 meta = with lib; { 53 53 homepage = "https://github.com/lxqt/lxqt-admin";
+2 -2
pkgs/desktops/lxqt/lxqt-archiver/default.nix
··· 11 11 , qtbase 12 12 , qttools 13 13 , qtx11extras 14 - , lxqtUpdateScript 14 + , gitUpdater 15 15 }: 16 16 17 17 mkDerivation rec { ··· 43 43 44 44 hardeningDisable = [ "format" ]; 45 45 46 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 46 + passthru.updateScript = gitUpdater { }; 47 47 48 48 meta = with lib; { 49 49 homepage = "https://github.com/lxqt/lxqt-archiver/";
+2 -2
pkgs/desktops/lxqt/lxqt-build-tools/default.nix
··· 8 8 , qtbase 9 9 , glib 10 10 , perl 11 - , lxqtUpdateScript 11 + , gitUpdater 12 12 }: 13 13 14 14 mkDerivation rec { ··· 59 59 cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake 60 60 ''; 61 61 62 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 62 + passthru.updateScript = gitUpdater { }; 63 63 64 64 meta = with lib; { 65 65 homepage = "https://github.com/lxqt/lxqt-build-tools";
+2 -2
pkgs/desktops/lxqt/lxqt-config/default.nix
··· 15 15 , libqtxdg 16 16 , xkeyboard_config 17 17 , xorg 18 - , lxqtUpdateScript 18 + , gitUpdater 19 19 }: 20 20 21 21 mkDerivation rec { ··· 64 64 '${xkeyboard_config}/share/X11/xkb/rules/base.lst' 65 65 ''; 66 66 67 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 67 + passthru.updateScript = gitUpdater { }; 68 68 69 69 meta = with lib; { 70 70 homepage = "https://github.com/lxqt/lxqt-config";
+2 -2
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
··· 10 10 , kwindowsystem 11 11 , liblxqt 12 12 , libqtxdg 13 - , lxqtUpdateScript 13 + , gitUpdater 14 14 }: 15 15 16 16 mkDerivation rec { ··· 39 39 libqtxdg 40 40 ]; 41 41 42 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 42 + passthru.updateScript = gitUpdater { }; 43 43 44 44 meta = with lib; { 45 45 homepage = "https://github.com/lxqt/lxqt-globalkeys";
+2 -2
pkgs/desktops/lxqt/lxqt-notificationd/default.nix
··· 10 10 , liblxqt 11 11 , libqtxdg 12 12 , qtx11extras 13 - , lxqtUpdateScript 13 + , gitUpdater 14 14 }: 15 15 16 16 mkDerivation rec { ··· 39 39 qtx11extras 40 40 ]; 41 41 42 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 42 + passthru.updateScript = gitUpdater { }; 43 43 44 44 meta = with lib; { 45 45 homepage = "https://github.com/lxqt/lxqt-notificationd";
+2 -2
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
··· 10 10 , kwindowsystem 11 11 , liblxqt 12 12 , libqtxdg 13 - , lxqtUpdateScript 13 + , gitUpdater 14 14 }: 15 15 16 16 mkDerivation rec { ··· 39 39 libqtxdg 40 40 ]; 41 41 42 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 42 + passthru.updateScript = gitUpdater { }; 43 43 44 44 meta = with lib; { 45 45 homepage = "https://github.com/lxqt/lxqt-openssh-askpass";
+2 -2
pkgs/desktops/lxqt/lxqt-panel/default.nix
··· 17 17 , lxmenu-data 18 18 , lxqt-build-tools 19 19 , lxqt-globalkeys 20 - , lxqtUpdateScript 20 + , gitUpdater 21 21 , menu-cache 22 22 , pcre 23 23 , qtbase ··· 71 71 xorg.libpthreadstubs 72 72 ]; 73 73 74 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 74 + passthru.updateScript = gitUpdater { }; 75 75 76 76 meta = with lib; { 77 77 homepage = "https://github.com/lxqt/lxqt-panel";
+2 -2
pkgs/desktops/lxqt/lxqt-policykit/default.nix
··· 14 14 , liblxqt 15 15 , libqtxdg 16 16 , pcre 17 - , lxqtUpdateScript 17 + , gitUpdater 18 18 }: 19 19 20 20 mkDerivation rec { ··· 47 47 pcre 48 48 ]; 49 49 50 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 50 + passthru.updateScript = gitUpdater { }; 51 51 52 52 meta = with lib; { 53 53 homepage = "https://github.com/lxqt/lxqt-policykit";
+2 -2
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
··· 13 13 , liblxqt 14 14 , libqtxdg 15 15 , lxqt-globalkeys 16 - , lxqtUpdateScript 16 + , gitUpdater 17 17 }: 18 18 19 19 mkDerivation rec { ··· 45 45 lxqt-globalkeys 46 46 ]; 47 47 48 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 48 + passthru.updateScript = gitUpdater { }; 49 49 50 50 meta = with lib; { 51 51 homepage = "https://github.com/lxqt/lxqt-powermanagement";
+2 -2
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
··· 6 6 , libfm-qt 7 7 , libqtxdg 8 8 , lxqt-build-tools 9 - , lxqtUpdateScript 9 + , gitUpdater 10 10 , qtbase 11 11 , qtsvg 12 12 , qttools ··· 44 44 --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" 45 45 ''; 46 46 47 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 47 + passthru.updateScript = gitUpdater { }; 48 48 49 49 meta = with lib; { 50 50 homepage = "https://github.com/lxqt/lxqt-qtplugin";
+2 -2
pkgs/desktops/lxqt/lxqt-runner/default.nix
··· 15 15 , menu-cache 16 16 , muparser 17 17 , pcre 18 - , lxqtUpdateScript 18 + , gitUpdater 19 19 }: 20 20 21 21 mkDerivation rec { ··· 49 49 pcre 50 50 ]; 51 51 52 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 52 + passthru.updateScript = gitUpdater { }; 53 53 54 54 meta = with lib; { 55 55 homepage = "https://github.com/lxqt/lxqt-runner";
+2 -2
pkgs/desktops/lxqt/lxqt-session/default.nix
··· 15 15 , procps 16 16 , xorg 17 17 , xdg-user-dirs 18 - , lxqtUpdateScript 18 + , gitUpdater 19 19 }: 20 20 21 21 mkDerivation rec { ··· 50 50 xdg-user-dirs 51 51 ]; 52 52 53 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 53 + passthru.updateScript = gitUpdater { }; 54 54 55 55 meta = with lib; { 56 56 homepage = "https://github.com/lxqt/lxqt-session";
+2 -2
pkgs/desktops/lxqt/lxqt-sudo/default.nix
··· 11 11 , liblxqt 12 12 , libqtxdg 13 13 , sudo 14 - , lxqtUpdateScript 14 + , gitUpdater 15 15 }: 16 16 17 17 mkDerivation rec { ··· 41 41 sudo 42 42 ]; 43 43 44 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 44 + passthru.updateScript = gitUpdater { }; 45 45 46 46 meta = with lib; { 47 47 homepage = "https://github.com/lxqt/lxqt-sudo";
+2 -2
pkgs/desktops/lxqt/lxqt-themes/default.nix
··· 3 3 , fetchFromGitHub 4 4 , cmake 5 5 , lxqt-build-tools 6 - , lxqtUpdateScript 6 + , gitUpdater 7 7 }: 8 8 9 9 mkDerivation rec { ··· 22 22 lxqt-build-tools 23 23 ]; 24 24 25 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 25 + passthru.updateScript = gitUpdater { }; 26 26 27 27 meta = with lib; { 28 28 homepage = "https://github.com/lxqt/lxqt-themes";
+2 -2
pkgs/desktops/lxqt/obconf-qt/default.nix
··· 10 10 , xorg 11 11 , lxqt-build-tools 12 12 , openbox 13 - , lxqtUpdateScript 13 + , gitUpdater 14 14 }: 15 15 16 16 mkDerivation rec { ··· 41 41 openbox 42 42 ]; 43 43 44 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 44 + passthru.updateScript = gitUpdater { }; 45 45 46 46 meta = with lib; { 47 47 homepage = "https://github.com/lxqt/obconf-qt";
+2 -1
pkgs/desktops/lxqt/pavucontrol-qt/default.nix
··· 9 9 , qtbase 10 10 , qttools 11 11 , qtx11extras 12 + , gitUpdater 12 13 }: 13 14 14 15 mkDerivation rec { ··· 36 37 pcre 37 38 ]; 38 39 39 - passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; 40 + passthru.updateScript = gitUpdater { }; 40 41 41 42 meta = with lib; { 42 43 homepage = "https://github.com/lxqt/pavucontrol-qt";
+2 -2
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
··· 12 12 , libfm-qt 13 13 , menu-cache 14 14 , lxmenu-data 15 - , lxqtUpdateScript 15 + , gitUpdater 16 16 }: 17 17 18 18 mkDerivation rec { ··· 44 44 lxmenu-data 45 45 ]; 46 46 47 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 47 + passthru.updateScript = gitUpdater { }; 48 48 49 49 postPatch = '' 50 50 substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt
+2 -2
pkgs/desktops/lxqt/qlipper/default.nix
··· 4 4 , cmake 5 5 , qtbase 6 6 , qttools 7 - , lxqtUpdateScript 7 + , gitUpdater 8 8 }: 9 9 10 10 mkDerivation rec { ··· 27 27 qttools 28 28 ]; 29 29 30 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 30 + passthru.updateScript = gitUpdater { }; 31 31 32 32 meta = with lib; { 33 33 description = "Cross-platform clipboard history applet";
+2 -2
pkgs/desktops/lxqt/qps/default.nix
··· 6 6 , liblxqt 7 7 , libqtxdg 8 8 , lxqt-build-tools 9 - , lxqtUpdateScript 9 + , gitUpdater 10 10 , qtbase 11 11 , qttools 12 12 , qtx11extras ··· 37 37 qtx11extras 38 38 ]; 39 39 40 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 40 + passthru.updateScript = gitUpdater { }; 41 41 42 42 meta = with lib; { 43 43 homepage = "https://github.com/lxqt/qps";
+2 -2
pkgs/desktops/lxqt/qterminal/default.nix
··· 7 7 , qtbase 8 8 , qttools 9 9 , qtx11extras 10 - , lxqtUpdateScript 10 + , gitUpdater 11 11 , nixosTests 12 12 }: 13 13 ··· 34 34 qtermwidget 35 35 ]; 36 36 37 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 37 + passthru.updateScript = gitUpdater { }; 38 38 39 39 passthru.tests.test = nixosTests.terminal-emulators.qterminal; 40 40
+2 -2
pkgs/desktops/lxqt/qtermwidget/default.nix
··· 6 6 , qtbase 7 7 , qttools 8 8 , lxqt-build-tools 9 - , lxqtUpdateScript 9 + , gitUpdater 10 10 }: 11 11 12 12 mkDerivation rec { ··· 30 30 qttools 31 31 ]; 32 32 33 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 33 + passthru.updateScript = gitUpdater { }; 34 34 35 35 meta = with lib; { 36 36 broken = stdenv.isDarwin;
+2 -2
pkgs/desktops/lxqt/qtxdg-tools/default.nix
··· 5 5 , qtbase 6 6 , libqtxdg 7 7 , lxqt-build-tools 8 - , lxqtUpdateScript 8 + , gitUpdater 9 9 }: 10 10 11 11 mkDerivation rec { ··· 29 29 libqtxdg 30 30 ]; 31 31 32 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 32 + passthru.updateScript = gitUpdater { }; 33 33 34 34 meta = with lib; { 35 35 homepage = "https://github.com/lxqt/qtxdg-tools";
+2 -2
pkgs/desktops/lxqt/screengrab/default.nix
··· 12 12 , perl 13 13 , xorg 14 14 , autoPatchelfHook 15 - , lxqtUpdateScript 15 + , gitUpdater 16 16 }: 17 17 18 18 mkDerivation rec { ··· 44 44 xorg.libXdmcp 45 45 ]; 46 46 47 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 47 + passthru.updateScript = gitUpdater { }; 48 48 49 49 meta = with lib; { 50 50 homepage = "https://github.com/lxqt/screengrab";
+2 -2
pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
··· 6 6 , libfm-qt 7 7 , lxqt-qtplugin 8 8 , qtx11extras 9 - , lxqtUpdateScript 9 + , gitUpdater 10 10 , extraQtStyles ? [] 11 11 }: 12 12 ··· 33 33 ] 34 34 ++ extraQtStyles; 35 35 36 - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; 36 + passthru.updateScript = gitUpdater { }; 37 37 38 38 meta = with lib; { 39 39 homepage = "https://github.com/lxqt/xdg-desktop-portal-lxqt";