From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GJNqOnkmdmHaYQAAgWs5BA (envelope-from ) for ; Mon, 25 Oct 2021 05:37:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UALrNXkmdmFCNgAAbx9fmQ (envelope-from ) for ; Mon, 25 Oct 2021 03:37:29 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 455233793E for ; Mon, 25 Oct 2021 05:37:29 +0200 (CEST) Received: from localhost ([::1]:40430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meqnf-0002ZA-Vt for larch@yhetil.org; Sun, 24 Oct 2021 23:37:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meqnG-0002Yl-CC for guix-patches@gnu.org; Sun, 24 Oct 2021 23:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1meqnG-0003oK-33 for guix-patches@gnu.org; Sun, 24 Oct 2021 23:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1meqnF-0006QU-Tq for guix-patches@gnu.org; Sun, 24 Oct 2021 23:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51179] [PATCH] gnu: Add yt-dlp. Resent-From: Robin Templeton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Oct 2021 03:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51179 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 51179@debbugs.gnu.org Received: via spool by 51179-submit@debbugs.gnu.org id=B51179.163513300124669 (code B ref 51179); Mon, 25 Oct 2021 03:37:01 +0000 Received: (at 51179) by debbugs.gnu.org; 25 Oct 2021 03:36:41 +0000 Received: from localhost ([127.0.0.1]:41373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meqmn-0006PY-7G for submit@debbugs.gnu.org; Sun, 24 Oct 2021 23:36:41 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:49444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meqml-0006PK-8Z for 51179@debbugs.gnu.org; Sun, 24 Oct 2021 23:36:31 -0400 Received: from [2603:6081:2241:752:71c3:6c06:a290:62ae] (helo=cervus) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1meqmf-0007bI-KN; Sun, 24 Oct 2021 23:36:25 -0400 From: Robin Templeton References: <87pms9mf7a.fsf@terpri.org> <87ee8pm6sn.fsf_-_@terpri.org> <99268fb747b2278cc0e279c5efc83f5bbbfaccf1.camel@gmail.com> <8735opvlvd.fsf@terpri.org> Date: Sun, 24 Oct 2021 23:36:24 -0400 In-Reply-To: <8735opvlvd.fsf@terpri.org> (Robin Templeton's message of "Sun, 24 Oct 2021 23:12:06 -0400") Message-ID: <87wnm1u66f.fsf_-_@terpri.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635133049; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=G80mdnO6PAbNvw675qUmRTe0EAUGwzdCwG9NrrN7ALo=; b=hisS7YNasYVCcEN60vZxFigzsipiLntWBsWC7IV038VFiMIFUeZqmls8luw9esGUpZQ5Ty NsZPf+YpPgJ7e10BZYqiS37ssKrO4ISIg2Ci7TMjOXyusqJeQfUjsUVAciMZqoFRgXx3uq CznJ7KGitigWGM1D1HyU6Wb1Nna7xtz4wvKyXOboAHVFk3N9+d+3E1WeR/QY8lFUR9De1T tdW1Yzl+5Ek1AJH/PjG3YrsFOArLhimolHNPV5b40FfRmLEcqYa6HB3Cua4Rd8OomlgLeM qPWmrvJqMRkoyrVDpZQPFAe5NhtOiDhuasnr98SpJGDT7vfhHSHGE5Pj8/D/xg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635133049; a=rsa-sha256; cv=none; b=ceH9+LYVTiK/DbHoWgui2L84/XRAWYXLc2UurcoI8D/v72iyil47ISC7u57ml0fDpCpmAP esA9CArpeXBVSWfOf8DeJvKMvEDq5Oki4UGGJD5YXEIZwcr0kbF2vUYk2JIdhhbe4laE+P sL8MsbFvECgJwnhiQa2TVp2Qtu2Y8yggSSR6x6e/GeLUFcao4faSI39cg7Bszj4iW7YRHF UdNsAk/HLgWnSzVsTmgsleCziTnKPv4kkESnLHhdvlSUUGfKlIjSD4QFbNuTKhpaeA9brC JfdTiuig4JFlTw+bmTZZxjPMViZa6b3NNa8UzGXBuG74jSRz41gyT0oYwva2mw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.83 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 455233793E X-Spam-Score: -2.83 X-Migadu-Scanner: scn1.migadu.com X-TUID: PbT0iTpK5gAZ * gnu/packages/video.scm (yt-dlp): New variable. Co-authored-by: Morgan Smith Suggested-by: bdju --- 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 =C2=A9 2020 Hartmut Goebel ;;; Copyright =C2=A9 2021 Raghav Gururajan ;;; Copyright =C2=A9 2021 Petr Hodina +;;; Copyright =C2=A9 2021 Robin Templeton ;;; ;;; 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))) =20 +(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 + "0xh4cwmvx49pxn8x07wj2dy8ynj6xg8977l5493vv0l8zc27wp87")) + (snippet + '(begin + ;; Delete the pre-generated files, except for the man pa= ge + ;; 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")))) + #t)) + (replace 'build-generated-files + (lambda _ + ;; Avoid the yt-dlp.1 target, which requires pandoc. + (invoke "make" "PYTHON=3Dpython" "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))) + (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"))) + (define-public youtube-dl-gui (package (name "youtube-dl-gui") --=20 2.33.0