Merge pull request #120601 from dotlambda/streamlink-2.1.1

streamlink: 2.0.0 -> 2.1.1
This commit is contained in:
davidak 2021-04-26 12:15:20 +02:00 committed by GitHub
commit 43d751a574
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions

View File

@ -1,30 +1,29 @@
{ lib
, pythonPackages
, python3
, fetchFromGitHub
, rtmpdump
, ffmpeg_3
, ffmpeg
}:
pythonPackages.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "streamlink";
version = "2.0.0";
disabled = pythonPackages.pythonOlder "3.5.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
rev = version;
sha256 = "+W9Nu5Ze08r7IlUZOkkVOz582E1Bbj0a3qIQHwxSmj8=";
sha256 = "14vqh4pck3q766qln7c57n9bz8zrlgfqrpkdn8x0ac9zhlhfn1zm";
};
checkInputs = with pythonPackages; [
pytest
checkInputs = with python3.pkgs; [
pytestCheckHook
mock
requests-mock
freezegun
];
propagatedBuildInputs = (with pythonPackages; [
propagatedBuildInputs = (with python3.pkgs; [
pycryptodome
requests
iso-639
@ -33,7 +32,11 @@ pythonPackages.buildPythonApplication rec {
isodate
]) ++ [
rtmpdump
ffmpeg_3
ffmpeg
];
disabledTests = [
"test_plugin_not_in_removed_list"
];
meta = with lib; {

View File

@ -17629,7 +17629,7 @@ in
stlport = callPackage ../development/libraries/stlport { };
streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; };
streamlink = callPackage ../applications/video/streamlink { };
streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {};
sub-batch = callPackage ../applications/video/sub-batch { };