From patchwork Mon Feb 25 18:38:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timo Eisenmann X-Patchwork-Id: 1242 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 F2BF916CAF; Mon, 25 Feb 2019 18:46:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8915416C9E for ; Mon, 25 Feb 2019 18:46:12 +0000 (GMT) Received: from localhost ([127.0.0.1]:42781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyLGW-0004iM-09 for patchwork@mira.cbaines.net; Mon, 25 Feb 2019 13:46:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyLGP-0004er-Kc for guix-patches@gnu.org; Mon, 25 Feb 2019 13:46:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyLGO-0005dx-Lj for guix-patches@gnu.org; Mon, 25 Feb 2019 13:46:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38192) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gyLGM-0005Z1-3j for guix-patches@gnu.org; Mon, 25 Feb 2019 13:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gyLGL-0001J8-NF for guix-patches@gnu.org; Mon, 25 Feb 2019 13:46:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34653] [PATCH] gnu: twitchy: Update to 3.4. Resent-From: Timo Eisenmann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Feb 2019 18:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34653@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15511203294982 (code B ref -1); Mon, 25 Feb 2019 18:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Feb 2019 18:45:29 +0000 Received: from localhost ([127.0.0.1]:51736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gyLFl-0001IF-OC for submit@debbugs.gnu.org; Mon, 25 Feb 2019 13:45:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gyLFj-0001I2-Og for submit@debbugs.gnu.org; Mon, 25 Feb 2019 13:45:24 -0500 Received: from lists.gnu.org ([209.51.188.17]:32776) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyLFe-0004UZ-FZ for submit@debbugs.gnu.org; Mon, 25 Feb 2019 13:45:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyLFY-00047v-3a for guix-patches@gnu.org; Mon, 25 Feb 2019 13:45:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyLFW-0004FN-LS for guix-patches@gnu.org; Mon, 25 Feb 2019 13:45:12 -0500 Received: from mout0.freenet.de ([2001:748:100:40::2:2]:59770) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gyLFW-00040o-Br for guix-patches@gnu.org; Mon, 25 Feb 2019 13:45:10 -0500 Received: from [195.4.92.164] (helo=mjail1.freenet.de) by mout0.freenet.de with esmtpa (ID eisenmann@fn.de) (port 25) (Exim 4.90_1 #2) id 1gyLFP-0004IZ-El for guix-patches@gnu.org; Mon, 25 Feb 2019 19:45:03 +0100 Received: from [::1] (port=58450 helo=mjail1.freenet.de) by mjail1.freenet.de with esmtpa (ID eisenmann@fn.de) (Exim 4.90_1 #2) id 1gyLFP-00058B-E0 for guix-patches@gnu.org; Mon, 25 Feb 2019 19:45:03 +0100 Received: from sub5.freenet.de ([195.4.92.124]:46728) by mjail1.freenet.de with esmtpa (ID eisenmann@fn.de) (Exim 4.90_1 #2) id 1gyLCs-0002Cy-1D for guix-patches@gnu.org; Mon, 25 Feb 2019 19:42:26 +0100 Received: from p200300d403f10100d25099fffe70e609.dip0.t-ipconnect.de ([2003:d4:3f1:100:d250:99ff:fe70:e609]:56518 helo=gnu.fritz.box) by sub5.freenet.de with esmtpsa (ID eisenmann@fn.de) (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (port 587) (Exim 4.90_1 #2) id 1gyLCr-0000AV-OQ; Mon, 25 Feb 2019 19:42:26 +0100 From: Timo Eisenmann Date: Mon, 25 Feb 2019 19:38:54 +0100 Message-Id: <20190225183854.32008-1-eisenmann@fn.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Originated-At: 2003:d4:3f1:100:d250:99ff:fe70:e609!56518 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: , Cc: Timo Eisenmann Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm: (twitchy): Update to 3.4. [arguments]: Add phase 'patch-paths' to substitute in the absolute path to 'streamlink'. --- gnu/packages/video.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b0c875befe..52f151bd78 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2018 Mark Meyer ;;; Copyright © 2018 Gábor Boskovit ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019 Timo Eisenmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -1999,10 +2000,10 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (deprecated-package "livestreamer" streamlink)) (define-public twitchy - (let ((commit "0c0f925b9c7ff2aed4a3b0046561cb794143c398")) ;Fixes tests. + (let ((commit "9beb36d80b16662414129693e74fa3a2fd97554e")) ; 3.4 has no tag (package (name "twitchy") - (version (git-version "3.2" "1" commit)) + (version (git-version "3.4" "1" commit)) (source (origin (method git-fetch) @@ -2012,11 +2013,18 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (file-name (git-file-name name version)) (sha256 (base32 - "02aizvsr744sh8bdqvwwsmp2qpczlzn8fy76h5dyd3517n9nlcz9")))) + "0di03h1j9ipp2bbnxxlxz07v87icyg2hmnsr4s7184z5ql8kpzr7")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "twitchy/twitchy_play.py" + (("\"streamlink ") + (string-append "\"" (assoc-ref inputs "streamlink") + "/bin/streamlink "))) + #t)) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) ;Needs to write to ‘$HOME’.