From ba59355e8105035382b2f4056a97b1ffcd1bb70a Mon Sep 17 00:00:00 2001 From: José Romildo Date: Sun, 20 Feb 2022 22:11:49 -0300 Subject: 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' --- pkgs/applications/audio/r128gain/default.nix | 10 ++-------- pkgs/applications/blockchains/nbxplorer/util/update-common.sh | 2 +- pkgs/applications/networking/shellhub-agent/default.nix | 6 ++---- pkgs/applications/version-management/git-review/default.nix | 8 ++------ pkgs/applications/video/epgstation/update.nix | 2 +- pkgs/applications/video/mirakurun/update.nix | 2 +- pkgs/applications/video/shotcut/default.nix | 6 ++---- 7 files changed, 11 insertions(+), 25 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index 96053d08d00f..af22a9dce67c 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -1,8 +1,7 @@ { lib , fetchFromGitHub -, genericUpdater +, gitUpdater , substituteAll -, common-updater-scripts , ffmpeg , python3Packages , sox @@ -33,12 +32,7 @@ python3Packages.buildPythonApplication rec { # sandbox to be disabled. doCheck = false; - passthru = { - updateScript = genericUpdater { - inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - }; - }; + passthru.updateScript = gitUpdater { inherit pname version; }; meta = with lib; { description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)"; diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index 8899bdd181de..1ca9ef3444b5 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -26,7 +26,7 @@ getRepo() { } getLatestVersionTag() { - "$nixpkgs"/pkgs/common-updater/scripts/list-git-tags https://github.com/$(getRepo) 2>/dev/null \ + "$nixpkgs"/pkgs/common-updater/scripts/list-git-tags --url=https://github.com/$(getRepo) 2>/dev/null \ | sort -V | tail -1 | sed 's|^v||' } diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 0b95023ad59d..d698601cb190 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,8 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, genericUpdater -, common-updater-scripts +, gitUpdater , makeWrapper , openssh }: @@ -25,9 +24,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; passthru = { - updateScript = genericUpdater { + updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; ignoredVersions = ".(rc|beta).*"; }; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 40061baca53e..98c9c5312e61 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -4,8 +4,7 @@ , pbr , requests , setuptools -, genericUpdater -, common-updater-scripts +, gitUpdater }: buildPythonApplication rec { @@ -42,10 +41,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "git_review" ]; - passthru.updateScript = genericUpdater { - inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - }; + passthru.updateScript = gitUpdater { inherit pname version; }; meta = with lib; { description = "Tool to submit code to Gerrit"; diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 9faa83c64f9e..5c2fbe66f04e 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -13,7 +13,7 @@ let inherit pname version; attrPath = lib.toLower pname; rev-prefix = "v"; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${homepage}"; + versionLister = "${common-updater-scripts}/bin/list-git-tags --url=${homepage}"; }; updateScript = builtins.elemAt updater 0; updateArgs = map (lib.escapeShellArg) (builtins.tail updater); diff --git a/pkgs/applications/video/mirakurun/update.nix b/pkgs/applications/video/mirakurun/update.nix index ccea2279783b..18a4d0ab2562 100644 --- a/pkgs/applications/video/mirakurun/update.nix +++ b/pkgs/applications/video/mirakurun/update.nix @@ -17,7 +17,7 @@ let # exclude prerelease versions versionLister = writers.writeBash "list-mirakurun-versions" '' - ${common-updater-scripts}/bin/list-git-tags ${homepage} \ + ${common-updater-scripts}/bin/list-git-tags --url=${homepage} \ | grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$' ''; }; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 3b6116d5a068..e996ae92d216 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -17,8 +17,7 @@ , qtgraphicaleffects , qmake , qttools -, genericUpdater -, common-updater-scripts +, gitUpdater }: assert lib.versionAtLeast mlt.version "6.24.0"; @@ -76,9 +75,8 @@ mkDerivation rec { cp -r src/qml $out/share/shotcut/ ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; -- cgit 1.4.1