From patchwork Sat Aug 6 05:28:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kiasoc5 X-Patchwork-Id: 41307 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D08127BBEA; Sat, 6 Aug 2022 06:30:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8E0AB27BBE9 for ; Sat, 6 Aug 2022 06:30:31 +0100 (BST) Received: from localhost ([::1]:55650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKCOM-0007WQ-NR for patchwork@mira.cbaines.net; Sat, 06 Aug 2022 01:30:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKCNw-0007CS-8V for guix-patches@gnu.org; Sat, 06 Aug 2022 01:30:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42950) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oKCNv-0003AS-Vc for guix-patches@gnu.org; Sat, 06 Aug 2022 01:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oKCNv-0002HR-Oy for guix-patches@gnu.org; Sat, 06 Aug 2022 01:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56983] [PATCH 2/2] gnu: yt-dlp: Use new package style. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Aug 2022 05:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56983 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56983@debbugs.gnu.org Cc: kiasoc5 Received: via spool by 56983-submit@debbugs.gnu.org id=B56983.16597637848682 (code B ref 56983); Sat, 06 Aug 2022 05:30:03 +0000 Received: (at 56983) by debbugs.gnu.org; 6 Aug 2022 05:29:44 +0000 Received: from localhost ([127.0.0.1]:60930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKCNb-0002Fx-Jt for submit@debbugs.gnu.org; Sat, 06 Aug 2022 01:29:43 -0400 Received: from knopi.disroot.org ([178.21.23.139]:38708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKCNZ-0002Fp-LR for 56983@debbugs.gnu.org; Sat, 06 Aug 2022 01:29:42 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0806540F49; Sat, 6 Aug 2022 07:29:41 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7T3HlNrkFBsM; Sat, 6 Aug 2022 07:29:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1659763779; bh=z24jTWhx/H+/cYQVpJIR8XLZtLY9i9vWX6Mt6c485u4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=D+3dZo4elrDZ5WQXPXO3pM+ifj+B/5JRLXz8vZDfuCPyx8D42PX2PNlwPtu0NcoeC CcvgE78MIIbSHI3tZ/DkwJ7yphCRh5A8dLqf3lJeMdyHjMnAHeSRfE3YJnv0eRr79Y vPhLzXJLUj4sWNMHFYkBFdRr69ApZHMEgfx8NXU9b/Xewb+ArrAJy8HDgqk3QiurFN 9pvWgKjGINoMx18XhDIPSHP12PwKPlgazTRRCPICNvf+1QLElF3R3UfTiSXJT5qPVv dbYoFQG34kRI/Zz1rzy6FjRn6V61Twr3SnFcounM2A4iVa4wAyqYgU3iHdcutYpipn jjR++iRTlQhhg== Date: Sat, 6 Aug 2022 01:28:37 -0400 Message-Id: <20220806052833.183236-3-kiasoc5@disroot.org> In-Reply-To: <20220806052833.183236-1-kiasoc5@disroot.org> References: <20220806052833.183236-1-kiasoc5@disroot.org> Mime-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches X-Patchwork-Original-From: kiasoc5 via Guix-patches via From: kiasoc5 X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm (yt-dlp)[source](snippet): Rewrite snippet as a gexp. [arguments]: Use gexps. [inputs]: Use new style. [native-inputs]: Likewise. --- gnu/packages/video.scm | 85 +++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 017c0d3857..c681165f2e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2484,53 +2484,52 @@ (define-public yt-dlp (base32 "1wmzfqhysx1mqdba4ikvm6nbahasihi4xgqwqad20y3vs701slyj")) (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")))))) + #~(begin + ;; Delete the pre-generated files, except for the man page + ;; which requires 'pandoc' to build. + (for-each delete-file + (list "yt-dlp" + ;;pandoc is needed to generate + ;;"yt-dlp.1" + "completions/bash/yt-dlp" + "completions/fish/yt-dlp.fish" + "completions/zsh/_yt-dlp")))))) (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_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")))))))) + (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))) (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