From patchwork Sat Mar 14 14:42:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 20671 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 8A79327BBEA; Sat, 14 Mar 2020 14:43:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 134B527BBE4 for ; Sat, 14 Mar 2020 14:43:13 +0000 (GMT) Received: from localhost ([::1]:45488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jD80O-0006Tm-JJ for patchwork@mira.cbaines.net; Sat, 14 Mar 2020 10:43:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53212) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jD80F-0006TO-N9 for guix-patches@gnu.org; Sat, 14 Mar 2020 10:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jD80E-0001CX-O0 for guix-patches@gnu.org; Sat, 14 Mar 2020 10:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jD80E-0001AH-JH for guix-patches@gnu.org; Sat, 14 Mar 2020 10:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jD80E-0001q3-H6 for guix-patches@gnu.org; Sat, 14 Mar 2020 10:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40060] [PATCH 1/2] gnu: youtube-dl: Use ffmpeg and pycryptodome Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Mar 2020 14:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40060 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40060@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15841969587029 (code B ref -1); Sat, 14 Mar 2020 14:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Mar 2020 14:42:38 +0000 Received: from localhost ([127.0.0.1]:33818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jD7zp-0001pD-LL for submit@debbugs.gnu.org; Sat, 14 Mar 2020 10:42:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:51560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jD7zn-0001p4-PE for submit@debbugs.gnu.org; Sat, 14 Mar 2020 10:42:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52955) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jD7zm-0006Rw-Jk for guix-patches@gnu.org; Sat, 14 Mar 2020 10:42:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jD7zi-0006ai-Sc for guix-patches@gnu.org; Sat, 14 Mar 2020 10:42:32 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:52389) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jD7zh-0006PZ-Bc for guix-patches@gnu.org; Sat, 14 Mar 2020 10:42:29 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 41B101BF204 for ; Sat, 14 Mar 2020 14:42:25 +0000 (UTC) From: Brice Waegeneire Date: Sat, 14 Mar 2020 15:42:20 +0100 Message-Id: <20200314144221.17112-1-brice@waegenei.re> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200314143418.13963-1-brice@waegenei.re> References: <20200314143418.13963-1-brice@waegenei.re> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm (youtube-dl)[arguments]: Add phase wrap-executable. [inputs]: Add ffmpeg. [propagated-inputs]: Add python-pycryptodome. --- gnu/packages/video.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 074a1235a3..4ca037532f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Josh Holland +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1580,7 +1581,19 @@ To load this plugin, specify the following option when starting mpv: (string-append "'" prefix "/etc/")) (("'share/") (string-append "'" prefix "/share/"))) - #t)))))) + #t))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ffmpeg (assoc-ref inputs "ffmpeg"))) + (wrap-program (string-append out "/bin/youtube-dl") + `("PATH" ":" prefix + ,(list (string-append ffmpeg "/bin"))))) + #t))))) + (inputs + `(("ffmpeg" ,ffmpeg))) + (propagated-inputs + `(("python-pycryptodome" ,python-pycryptodome))) (synopsis "Download videos from YouTube.com and other sites") (description "Youtube-dl is a small command-line program to download videos from From patchwork Sat Mar 14 14:42:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 20672 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 EEFB727BBEA; Sat, 14 Mar 2020 14:43:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C279027BBE4 for ; Sat, 14 Mar 2020 14:43:13 +0000 (GMT) Received: from localhost ([::1]:45490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jD80P-0006UP-Bp for patchwork@mira.cbaines.net; Sat, 14 Mar 2020 10:43:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53218) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jD80G-0006TP-14 for guix-patches@gnu.org; Sat, 14 Mar 2020 10:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jD80F-0001Ge-2P for guix-patches@gnu.org; Sat, 14 Mar 2020 10:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jD80E-0001FI-VP for guix-patches@gnu.org; Sat, 14 Mar 2020 10:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jD80E-0001qB-Ty for guix-patches@gnu.org; Sat, 14 Mar 2020 10:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40060] [PATCH 2/2] gnu: youtube-dl: Add zsh completion Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Mar 2020 14:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40060 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40060@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15841969607037 (code B ref -1); Sat, 14 Mar 2020 14:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Mar 2020 14:42:40 +0000 Received: from localhost ([127.0.0.1]:33820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jD7zr-0001pR-PI for submit@debbugs.gnu.org; Sat, 14 Mar 2020 10:42:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:49452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jD7zp-0001pC-HG for submit@debbugs.gnu.org; Sat, 14 Mar 2020 10:42:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52972) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jD7zo-0006S0-85 for guix-patches@gnu.org; Sat, 14 Mar 2020 10:42:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jD7zm-0006jK-IU for guix-patches@gnu.org; Sat, 14 Mar 2020 10:42:35 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:42393) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jD7zj-0006aB-Gz for guix-patches@gnu.org; Sat, 14 Mar 2020 10:42:32 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 96EB540005 for ; Sat, 14 Mar 2020 14:42:29 +0000 (UTC) From: Brice Waegeneire Date: Sat, 14 Mar 2020 15:42:21 +0100 Message-Id: <20200314144221.17112-2-brice@waegenei.re> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200314143418.13963-1-brice@waegenei.re> References: <20200314143418.13963-1-brice@waegenei.re> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm (youtube-dl)[arguments]: Add phase install-completion. --- gnu/packages/video.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4ca037532f..38f376c7e4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1582,6 +1582,15 @@ To load this plugin, specify the following option when starting mpv: (("'share/") (string-append "'" prefix "/share/"))) #t))) + (add-after 'install 'install-completion + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (zsh (string-append out + "/share/zsh/site-functions"))) + (mkdir-p zsh) + (copy-file "youtube-dl.zsh" + (string-append zsh "/_youtube-dl")) + #t))) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))