From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCHES] gnu: Add livestreamer. Date: Sat, 04 Apr 2015 13:22:17 -0400 Message-ID: <87zj6ng65y.fsf@fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeRm0-0003i1-H8 for guix-devel@gnu.org; Sat, 04 Apr 2015 13:22:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeRly-0007yg-O5 for guix-devel@gnu.org; Sat, 04 Apr 2015 13:22:20 -0400 Received: from mail.fsf.org ([208.118.235.13]:50978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeRly-0007ya-JV for guix-devel@gnu.org; Sat, 04 Apr 2015 13:22:18 -0400 Received: from 209-6-40-86.c3-0.smr-ubr1.sbo-smr.ma.cable.rcn.com ([209.6.40.86]:57539 helo=izanagi) by mail.fsf.org with esmtpsa (TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1YeRly-0005Im-2Q for guix-devel@gnu.org; Sat, 04 Apr 2015 13:22:18 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain This small patch set adds livestreamer, which is like youtube-dl but for live streaming websites, and its missing dependencies. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-python-requests-Fix-Python-2-version-and-add-sup.patch Content-Transfer-Encoding: quoted-printable >From 67f1a7d362f9d379b4fa5f905b01193b5531509d Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 4 Apr 2015 13:15:40 -0400 Subject: [PATCH 1/3] gnu: python-requests: Fix Python 2 version and add support for Python 3. * gnu/packages/python.scm (python-requests): New variable. (python2-requests): Generate based on Python 3 variant. --- gnu/packages/python.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c5cae6d..8c86d5a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1571,9 +1571,9 @@ is used by the Requests library to verify HTTPS reque= sts.") (define-public python2-certifi (package-with-python2 python-certifi)) =20 -(define-public python2-requests +(define-public python-requests (package - (name "python2-requests") + (name "python-requests") (version "2.4.0") (source (origin (method url-fetch) @@ -1588,8 +1588,7 @@ is used by the Requests library to verify HTTPS reque= sts.") (inputs `(("python-setuptools" ,python-setuptools) ("python-certifi" ,python-certifi))) - (arguments `(#:tests? #f ; no tests - #:python ,python-2)) + (arguments `(#:tests? #f)) ; no tests (home-page "http://python-requests.org/") (synopsis "Python HTTP library") (description @@ -1597,6 +1596,9 @@ is used by the Requests library to verify HTTPS reque= sts.") than Python=E2=80=99s urllib2 library.") (license asl2.0))) =20 +(define-public python2-requests + (package-with-python2 python-requests)) + (define-public python-jsonschema (package (name "python-jsonschema") --=20 2.1.4 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-Add-python-singledispatch.patch >From 472370aabae4171e69eccf8927aa09337b49cfcf Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 4 Apr 2015 13:17:35 -0400 Subject: [PATCH 2/3] gnu: Add python-singledispatch. * gnu/packages/python.scm (python-singledispath, python2-singledispatch): New variables. --- gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8c86d5a..8f19f89 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3448,3 +3448,33 @@ Python style, together with a fast and comfortable execution environment.") library for Python programs. It is useful to implement low-level X clients. It is written entirely in Python.") (license gpl2+))) + +(define-public python-singledispatch + (package + (name "python-singledispatch") + (version "3.4.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/s/singledispatch/singledispatch-" + version + ".tar.gz")) + (sha256 + (base32 + "171b7ip0hsq5qm83np40h3phlr36ym18w0lay0a8v08kvy3sy1jv")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (propagated-inputs + `(("python-six" ,python-six))) + (home-page + "http://docs.python.org/3/library/functools.html#functools.singledispatch") + (synopsis "Backport of singledispatch feature from Python 3.4") + (description + "This library brings functools.singledispatch from Python 3.4 to Python +2.6-3.3.") + (license license:expat))) + +(define-public python2-singledispatch + (package-with-python2 python-singledispatch)) -- 2.1.4 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0003-gnu-Add-livestreamer.patch >From af76cababb6550081be6aaf9db45ef370b278df1 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 4 Apr 2015 13:18:40 -0400 Subject: [PATCH 3/3] gnu: Add livestreamer. * gnu/packages/video.scm (livestreamer): New variable. --- gnu/packages/video.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c6eb859..98f4a3a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1261,3 +1261,29 @@ codec library. It uses ASP features such as b-frames, global and quarter pixel motion compensation, lumi masking, trellis quantization, and H.263, MPEG and custom quantization matrices.") (license license:gpl2+))) + +(define-public livestreamer + (package + (name "livestreamer") + (version "1.12.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/chrippa/livestreamer/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "1dhgk8v8q1h3km4g5jc0cmjsxdaa2d456fvdb2wk7hmxmmwbqm9j")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; tests rely on external web servers + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (propagated-inputs + `(("python-requests" ,python-requests) + ("python-singledispatch" ,python-singledispatch))) + (synopsis "Internet video stream viewer") + (description "Livestreamer is a command-line utility that extracts streams +from various services and pipes them into a video playing application.") + (home-page "http://livestreamer.io/") + (license license:bsd-2))) -- 2.1.4 --=-=-= Content-Type: text/plain -- David Thompson Web Developer - Free Software Foundation - http://fsf.org GPG Key: 0FF1D807 Support the FSF: https://fsf.org/donate --=-=-=--