Package: guix-patches;
Reported by: Robin Templeton <robin <at> terpri.org>
Date: Wed, 13 Oct 2021 09:51:01 UTC
Severity: normal
Tags: patch
Merged with 51363
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: help-debbugs <at> gnu.org (GNU bug Tracking System) To: Robin Templeton <robin <at> terpri.org> Subject: bug#51179: closed (Re: bug#51179: [PATCH] gnu: Add yt-dlp.) Date: Tue, 26 Oct 2021 12:55:02 +0000
[Message part 1 (text/plain, inline)]
Your bug report #51179: [PATCH] gnu: Add yt-dlp. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 51179 <at> debbugs.gnu.org. -- 51179: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=51179 GNU Bug Tracking System Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Robin Templeton <robin <at> terpri.org> Cc: 51179-done <at> debbugs.gnu.org Subject: Re: bug#51179: [PATCH] gnu: Add yt-dlp. Date: Tue, 26 Oct 2021 14:54:30 +0200Hi, 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 <at> outlook.com> > Suggested-by: bdju <bdju <at> 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 <at> crazy-compilers.com> > ;;; Copyright © 2021 Raghav Gururajan <rg <at> raghavgururajan.name> > ;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com> > +;;; Copyright © 2021 Robin Templeton <robin <at> 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
[Message part 3 (message/rfc822, inline)]
From: Robin Templeton <robin <at> terpri.org> To: guix-patches <at> gnu.org Subject: [PATCH] gnu: Add yt-dlp. Date: Wed, 13 Oct 2021 05:44:41 -0400* gnu/packages/video.scm (yt-dlp): New variable. Suggested-by: bdju <bdju <at> tilde.team> --- gnu/packages/video.scm | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fcac369f60..1aceac25eb 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2360,6 +2360,77 @@ YouTube.com and many more sites.") (home-page "https://yt-dl.org") (license license:public-domain))) +(define-public yt-dlp + (package + (name "yt-dlp") + (version "2021.10.10") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/yt-dlp/yt-dlp/" + "releases/download/" + version "/yt-dlp.tar.gz")) + (sha256 + (base32 + "1ywld4qhvsik970gbac1h3kvxb74r7150m5axq9r5nffdw5sz3vd")) + (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)))) + (build-system python-build-system) + (arguments + ;; The problem here is that the directory for the man page and completion + ;; files is relative, and for some reason, setup.py uses the + ;; auto-detected sys.prefix instead of the user-defined "--prefix=FOO". + ;; So, we need pass the prefix directly. + `(#:tests? #f ; Many tests fail. The test suite can be run with pytest. + #:phases (modify-phases %standard-phases + (add-after 'unpack 'default-to-the-ffmpeg-input + (lambda _ + ;; See <https://issues.guix.gnu.org/43418#5>. + ;; ffmpeg is big but required to request free formats + ;; from, e.g., YouTube so pull it in unconditionally. + ;; Continue respecting the --ffmpeg-location argument. + (substitute* "yt_dlp/postprocessor/ffmpeg.py" + (("\\.get\\('ffmpeg_location'\\)" match) + (format #f "~a or '~a'" match (which "ffmpeg")))) + #t)) + (add-before 'build 'build-generated-files + (lambda _ + ;; Avoid the make targets that require pandoc. + (invoke "make" + "PYTHON=python" + "yt-dlp" + ;;"youtube-dl.1" ; needs pandoc + "completions"))) + (add-before 'install '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)))))) + (native-inputs + `(("zip" ,zip))) + (inputs + `(("ffmpeg" ,ffmpeg))) + (synopsis "Download videos from YouTube.com and other sites") + (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") + (license license:public-domain))) + (define-public youtube-dl-gui (package (name "youtube-dl-gui") -- 2.33.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.