From be590c34c62ff4c3a65064bf4f620ee1d07722fa Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 23 Apr 2022 15:07:16 -0400 Subject: [PATCH] mirakurun: use gitUpdater --- pkgs/applications/video/mirakurun/default.nix | 6 ++---- pkgs/applications/video/mirakurun/update.nix | 10 +++------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix index 53f1467ee8e..d0d52ade25a 100644 --- a/pkgs/applications/video/mirakurun/default.nix +++ b/pkgs/applications/video/mirakurun/default.nix @@ -6,9 +6,8 @@ { lib , stdenvNoCC , bash -, common-updater-scripts , fetchFromGitHub -, genericUpdater +, gitUpdater , jq , makeWrapper , mkYarnPackage @@ -80,8 +79,7 @@ stdenvNoCC.mkDerivation rec { inherit pname version - common-updater-scripts - genericUpdater + gitUpdater writers jq yarn diff --git a/pkgs/applications/video/mirakurun/update.nix b/pkgs/applications/video/mirakurun/update.nix index 18a4d0ab256..6fd13f81b87 100644 --- a/pkgs/applications/video/mirakurun/update.nix +++ b/pkgs/applications/video/mirakurun/update.nix @@ -2,8 +2,7 @@ , version , homepage , lib -, common-updater-scripts -, genericUpdater +, gitUpdater , writers , jq , yarn @@ -11,15 +10,12 @@ }: let - updater = genericUpdater { + updater = gitUpdater { inherit pname version; attrPath = lib.toLower pname; # exclude prerelease versions - versionLister = writers.writeBash "list-mirakurun-versions" '' - ${common-updater-scripts}/bin/list-git-tags --url=${homepage} \ - | grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$' - ''; + ignoredVersions = "-"; }; updateScript = builtins.elemAt updater 0; updateArgs = map (lib.escapeShellArg) (builtins.tail updater);