Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

kodiPackages.jellyfin: 1.0.3 -> 1.0.4

fixes missing distutils module

+33 -11
+18 -11
pkgs/applications/video/kodi/addons/jellyfin/default.nix
··· 1 - { lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals, websocket }: 2 let 3 python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]); 4 in 5 buildKodiAddon rec { 6 pname = "jellyfin"; 7 namespace = "plugin.video.jellyfin"; 8 - version = "1.0.3"; 9 10 src = fetchFromGitHub { 11 owner = "jellyfin"; 12 repo = "jellyfin-kodi"; 13 rev = "v${version}"; 14 - sha256 = "sha256-Uyo8GClJU2/gdk4PeFNnoyvxOhooaxeXN3Wc5YGuCiM="; 15 }; 16 17 - nativeBuildInputs = [ 18 - python 19 - ]; 20 21 - prePatch = '' 22 - # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 23 - substituteInPlace build.py \ 24 - --replace "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w') as z:" "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w', strict_timestamps=False) as z:" 25 - ''; 26 27 buildPhase = '' 28 ${python}/bin/python3 build.py --version=py3
··· 1 + { 2 + lib, 3 + addonDir, 4 + buildKodiAddon, 5 + fetchFromGitHub, 6 + kodi, 7 + requests, 8 + dateutil, 9 + six, 10 + kodi-six, 11 + signals, 12 + websocket, 13 + }: 14 let 15 python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]); 16 in 17 buildKodiAddon rec { 18 pname = "jellyfin"; 19 namespace = "plugin.video.jellyfin"; 20 + version = "1.0.4"; 21 22 src = fetchFromGitHub { 23 owner = "jellyfin"; 24 repo = "jellyfin-kodi"; 25 rev = "v${version}"; 26 + sha256 = "sha256-N5ZNGeLf3P4p3RQimSaZteddKjqXE274mWpo7W9xqPs="; 27 }; 28 29 + nativeBuildInputs = [ python ]; 30 31 + # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 32 + patches = [ ./no-strict-zip-timestamp.patch ]; 33 34 buildPhase = '' 35 ${python}/bin/python3 build.py --version=py3
+15
pkgs/applications/video/kodi/addons/jellyfin/no-strict-zip-timestamp.patch
···
··· 1 + diff --git a/build.py b/build.py 2 + index 148441f3..2aa0f1ea 100755 3 + --- a/build.py 4 + +++ b/build.py 5 + @@ -69,7 +69,9 @@ def zip_files(py_version: str, source: str, target: str, dev: bool) -> None: 6 + """ 7 + archive_name = "plugin.video.jellyfin+{}.zip".format(py_version) 8 + 9 + - with zipfile.ZipFile("{}/{}".format(target, archive_name), "w") as z: 10 + + with zipfile.ZipFile( 11 + + "{}/{}".format(target, archive_name), "w", strict_timestamps=False 12 + + ) as z: 13 + for root, dirs, files in os.walk(args.source): 14 + for filename in filter(file_filter, files): 15 + file_path = os.path.join(root, filename)