From ade0431ba6ce03ad673554dbcb1f533f6425be42 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 16 Jun 2021 22:41:51 -0400 Subject: [PATCH] kodi.packages.jellyfin: 0.7.1 -> 0.7.4 --- .../video/kodi-packages/jellyfin/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/jellyfin/default.nix b/pkgs/applications/video/kodi-packages/jellyfin/default.nix index 03a037ce5387..b162ca11fa8c 100644 --- a/pkgs/applications/video/kodi-packages/jellyfin/default.nix +++ b/pkgs/applications/video/kodi-packages/jellyfin/default.nix @@ -1,17 +1,17 @@ -{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals }: +{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals, websocket }: let python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]); in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "0.7.1"; + version = "0.7.4"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "0fx20gmd5xlg59ks4433qh2b3jhbs5qrnc49zi4rkqqr4jr4nhnn"; + sha256 = "1ykgz1l2gmpdlsp3fbm31q8757879i9dd13svslqykvxadg69x03"; }; nativeBuildInputs = [ @@ -19,13 +19,13 @@ buildKodiAddon rec { ]; prePatch = '' - substituteInPlace .config/generate_xml.py \ - --replace "'jellyfin-kodi/release.yaml'" "'release.yaml'" \ - --replace "'jellyfin-kodi/addon.xml'" "'addon.xml'" + # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 + substituteInPlace build.py \ + --replace "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w') as z:" "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w', strict_timestamps=False) as z:" ''; buildPhase = '' - ${python}/bin/python3 .config/generate_xml.py py3 + ${python}/bin/python3 build.py --version=py3 ''; postInstall = '' @@ -38,6 +38,7 @@ buildKodiAddon rec { six kodi-six signals + websocket ]; meta = with lib; {