--- Begin Message ---
|
Subject: |
[PATCH] gnu: Add yt-dlp. |
|
Date: |
Sat, 23 Oct 2021 16:40:14 -0400 |
From: Morgan Smith <Morgan.J.Smith@outlook.com>
* gnu/packages/video.scm (yt-dlp): New variable.
---
gnu/packages/video.scm | 46 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d2a2a08ee3..e62c606088 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -53,6 +53,7 @@
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -130,6 +131,7 @@ (define-module (gnu packages video)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages iso-codes)
@@ -143,6 +145,7 @@ (define-module (gnu packages video)
#:use-module (gnu packages markup)
#:use-module (gnu packages maths)
#:use-module (gnu packages mp3)
+ #:use-module (gnu packages music)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
#:use-module (gnu packages ocr)
@@ -2459,6 +2462,49 @@ (define-public youtube-dl-gui
other site that youtube-dl supports.")
(license license:unlicense)))
+(define-public yt-dlp
+ (package
+ (name "yt-dlp")
+ (version "2021.10.22")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/yt-dlp/yt-dlp";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1sskcp1ka8lj5464a65dpizn2zbxlmfacj0rgshc7ki7mavr5cdy"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'make-dist-files
+ (lambda _
+ (invoke "make" (string-append "PYTHON=" (which "python3"))
+ "yt-dlp.1" "completions")))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; Skipping tests that require downloading
+ (invoke "pytest" "-k" "not download")))))))
+ (propagated-inputs
+ `(("python-mutagen" ,python-mutagen)
+ ("python-pycryptodomex" ,python-pycryptodomex)
+ ("python-websockets" ,python-websockets)))
+ (inputs
+ `(("ffmpeg" ,ffmpeg)))
+ (native-inputs
+ `(("pandoc" ,pandoc)
+ ("python-pytest" ,python-pytest)))
+ (synopsis "Download videos from YouTube.com and other sites")
+ (description "yt-dlp is a youtube-dl fork. The main focus of this project
+is adding new features and patches while also keeping up to date with the
+original project.")
+ (home-page "https://github.com/yt-dlp/yt-dlp";)
+ (license license:public-domain)))
+
(define-public you-get
(package
(name "you-get")
--
2.33.1
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: bug#51179: [PATCH] gnu: Add yt-dlp. |
|
Date: |
Tue, 26 Oct 2021 14:54:30 +0200 |
|
User-agent: |
Evolution 3.34.2 |
Hi,
I've pushed this patch with the following adjustments,
Am Sonntag, den 24.10.2021, 23:36 -0400 schrieb Robin Templeton:
> * gnu/packages/video.scm (yt-dlp): New variable.
>
> Co-authored-by: Morgan Smith <Morgan.J.Smith@outlook.com>
> Suggested-by: bdju <bdju@tilde.team>
> ---
> Add check phase from Morgan's package and use latest yt-dlp release
>
> gnu/packages/video.scm | 70
> ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 70 insertions(+)
>
> diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
> index d2a2a08ee3..a2ae26987a 100644
> --- a/gnu/packages/video.scm
> +++ b/gnu/packages/video.scm
> @@ -53,6 +53,7 @@
> ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
> ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
> ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
> +;;; Copyright © 2021 Robin Templeton <robin@terpri.org>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -142,6 +143,7 @@ (define-module (gnu packages video)
> #:use-module (gnu packages man)
> #:use-module (gnu packages markup)
> #:use-module (gnu packages maths)
> + #:use-module (gnu packages music)
> #:use-module (gnu packages mp3)
> #:use-module (gnu packages ncurses)
> #:use-module (gnu packages networking)
> @@ -2360,6 +2362,74 @@ (define-public youtube-dl
> (home-page "https://yt-dl.org";)
> (license license:public-domain)))
>
> +(define-public yt-dlp
> + (package/inherit youtube-dl
> + (name "yt-dlp")
> + (version "2021.10.22")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "https://github.com/yt-dlp/yt-dlp/
> "
> + "releases/download/"
> + version "/yt-dlp.tar.gz"))
> + (sha256
> + (base32
> + "0xh4cwmvx49pxn8x07wj2dy8ynj6xg8977l5493vv0l8zc27wp8
> 7"))
> + (snippet
> + '(begin
> + ;; Delete the pre-generated files, except for the
> man page
> + ;; which requires 'pandoc' to build.
> + (for-each delete-file '("yt-dlp"
> + ;;pandoc is needed to
> generate
> + ;;"yt-dlp.1"
> + "completions/bash/yt-dlp"
> + "completions/fish/yt-
> dlp.fish"
> + "completions/zsh/_yt-
> dlp"))
> + #t))))
> + (arguments
> + (substitute-keyword-arguments (package-arguments youtube-dl)
> + ((#:tests? _) #t)
> + ((#:phases phases)
> + `(modify-phases ,phases
> + ;; See the comment for the corresponding phase in
> youtube-dl.
> + (replace 'default-to-the-ffmpeg-input
> + (lambda _
> + (substitute* "yt_dlp/postprocessor/ffmpeg.py"
> + (("\\.get\\('ffmpeg_location'\\)" match)
> + (format #f "~a or '~a'" match (which "ffmpeg"))))
"get" becomes "get_param" in yt-dlp.
> + #t))
> + (replace 'build-generated-files
> + (lambda _
> + ;; Avoid the yt-dlp.1 target, which requires pandoc.
> + (invoke "make" "PYTHON=python" "yt-dlp"
> "completions")))
> + (replace 'fix-the-data-directories
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let ((prefix (assoc-ref outputs "out")))
> + (substitute* "setup.py"
> + (("'etc/")
> + (string-append "'" prefix "/etc/"))
> + (("'share/")
> + (string-append "'" prefix "/share/"))))
> + #t))
> + (delete 'install-completion)
> + (replace 'check
> + (lambda* (#:key tests? #:allow-other-keys)
> + (when tests?
> + (invoke "pytest" "-k" "not download"))))))))
> + (inputs
> + `(("python-mutagen" ,python-mutagen)
> + ("python-pycryptodomex" ,python-pycryptodomex)
> + ("python-websockets" ,python-websockets)
> + ,@(package-propagated-inputs youtube-dl)))
Used (package-inputs) as it should be.
> + (native-inputs
> + `(("python-pytest" ,python-pytest)
> + ,@(package-native-inputs youtube-dl)))
> + (description
> + "yt-dlp is a small command-line program to download videos from
> +YouTube.com and many more sites. It is a fork of youtube-dl with a
> +focus on adding new features while keeping up-to-date with the
> +original project.")
> + (home-page "https://github.com/yt-dlp/yt-dlp";)))
Thanks
--- End Message ---