diff options
author | José Romildo <malaquias@gmail.com> | 2022-02-20 22:11:49 -0300 |
---|---|---|
committer | José Romildo <malaquias@gmail.com> | 2022-02-21 13:01:49 -0300 |
commit | ba59355e8105035382b2f4056a97b1ffcd1bb70a (patch) | |
tree | ec5ac6cc16144a581e5913ce032320c2d3d2a4bf /pkgs/desktops | |
parent | 60966b5a6ebfb22b16c1400b28eb0f668a0412d3 (diff) | |
download | nixpkgs-ba59355e8105035382b2f4056a97b1ffcd1bb70a.tar nixpkgs-ba59355e8105035382b2f4056a97b1ffcd1bb70a.tar.gz nixpkgs-ba59355e8105035382b2f4056a97b1ffcd1bb70a.tar.bz2 nixpkgs-ba59355e8105035382b2f4056a97b1ffcd1bb70a.tar.lz nixpkgs-ba59355e8105035382b2f4056a97b1ffcd1bb70a.tar.xz nixpkgs-ba59355e8105035382b2f4056a97b1ffcd1bb70a.tar.zst nixpkgs-ba59355e8105035382b2f4056a97b1ffcd1bb70a.zip |
gitUpdater: init
- Add the 'gitUpdater' helper function to update git based packages, using the 'genericUpdater' function. - Rework argument passing to the `list-git-tags' and 'list-archive-two-level-versions' scripts. - Replace 'genericUpdater' plus 'list-git-tags' by 'gitUpdater'
Diffstat (limited to 'pkgs/desktops')
23 files changed, 31 insertions, 38 deletions
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 062ca4abfe8..5404c0c7753 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -4,10 +4,9 @@ let # Update script tailored to LXQt packages from git repository lxqtUpdateScript = { pname, version, src }: - pkgs.genericUpdater { + pkgs.gitUpdater { inherit pname version; attrPath = "lxqt.${pname}"; - versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; # For compiling information, see: diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index e9822f0242d..17107ea8947 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -10,7 +10,7 @@ let pkgs.genericUpdater { inherit pname version odd-unstable; attrPath = "mate.${pname}"; - versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions ${url}"; + versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions --url=${url}"; }; atril = callPackage ./atril { }; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index ebac46692c0..e0fc06135e1 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -9,8 +9,7 @@ , gobject-introspection , wrapGAppsHook , glib -, genericUpdater -, common-updater-scripts +, gitUpdater }: python3Packages.buildPythonApplication rec { @@ -74,10 +73,9 @@ python3Packages.buildPythonApplication rec { done ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "mate.${pname}"; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; meta = with lib; { diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index f38dacf0dbb..7def10fb597 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }) ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister "apps" pname; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix index 8c4dff80747..209547ea67c 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index 2c84c619c64..10270c7fde9 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-MhTV8A6XA7XoyefDKH1gbe3scoXOtNXbMy6TraZv1XU="; }; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 2340a57c22d..de418dd432c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -3,13 +3,10 @@ lib.makeScope pkgs.newScope (self: with self; { #### NixOS support - updateScript = pkgs.genericUpdater; - - gitLister = url: - "${pkgs.common-updater-scripts}/bin/list-git-tags ${url}"; + genericUpdater = pkgs.genericUpdater; archiveLister = category: name: - "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions https://archive.xfce.org/src/${category}/${name}"; + "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions --url=https://archive.xfce.org/src/${category}/${name}"; mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index 8ff0d83cae3..261178381e4 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook, gitUpdater }: { category , pname @@ -41,9 +41,8 @@ let pos = builtins.unsafeGetAttrPos "pname" args; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable; - versionLister = xfce.gitLister src.meta.homepage; }; meta = with lib; { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index dd74a0653b8..68e44437629 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { hicolor-icon-theme ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index 76868bcd550..c79e30a6580 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { gtk2 ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index 3ee90788137..17fa349a1d9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix index 084cb764c62..1ba214611a6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix index 9700d515fbc..1f7225fe958 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index 455370ca38b..2e6d0e297bb 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libgcrypt ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index 1f935ac4a4d..da2c4298ec4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { exo ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index ec64a60fb54..e7f20a0ec7a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, pkg-config, fetchFromGitHub, python3, vala -, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }: +, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce +, gitUpdater +}: stdenv.mkDerivation rec { pname = "xfce4-namebar-plugin"; @@ -20,10 +22,9 @@ stdenv.mkDerivation rec { substituteInPlace src/preferences.vala --replace 'var dir_strings = Environment.get_system_data_dirs()' "string[] dir_strings = { \"$out/share\" }" ''; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "xfce.${pname}"; - versionLister = xfce.gitLister src.meta.homepage; rev-prefix = "v"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index c2a7aa694d7..124bbfe8a63 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { xfconf ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index c45fba5ebd7..8edface25a8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index 7236eb97d6d..ccdc051982f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { xfconf ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index 35840b9d244..ad4add40c5b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index 4ce0fae5a39..f6a9bef823f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.genericUpdater { inherit pname version; attrPath = "xfce.${pname}"; versionLister = xfce.archiveLister category pname; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index 6a2386e0f89..5e5e6c8aa69 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce, gitUpdater }: stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "xfce.${pname}"; - versionLister = xfce.gitLister src.meta.homepage; rev-prefix = "v"; }; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 75ef2491fe1..e056c90a550 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -6,6 +6,7 @@ , cmake , ninja , xfce +, gitUpdater }: stdenv.mkDerivation rec { @@ -30,10 +31,9 @@ stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "xfce.thunar-dropbox-plugin"; - versionLister = xfce.gitLister src.meta.homepage; }; meta = with lib; { |