From 011eb16003fefbd387ce4a63d9e9c6703c09c201 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Sat, 21 Oct 2023 14:34:29 +0200 Subject: [PATCH 1/2] kodi.packages.youtube: refactor to fetch from GitHub Refactor kodi.packages.youtube to fetch sources from GitHub instead of using the official Kodi addons repository. Newer versions of the addon are not released (yet) on the official addon repository, whereas older versions of the addon don't work properly anymore with YouTube. The only resulting difference between old and new version is an additional README.md file: $ diff -r result-old result-new Only in result-new/share/kodi/addons/plugin.video.youtube: README.md Other than that, this refactoring is a no-op change and will allow us to upgrade the addon to newer versions more readily. --- .../video/kodi/addons/youtube/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index bdc4be3a23fa..50273878b424 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -1,13 +1,15 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, infotagger, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, six, requests, infotagger, inputstreamhelper }: buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; version = "7.0.1"; - src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-Wdju7d2kFX0V1J1TB75qEVq0UWN2xYYFNlD8UTt1New="; + src = fetchFromGitHub { + owner = "anxdpanic"; + repo = "plugin.video.youtube"; + rev = "v${version}"; + hash = "sha256-BHCVui+enKFH3elz6DovXMDxMQx/2+/BrIw3KQr9TfE="; }; propagatedBuildInputs = [ @@ -19,9 +21,6 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; - updateScript = addonUpdateScript { - attrPath = "kodi.packages.youtube"; - }; }; meta = with lib; { From 4b6f568a7a5b3b961ab7807239279d6ebdbb226b Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Sat, 21 Oct 2023 14:37:47 +0200 Subject: [PATCH 2/2] kodi.packages.youtube: 7.0.1 -> 7.0.2.2 --- pkgs/applications/video/kodi/addons/youtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 50273878b424..3d3683ed8776 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.1"; + version = "7.0.2.2"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-BHCVui+enKFH3elz6DovXMDxMQx/2+/BrIw3KQr9TfE="; + hash = "sha256-BUeE/8oQYBiq4XgIp4nv0hjEQz3nnkDWCnAf4kpptwk="; }; propagatedBuildInputs = [