git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108370 from cole-h/streamlink

streamlink: 1.5.0 -> 2.0.0, streamlink-twitch-gui-bin: 1.10.0 -> 1.11.0

commit192325c47fe64aca0b2e1879f92d1f0824c7ee28 authorWORLDofPEACE <worldofpeace@protonmail.ch> dateTue 5 Jan 2021, 16:06 (6 years ago) parent0a149af6e53a6c
2 files changed+56−14
pkgs/applications/video/streamlink-twitch-gui/bin.nix+29−8 pkgs/applications/video/streamlink/default.nix+27−6
pkgs/applications/video/streamlink-twitch-gui/bin.nix+29−8
@@ -1,8 +1,29 @@
1−{ autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook
2−, at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped
3−, gdk-pixbuf, glib, pango, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg
4−, streamlink }:
5−
1+{ autoPatchelfHook
2+, fetchurl
3+, lib
4+, makeDesktopItem
5+, makeWrapper
6+, stdenv
7+, wrapGAppsHook
8+, at-spi2-core
9+, atk
10+, alsaLib
11+, cairo
12+, cups
13+, dbus
14+, expat
15+, gcc-unwrapped
16+, gdk-pixbuf
17+, glib
18+, pango
19+, gtk3-x11
20+, libudev0-shim
21+, libuuid
22+, nss
23+, nspr
24+, xorg
25+, streamlink
26+}:
627let
728 basename = "streamlink-twitch-gui";
829 runtimeLibs = lib.makeLibraryPath [ libudev0-shim ];
@@ -16,16 +37,16 @@ let
1637in
1738stdenv.mkDerivation rec {
1839 pname = "${basename}-bin";
19− version = "1.10.0";
40+ version = "1.11.0";
2041
2142 src = fetchurl {
2243 url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz";
2344 sha256 =
2445 if arch == "linux64"
2546 then
26− "17s9zbzj4pgz9mxxwjbp3788afkddc9s3p7xp28y5084z9wwzph2"
47+ "0y96nziavvpdvrpn58p6a175kaa8cgadp19rnbm250x9cypn1d9y"
2748 else
28− "1pww05hr48m6v0g1sz48g1c7p615lig3s12l21xgyz4gkjzmjy22";
49+ "0sfmhqf55w7wavqy4idsqpkf5p7l8sapjxap6xvyzpz4z5z6xr7y";
2950 };
3051
3152 nativeBuildInputs = with xorg; [
pkgs/applications/video/streamlink/default.nix+27−6
@@ -1,21 +1,42 @@
1−{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg_3 }:
1+{ lib
2+, pythonPackages
3+, fetchFromGitHub
4+, rtmpdump
5+, ffmpeg_3
6+}:
27
38pythonPackages.buildPythonApplication rec {
4− version = "1.5.0";
59 pname = "streamlink";
10+ version = "2.0.0";
11+ disabled = pythonPackages.pythonOlder "3.5.0";
612
713 src = fetchFromGitHub {
814 owner = "streamlink";
915 repo = "streamlink";
1016 rev = version;
11− sha256 = "00pishpyim3mcvr9njcbfhj79j85b5xhkslk3mspc2csqknw4k61";
17+ sha256 = "+W9Nu5Ze08r7IlUZOkkVOz582E1Bbj0a3qIQHwxSmj8=";
1218 };
1319
14− checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
20+ checkInputs = with pythonPackages; [
21+ pytest
22+ mock
23+ requests-mock
24+ freezegun
25+ ];
1526
16− propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg_3 ];
27+ propagatedBuildInputs = (with pythonPackages; [
28+ pycryptodome
29+ requests
30+ iso-639
31+ iso3166
32+ websocket_client
33+ isodate
34+ ]) ++ [
35+ rtmpdump
36+ ffmpeg_3
37+ ];
1738
18− meta = with stdenv.lib; {
39+ meta = with lib; {
1940 homepage = "https://github.com/streamlink/streamlink";
2041 description = "CLI for extracting streams from various websites to video player of your choosing";
2142 longDescription = ''