From 74c99a1c825a4fddb9cb4fb17a3a88649f4b4238 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Thu, 18 Nov 2021 04:51:16 +0100 Subject: [PATCH] streamlink: 2.4.0 -> 3.0.1 --- .../applications/video/streamlink/default.nix | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 4abc2b6546aa..c82cfb47cc32 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,17 +1,16 @@ { lib , python3Packages -, rtmpdump , ffmpeg , fetchpatch }: python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "2.4.0"; + version = "3.0.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af"; + sha256 = "sha256-GDbUlu5tRL5mdT7KrIdmxCbeAtYL1xvZXyZFwiuvKXo="; }; checkInputs = with python3Packages; [ @@ -22,26 +21,20 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = (with python3Packages; [ - pycryptodome - requests - iso-639 - iso3166 - websocket-client isodate lxml + pycountry + pycryptodome + pysocks + requests + websocket-client ]) ++ [ - rtmpdump ffmpeg ]; - patches = [ - # Patch failing tests to expect correct Accept-Encoding as generated by Requests - (fetchpatch { - url = "https://github.com/streamlink/streamlink/commit/ae747a113199c119bced4613d33edcc67a222bb9.patch"; - includes = [ "tests/test_stream_json.py" ]; - sha256 = "sha256-KEgyWdh5DNgNktmLSvKQowUQO9p9Q7zP4NbCQJPNgKw="; - }) - ]; + postPatch = '' + substituteInPlace setup.cfg --replace 'lxml >=4.6.4,<5.0' 'lxml' + ''; meta = with lib; { homepage = "https://streamlink.github.io/";