From fa76f75c7bf2bcb88d3d25c1f7716c730628317d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 7 Sep 2018 21:03:38 +0200 Subject: youtube-dl: 2018.08.28 -> 2018.09.01 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7ed8f3bfd71b..8284e4af34d4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.08.28"; + version = "2018.09.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1swdp4czvm0752psbi8a4qw5i9x18s7nhivh7iw92274pmqxq9wi"; + sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From 8ef940a038c9a4bbd020f164c33a78385867dbfa Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 7 Sep 2018 21:03:57 +0200 Subject: youtube-dl: fix youtube video download --- pkgs/tools/misc/youtube-dl/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8284e4af34d4..e497f2a698c7 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, fetchpatch # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -22,6 +23,15 @@ buildPythonPackage rec { sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036"; }; + patches = [ + # https://github.com/rg3/youtube-dl/pull/17464 + (fetchpatch { + name = "youtube-js-player-fix.patch"; + url = "https://github.com/rg3/youtube-dl/pull/17464/commits/6d7359775ae4eef1d1213aae81e092467a2c675c.patch"; + sha256 = "12mwfmp7iwlawpx6r4rhz546b3anxrx6zc4nyjs8grbh5vxhj9yg"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; -- cgit 1.4.1