about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-09-15 22:26:15 +0100
committerGitHub <noreply@github.com>2018-09-15 22:26:15 +0100
commit7b93f7a264330138fd706d84b445f0eed21211fa (patch)
treed131312c3876f1f49f8877efdf48cbb63a1c5e3e
parent13c500ae165b3e3f3237667895099d498aef64bd (diff)
parent74047ea68683a71b909145fdfaa13c6ba0d44622 (diff)
downloadnixlib-7b93f7a264330138fd706d84b445f0eed21211fa.tar
nixlib-7b93f7a264330138fd706d84b445f0eed21211fa.tar.gz
nixlib-7b93f7a264330138fd706d84b445f0eed21211fa.tar.bz2
nixlib-7b93f7a264330138fd706d84b445f0eed21211fa.tar.lz
nixlib-7b93f7a264330138fd706d84b445f0eed21211fa.tar.xz
nixlib-7b93f7a264330138fd706d84b445f0eed21211fa.tar.zst
nixlib-7b93f7a264330138fd706d84b445f0eed21211fa.zip
Merge pull request #46708 from AndersonTorres/upload/youtube-dl
youtube-dl: 2018.08.04 -> 2018.09.10
-rw-r--r--pkgs/tools/misc/youtube-dl/default.nix20
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index e497f2a698c7..d688e5fe6625 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,29 +16,21 @@
 buildPythonPackage rec {
 
   pname = "youtube-dl";
-  version = "2018.09.01";
+  version = "2018.09.10";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036";
+    sha256 = "12gd84i5drc2z4wzah7r2vj8fkj9yilm7q8dm7q9n95abrdb7sh8";
   };
 
-  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;
 
-  # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
-  # rtmpdump is required to download files over RTMP
-  # atomicparsley for embedding thumbnails
+  # Ensure these utilities are available in $PATH:
+  # - ffmpeg: post-processing & transcoding support
+  # - rtmpdump: download files over RTMP
+  # - atomicparsley: embedding thumbnails
   makeWrapperArgs = let
       packagesToBinPath =
         [ atomicparsley ]