From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at>
To: kiasoc5 <kiasoc5@disroot.org>, 56983@debbugs.gnu.org
Subject: [bug#56983] [PATCH] gnu: yt-dlp: Update to 2022.07.18, use gexps and new style inputs.
Date: Fri, 05 Aug 2022 10:01:42 +0200 [thread overview]
Message-ID: <26f9b3120f00ca03839ac9a8a974a61759bfcff4.camel@ist.tugraz.at> (raw)
In-Reply-To: <20220805053011.387828-1-kiasoc5@disroot.org>
Am Freitag, dem 05.08.2022 um 01:30 -0400 schrieb kiasoc5:
> * gnu/packages/video.scm (yt-dlp): Update to 2022.07.18.
-- Split --
> [arguments]: Use gexps.
> [inputs]: Use new style.
> [native-inputs]: Likewise.
For the second patch, use "gnu: yt-dlp: Use new package style." as
title.
> ---
> gnu/packages/video.scm | 70 ++++++++++++++++++++----------------------
> 1 file changed, 34 insertions(+), 36 deletions(-)
>
> diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
> index 04049fd9c8..8cd6d03688 100644
> --- a/gnu/packages/video.scm
> +++ b/gnu/packages/video.scm
> @@ -2474,7 +2474,7 @@ (define-public youtube-dl
> (define-public yt-dlp
> (package/inherit youtube-dl
> (name "yt-dlp")
> - (version "2022.06.22.1")
> + (version "2022.07.18")
> (source (origin
> (method url-fetch)
> (uri (string-append "https://github.com/yt-dlp/yt-dlp/"
> @@ -2482,7 +2482,7 @@ (define-public yt-dlp
> version "/yt-dlp.tar.gz"))
> (sha256
> (base32
> -
> "1nr6g3dhvjc10jzhyvgjrrxqhsgi3hiw8bswp8bi6bscimd9vhps"))
> +
> "1wmzfqhysx1mqdba4ikvm6nbahasihi4xgqwqad20y3vs701slyj"))
> (snippet
> '(begin
> ;; Delete the pre-generated files, except for the
> man page
Haven't checked the hash, but on the premise that it's good, LGTM.
-- Split --
> @@ -2497,40 +2497,38 @@ (define-public yt-dlp
> (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_param\\('ffmpeg_location'\\)" match)
> - (format #f "~a or '~a'" match (which
> "ffmpeg"))))))
> - (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/"))))))
> - (delete 'install-completion)
> - (replace 'check
> - (lambda* (#:key tests? #:allow-other-keys)
> - (when tests?
> - (invoke "pytest" "-k" "not download"))))))))
> - (inputs
> - `(("python-brotli" ,python-brotli)
> - ("python-certifi" ,python-certifi)
> - ("python-mutagen" ,python-mutagen)
> - ("python-pycryptodomex" ,python-pycryptodomex)
> - ("python-websockets" ,python-websockets)
> - ,@(package-inputs youtube-dl)))
> - (native-inputs
> - `(("python-pytest" ,python-pytest)
> - ,@(package-native-inputs youtube-dl)))
> + #~(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_param\\('ffmpeg_location'\\)" match)
> + (format #f "~a or '~a'" match (which
> "ffmpeg"))))))
> + (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/"))))))
> + (delete 'install-completion)
> + (replace 'check
> + (lambda* (#:key tests? #:allow-other-keys)
> + (when tests?
> + (invoke "pytest" "-k" "not download"))))))))
The indentation here seems a little off. Did you TAB in Emacs?
> + (inputs (modify-inputs (package-inputs youtube-dl)
> + (append python-brotli
> + python-certifi
> + python-mutagen
> + python-pycryptodomex
> + python-websockets)))
> + (native-inputs (modify-inputs (package-native-inputs youtube-dl)
> + (append python-pytest)))
LGTM.
Cheers
next prev parent reply other threads:[~2022-08-05 8:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-04 20:37 [bug#56983] [PATCH] gnu: yt-dlp: Update to 2022.07.18 kiasoc5 via Guix-patches via
2022-08-04 20:41 ` ( via Guix-patches via
2022-08-05 5:30 ` [bug#56983] [PATCH] gnu: yt-dlp: Update to 2022.07.18, use gexps and new style inputs kiasoc5 via Guix-patches via
2022-08-05 8:01 ` Liliana Marie Prikler [this message]
2022-08-06 5:28 ` kiasoc5 via Guix-patches via
2022-08-06 5:28 ` [bug#56983] [PATCH 1/2] gnu: yt-dlp: Update to 2022.07.18 kiasoc5 via Guix-patches via
2022-08-06 5:28 ` [bug#56983] [PATCH 2/2] gnu: yt-dlp: Use new package style kiasoc5 via Guix-patches via
2022-08-06 14:40 ` bug#56983: " Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=26f9b3120f00ca03839ac9a8a974a61759bfcff4.camel@ist.tugraz.at \
--to=liliana.prikler@ist.tugraz.at \
--cc=56983@debbugs.gnu.org \
--cc=kiasoc5@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.