[bug#30211] gnu: Add streamlink (program to extract streams from various services).

[bug#30211] gnu: Add streamlink (program to extract streams from various services).

[Oleg Pykhalov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH 1/4] gnu: Add python-iso639. --]
[-- Type: text/x-patch, Size: 1676 bytes --]

From 12f249e717b023a7de3c34763a9a0d7889bbf481 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Fri, 19 Jan 2018 22:58:01 +0300
Subject: [PATCH 1/4] gnu: Add python-iso639.

* gnu/packages/iso-codes.scm (python-iso639): New public variable.
---
 gnu/packages/iso-codes.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm
index ccd07706c..7ffcea871 100644
--- a/gnu/packages/iso-codes.scm
+++ b/gnu/packages/iso-codes.scm
@@ -23,6 +23,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python))
@@ -64,3 +65,24 @@ infrastructure.  Moreover, the programmer does not need to follow
 changes in the ISO standard and will not work with outdated
 information.")
     (license license:gpl2+)))           ; some bits use the lgpl2
+
+(define-public python-iso639
+  (package
+    (name "python-iso639")
+    (version "0.4.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "iso-639" version))
+       (sha256
+        (base32
+         "0jffmh4m20q8j27xb2fqbnlghjj0cx8pgsbzqisdg65qh2wd976w"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/noumar/iso639")
+    (synopsis "Python library for ISO 639 standard")
+    (description "This package provides a Python library for ISO 639
+standard.")
+    (license license:agpl3+)))
+
+(define-public python2-iso639
+  (package-with-python2 python-iso639))
-- 
2.15.1

[bug#30211] [PATCH 2/4] gnu: Add python-iso3166.

[Oleg Pykhalov]

* gnu/packages/iso-codes.scm (python-iso3166): New public variable.
---
 gnu/packages/iso-codes.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm
index 7ffcea871..f7dadbf9e 100644
--- a/gnu/packages/iso-codes.scm
+++ b/gnu/packages/iso-codes.scm
@@ -86,3 +86,23 @@ standard.")
 
 (define-public python2-iso639
   (package-with-python2 python-iso639))
+
+(define-public python-iso3166
+  (package
+    (name "python-iso3166")
+    (version "0.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "iso3166" version))
+       (sha256
+        (base32
+         "0cs9w507dj93jj9z9di93lx2fplf8pma4jkrsvvb258dv6z1gszv"))))
+    (build-system python-build-system)
+    (home-page "http://github.com/deactivated/python-iso3166")
+    (synopsis "Self-contained ISO 3166-1 country definitions")
+    (description "This package provides a ISO 3166-1 country definitions.")
+    (license license:expat)))
+
+(define-public python2-iso3166
+  (package-with-python2 python-iso3166))
-- 
2.15.1

[bug#30211] [PATCH 3/4] gnu: Add python-pycryptodome.

[Oleg Pykhalov]

* gnu/packages/python-crypto.scm (python-pycryptodome): New public variable.
---
 gnu/packages/python-crypto.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index a545f0ddc..a096fb3f5 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -715,3 +715,24 @@ protocol (Javascript Object Signing and Encryption).")
 
 (define-public python2-josepy
   (package-with-python2 python-josepy))
+
+(define-public python-pycryptodome
+  (package
+    ;; XXX: Skipping GMP tests which requires not packaged 'mpir' library.
+    (name "python-pycryptodome")
+    (version "3.4.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pycryptodome" version))
+       (sha256
+        (base32
+         "1xrsd6ql4w0ypkxnsg3fivs3r3z6dd93x44lhvam7jzh3gixzn0q"))))
+    (build-system python-build-system)
+    (home-page "http://www.pycryptodome.org")
+    (synopsis "Cryptographic library for Python")
+    (description "This package provides a cryptographic library for Python.")
+    (license license:bsd-2)))
+
+(define-public python2-pycryptodome
+  (package-with-python2 python-pycryptodome))
-- 
2.15.1

[bug#30211] [PATCH 3/4] gnu: Add python-pycryptodome.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 720 bytes --]

On Mon, Jan 22, 2018 at 11:05:24PM +0300, Oleg Pykhalov wrote:
> * gnu/packages/python-crypto.scm (python-pycryptodome): New public variable.

> +(define-public python-pycryptodome
> +  (package
> +    ;; XXX: Skipping GMP tests which requires not packaged 'mpir' library.
> +    (name "python-pycryptodome")

I don't understand this comment.

> +    (home-page "http://www.pycryptodome.org")

Please use HTTPS here.

> +    (synopsis "Cryptographic library for Python")
> +    (description "This package provides a cryptographic library for Python.")

If possible, please give a little more information in the description.
I'm specifically interested in how this library differs from the Python
'cryptography' library.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30211] [PATCH 3/4] gnu: Add python-pycryptodome.

[Oleg Pykhalov]

[-- Attachment #1.1: Type: text/plain, Size: 3052 bytes --]

Hello Leo,

Thank you for review!  I applied all and attached a new patch.

Leo Famulari <leo@famulari.name> writes:

> On Mon, Jan 22, 2018 at 11:05:24PM +0300, Oleg Pykhalov wrote:
>> * gnu/packages/python-crypto.scm (python-pycryptodome): New public variable.
>
>> +(define-public python-pycryptodome
>> +  (package
>> +    ;; XXX: Skipping GMP tests which requires not packaged 'mpir' library.
>> +    (name "python-pycryptodome")
>
> I don't understand this comment.

This is a quote from a build log.  See:
--8<---------------cut here---------------start------------->8---
starting phase `check'
running "python setup.py" with command "test" and parameters ()
running test
running build
running build_py
running build_ext
Skipping GMP tests (Cannot load library 'mpir')
Compiling support for Intel AES instructions
Crypto.Math implementation: {}

----------------------------------------------------------------------
Ran 22598 tests in 75.857s

OK
phase `check' succeeded after 84.6 seconds
--8<---------------cut here---------------end--------------->8---

Do you have an idea how to make it more clear?

>> +    (home-page "http://www.pycryptodome.org")
>
> Please use HTTPS here.

Oh, sure.  Thanks.

>> +    (synopsis "Cryptographic library for Python")
>> +    (description "This package provides a cryptographic library for Python.")
>
> If possible, please give a little more information in the description.
> I'm specifically interested in how this library differs from the Python
> 'cryptography' library.

Dunno about 'pycryptodome' Vs Python 'cryptography', but 'pycryptodome'
is a fork of PyCrypto.

From <https://www.pycryptodome.org/en/latest/src/introduction.html>:

    PyCryptodome is a fork of PyCrypto. It brings the following
    enhancements with respect to the last official version of PyCrypto
    (2.6.1):

        - Authenticated encryption modes (GCM, CCM, EAX, SIV, OCB)
        - Accelerated AES on Intel platforms via AES-NI
        - First class support for PyPy
        - Elliptic curves cryptography (NIST P-256 curve only)
        - Better and more compact API (nonce and iv attributes for
          ciphers, automatic generation of random nonces and IVs,
          simplified CTR cipher mode, and more)
        - SHA-3 (including SHAKE XOFs) and BLAKE2 hash algorithms
        - Salsa20 and ChaCha20 stream ciphers
        - scrypt and HKDF
        - Deterministic (EC)DSA
        - Password-protected PKCS#8 key containers
        - Shamir’s Secret Sharing scheme
        - Random numbers get sourced directly from the OS (and not from a
          CSPRNG in userspace)
        - Simplified install process, including better support for
          Windows
        - Cleaner RSA and DSA key generation (largely based on FIPS
          186-4)
        - Major clean ups and simplification of the code base

I pasted this into the description except:

        - Simplified install process, including better support for Windows



[-- Attachment #1.2: [PATCH 3/4] gnu: Add python-pycryptodome. --]
[-- Type: text/x-patch, Size: 2496 bytes --]

From 2318cf980af1b46ec4d3a57d1c8dde3a157b1a0e Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Fri, 19 Jan 2018 22:58:50 +0300
Subject: [PATCH] gnu: Add python-pycryptodome.

* gnu/packages/python-crypto.scm (python-pycryptodome): New public variable.
---
 gnu/packages/python-crypto.scm | 44 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index a545f0ddc..213ff69a9 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -715,3 +715,47 @@ protocol (Javascript Object Signing and Encryption).")
 
 (define-public python2-josepy
   (package-with-python2 python-josepy))
+
+(define-public python-pycryptodome
+  (package
+    ;; XXX: Skipping GMP tests which requires not packaged 'mpir' library.
+    (name "python-pycryptodome")
+    (version "3.4.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pycryptodome" version))
+       (sha256
+        (base32
+         "1xrsd6ql4w0ypkxnsg3fivs3r3z6dd93x44lhvam7jzh3gixzn0q"))))
+    (build-system python-build-system)
+    (home-page "https://www.pycryptodome.org")
+    (synopsis "Cryptographic library for Python")
+    (description "This package provides a cryptographic library for Python.
+
+It brings the following enhancements with respect to the last official version
+of PyCrypto:
+
+@itemize
+@item Authenticated encryption modes (GCM, CCM, EAX, SIV, OCB)
+@item Accelerated AES on Intel platforms via AES-NI
+@item First class support for PyPy
+@item Elliptic curves cryptography (NIST P-256 curve only)
+@item Better and more compact API (nonce and iv attributes for ciphers,
+automatic generation of random nonces and IVs, simplified CTR cipher mode, and
+more)
+@item SHA-3 (including SHAKE XOFs) and BLAKE2 hash algorithms
+@item Salsa20 and ChaCha20 stream ciphers
+@item scrypt and HKDF
+@item Deterministic (EC)DSA
+@item Password-protected PKCS#8 key containers
+@item Shamir’s Secret Sharing scheme
+@item Random numbers get sourced directly from the OS (and not from a CSPRNG
+in userspace)
+@item Cleaner RSA and DSA key generation (largely based on FIPS 186-4)
+@item Major clean ups and simplification of the code base
+@end itemize\n")
+    (license license:bsd-2)))
+
+(define-public python2-pycryptodome
+  (package-with-python2 python-pycryptodome))
-- 
2.15.1


[-- Attachment #1.3: Type: text/plain, Size: 8 bytes --]



Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30211] [PATCH 3/4] gnu: Add python-pycryptodome.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 2672 bytes --]

On Tue, Jan 23, 2018 at 01:23:31PM +0300, Oleg Pykhalov wrote:
> Leo Famulari <leo@famulari.name> writes:
> > On Mon, Jan 22, 2018 at 11:05:24PM +0300, Oleg Pykhalov wrote:
> >> +    ;; XXX: Skipping GMP tests which requires not packaged 'mpir' library.
> >
> > I don't understand this comment.
> 
> This is a quote from a build log.  See:
> --8<---------------cut here---------------start------------->8---
> starting phase `check'
> running "python setup.py" with command "test" and parameters ()
> running test
> running build
> running build_py
> running build_ext
> Skipping GMP tests (Cannot load library 'mpir')
> Compiling support for Intel AES instructions
> Crypto.Math implementation: {}
> 
> ----------------------------------------------------------------------
> Ran 22598 tests in 75.857s
> 
> OK
> phase `check' succeeded after 84.6 seconds
> --8<---------------cut here---------------end--------------->8---
> 
> Do you have an idea how to make it more clear?

I don't think we have to mention it. Many package test suites
automatically skip some subset of tests based on a variety of factors.

> > If possible, please give a little more information in the description.
> > I'm specifically interested in how this library differs from the Python
> > 'cryptography' library.
> 
> Dunno about 'pycryptodome' Vs Python 'cryptography', but 'pycryptodome'
> is a fork of PyCrypto.

> +    (description "This package provides a cryptographic library for Python.
> +
> +It brings the following enhancements with respect to the last official version
> +of PyCrypto:
> +
> +@itemize
> +@item Authenticated encryption modes (GCM, CCM, EAX, SIV, OCB)
> +@item Accelerated AES on Intel platforms via AES-NI
> +@item First class support for PyPy
> +@item Elliptic curves cryptography (NIST P-256 curve only)
> +@item Better and more compact API (nonce and iv attributes for ciphers,
> +automatic generation of random nonces and IVs, simplified CTR cipher mode, and
> +more)
> +@item SHA-3 (including SHAKE XOFs) and BLAKE2 hash algorithms
> +@item Salsa20 and ChaCha20 stream ciphers
> +@item scrypt and HKDF
> +@item Deterministic (EC)DSA
> +@item Password-protected PKCS#8 key containers
> +@item Shamir’s Secret Sharing scheme
> +@item Random numbers get sourced directly from the OS (and not from a CSPRNG
> +in userspace)
> +@item Cleaner RSA and DSA key generation (largely based on FIPS 186-4)
> +@item Major clean ups and simplification of the code base
> +@end itemize\n")

That's great! It's good to know this is a pycrypto fork. Pycrypto is
abandoned so I'm glad to see new work around it.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30211] [PATCH 3/4] gnu: Add python-pycryptodome.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 1346 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Tue, Jan 23, 2018 at 01:23:31PM +0300, Oleg Pykhalov wrote:

[...]

>> >> +    ;; XXX: Skipping GMP tests which requires not packaged 'mpir' library.

[...]

>> This is a quote from a build log.  See:
>> --8<---------------cut here---------------start------------->8---
>> starting phase `check'
>> running "python setup.py" with command "test" and parameters ()
>> running test
>> running build
>> running build_py
>> running build_ext
>> Skipping GMP tests (Cannot load library 'mpir')
>> Compiling support for Intel AES instructions
>> Crypto.Math implementation: {}
>> 
>> ----------------------------------------------------------------------
>> Ran 22598 tests in 75.857s
>> 
>> OK
>> phase `check' succeeded after 84.6 seconds
>> --8<---------------cut here---------------end--------------->8---
>> 
>> Do you have an idea how to make it more clear?
>
> I don't think we have to mention it. Many package test suites
> automatically skip some subset of tests based on a variety of factors.

OK, I removed this comment.

[...]

>> +    (description "…")
>
> That's great! It's good to know this is a pycrypto fork. Pycrypto is
> abandoned so I'm glad to see new work around it.

OK.

Pushed as d32456d5a28ab5982030401ed830088f9d2e8fe4


Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30211] [PATCH 4/4] gnu: Add streamlink.

[Oleg Pykhalov]

* gnu/packages/video.scm (streamlink): New public variable.
---
 gnu/packages/video.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e7285e50b..bc00f1d2d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -89,6 +89,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages libreoffice)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
@@ -102,6 +103,7 @@
   #:use-module (gnu packages popt)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages ruby)
@@ -1725,6 +1727,33 @@ from various services and pipes them into a video playing application.")
     (home-page "http://livestreamer.io/")
     (license license:bsd-2)))
 
+(define-public streamlink
+  (package
+    (name "streamlink")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "streamlink" version))
+       (sha256
+        (base32
+         "1in0jqg9xpqwjkzskyy2iyq8zcfmsqich18mfyr47g62y3pjy98a"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/streamlink/streamlink")
+    (inputs
+     `(("python-pysocks" ,python-pysocks)
+       ("python-websocket-client" ,python-websocket-client)
+       ("python-iso3166" ,python-iso3166)
+       ("python-iso639" ,python-iso639)
+       ("python-pycryptodome" ,python-pycryptodome)
+       ("python-requests" ,python-requests)
+       ("python-pytest" ,python-pytest)
+       ("python-mock" ,python-mock)))
+    (synopsis "Extract streams from various services")
+    (description "Streamlink is command-line utility that extracts streams
+from various services and pipes them into a video player of choice.")
+    (license license:bsd-2)))
+
 (define-public mlt
   (package
     (name "mlt")
-- 
2.15.1

[bug#30211] [PATCH 4/4] gnu: Add streamlink.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1054 bytes --]

On Mon, Jan 22, 2018 at 11:05:25PM +0300, Oleg Pykhalov wrote:
> * gnu/packages/video.scm (streamlink): New public variable.

> +(define-public streamlink

> +    (inputs
> +     `(("python-pysocks" ,python-pysocks)
> +       ("python-websocket-client" ,python-websocket-client)
> +       ("python-iso3166" ,python-iso3166)
> +       ("python-iso639" ,python-iso639)
> +       ("python-pycryptodome" ,python-pycryptodome)
> +       ("python-requests" ,python-requests)
> +       ("python-pytest" ,python-pytest)
> +       ("python-mock" ,python-mock)))

In general, run-time Python dependencies need to be propagated-inputs.
However, some of these are probably only used while building and can be
native-inputs; I'd guess that pytest and mock are in that category.

> +    (synopsis "Extract streams from various services")
> +    (description "Streamlink is command-line utility that extracts streams
> +from various services and pipes them into a video player of choice.")

It would be helpful to mention some of the services that it can be used
with.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30211] [PATCH 4/4] gnu: Add streamlink.

[Oleg Pykhalov]

[-- Attachment #1.1: Type: text/plain, Size: 1928 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Mon, Jan 22, 2018 at 11:05:25PM +0300, Oleg Pykhalov wrote:
>> * gnu/packages/video.scm (streamlink): New public variable.
>
>> +(define-public streamlink
>
>> +    (inputs
>> +     `(("python-pysocks" ,python-pysocks)
>> +       ("python-websocket-client" ,python-websocket-client)
>> +       ("python-iso3166" ,python-iso3166)
>> +       ("python-iso639" ,python-iso639)
>> +       ("python-pycryptodome" ,python-pycryptodome)
>> +       ("python-requests" ,python-requests)
>> +       ("python-pytest" ,python-pytest)
>> +       ("python-mock" ,python-mock)))
>
> In general, run-time Python dependencies need to be propagated-inputs.
> However, some of these are probably only used while building and can be
> native-inputs; I'd guess that pytest and mock are in that category.

Oh, yes.  guix lint warns about pytest and mock.  Thanks for notice!

Everything else probably required at run time.

>> +    (synopsis "Extract streams from various services")
>> +    (description "Streamlink is command-line utility that extracts streams
>> +from various services and pipes them into a video player of choice.")
>
> It would be helpful to mention some of the services that it can be used
> with.

Dunno about services.  I use it as livestreamer:
--8<---------------cut here---------------start------------->8---
    # View a video stream from a predefined services in MPV
    streamlink -p mpv URL QUALITY
--8<---------------cut here---------------end--------------->8---


By the way livestreamer is not maintained anymore.

From <https://github.com/chrippa/livestreamer>:

    Command-line utility that extracts streams from various services and
    pipes them into a video player of choice. No longer maintained, use
    streamlink or youtube-dl instead.

Probably livestreamer should be removed from Guix, but I'm not sure.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH 4/4] gnu: Add streamlink. --]
[-- Type: text/x-patch, Size: 2423 bytes --]

From eac6cf3575094e32d029a325397566b21fce2d18 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Fri, 19 Jan 2018 22:59:12 +0300
Subject: [PATCH] gnu: Add streamlink.

* gnu/packages/video.scm (streamlink): New public variable.
---
 gnu/packages/video.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e7285e50b..fe8bcac99 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -89,6 +89,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages libreoffice)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
@@ -102,6 +103,7 @@
   #:use-module (gnu packages popt)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages ruby)
@@ -1725,6 +1727,34 @@ from various services and pipes them into a video playing application.")
     (home-page "http://livestreamer.io/")
     (license license:bsd-2)))
 
+(define-public streamlink
+  (package
+    (name "streamlink")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "streamlink" version))
+       (sha256
+        (base32
+         "1in0jqg9xpqwjkzskyy2iyq8zcfmsqich18mfyr47g62y3pjy98a"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/streamlink/streamlink")
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-mock" ,python-mock)))
+    (propagated-inputs
+     `(("python-pysocks" ,python-pysocks)
+       ("python-websocket-client" ,python-websocket-client)
+       ("python-iso3166" ,python-iso3166)
+       ("python-iso639" ,python-iso639)
+       ("python-pycryptodome" ,python-pycryptodome)
+       ("python-requests" ,python-requests)))
+    (synopsis "Extract streams from various services")
+    (description "Streamlink is command-line utility that extracts streams
+from various services and pipes them into a video player of choice.")
+    (license license:bsd-2)))
+
 (define-public mlt
   (package
     (name "mlt")
-- 
2.15.1


[-- Attachment #1.3: Type: text/plain, Size: 8 bytes --]



Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30211] [PATCH 4/4] gnu: Add streamlink.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 1954 bytes --]

Leo Famulari <leo@famulari.name> writes:

[...]

> It would be helpful to mention some of the services that it can be used
> with.

Or do you mean to list those services as an example?

The issue is I don't know what are free and non-free.

From streamlink source 'plugins/' directory:

    adultswim afreeca afreecatv aftonbladet akamaihd aliez aljazeeraen
    animelab antenna apac app17 arconai ard_live ard_mediathek artetv
    atresplayer bambuser bbciplayer beam beattv bfmtv bigo bilibili
    bloomberg bongacams brightcove brittv btv cam4 camsoda canalplus
    canlitv cdnbg ceskatelevize chaturbate cinergroup common_jwplayer
    common_swf connectcast crunchyroll cybergame cyro dailymotion
    daisuki deutschewelle dingittv disney_de dmcloud_embed dmcloud dogan
    dogus dommune douyutv dplay drdk earthcam ellobo eltrecetv eurocom
    euronews expressen facebook filmon filmon_us foxtr funimationnow
    furstream gardenersworld garena gomexp goodgame googledrive gulli
    hds hitbox hls http huajiao huomao huya ine __init__ itvplayer
    kanal7 liveedu liveme livestream looch media_ccc_de mediaklikk mips
    mitele mlgtv nbc nbcsports nhkworld nineanime nos npo nrk
    oldlivestream openrectv orf_tvthek ovvatv pandatv periscope picarto
    piczel playtv pluzz powerapp radionet raiplay rte rtlxl rtmp rtpplay
    rtve rtvs ruv schoolism seemeplay seetv servustv showroom skai
    speedrunslive sportal sportschau srgssr ssh101 startv streamable
    streamboat streamingvideoprovider streamlive streamme streamupcom
    streann svtplay swisstxt teamliquid telefe tf1 tga theplatform
    tigerdile trt trtspor turkuvaz tv1channel tv360 tv3cat tv4play
    tv5monde tv8cat tv8 tvcatchup tvnbg tvplayer tvrby tvrplus twitch
    ufctv ustreamtv vaughnlive vgtv viasat_embed viasat vidio vk vrtbe
    wattv webcast_india_gov webtv weeb wwenetwork younow youtube zattoo
    zdf_mediathek zhanqi

Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30211] [PATCH 4/4] gnu: Add streamlink.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]

On Tue, Jan 23, 2018 at 02:05:44PM +0300, Oleg Pykhalov wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> [...]
> 
> > It would be helpful to mention some of the services that it can be used
> > with.
> 
> Or do you mean to list those services as an example?
> 
> The issue is I don't know what are free and non-free.
> 
> From streamlink source 'plugins/' directory:

Wow, long list! I would just mention a few major ones so that people
searching with `guix package --search` might get a useful result.

As for the free-ness of the services, I don't think that services are
meaningfully free or non-free in the sense that a piece of software is.
The whole point of a service is that someone else runs it, hence the
term "Service as a Software Substitute" (SaaSS) [0].

But we should still exercise our good taste in this matter. And I don't
know what Guix's guidelines, the Free System Distribution Guidelines,
have to say about it. In any case, we have youtube-dl packaged, and that
mentions YouTube explicitly.

[0] To quote Richard Stallman:

"Many free software supporters assume that the problem of SaaSS will be
solved by developing free software for servers. For the server
operator's sake, the programs on the server had better be free; if they
are proprietary, their developers/owners have power over the server.
That's unfair to the server operator, and doesn't help the server's
users at all. But if the programs on the server are free, that doesn't
protect the server's users from the effects of SaaSS. These programs
liberate the server operator, but not the server's users."

https://www.gnu.org/philosophy/who-does-that-server-really-serve.en.html

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#30211: [PATCH 4/4] gnu: Add streamlink.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 942 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Tue, Jan 23, 2018 at 02:05:44PM +0300, Oleg Pykhalov wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> 
>> [...]
>> 
>> > It would be helpful to mention some of the services that it can be used
>> > with.
>> 
>> Or do you mean to list those services as an example?
>> 
>> The issue is I don't know what are free and non-free.
>> 
>> From streamlink source 'plugins/' directory:
>
> Wow, long list! I would just mention a few major ones so that people
> searching with `guix package --search` might get a useful result.

Thank you for the quote and reference to Richard's article!  Well, I'll
add Twitch.tv in the description.  :-\

Also a new version of streamlink was published (thanks guix lint for
notice).  I'll bump a version and add python-requests-mock to
native-inputs as a new test dependency.

Pushed as f48feaa2848d999e100f27301680a01dc3bd7733

Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30211] [PATCH 2/4] gnu: Add python-iso3166.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 406 bytes --]

On Mon, Jan 22, 2018 at 11:05:23PM +0300, Oleg Pykhalov wrote:
> * gnu/packages/iso-codes.scm (python-iso3166): New public variable.

> +    (synopsis "Self-contained ISO 3166-1 country definitions")
> +    (description "This package provides a ISO 3166-1 country definitions.")
                                           |
Please replace ---------------------------'a' with 'the'.

LGTM with that change!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30211] [PATCH 2/4] gnu: Add python-iso3166.

[Oleg Pykhalov]

[-- Attachment #1.1: Type: text/plain, Size: 848 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Mon, Jan 22, 2018 at 11:05:23PM +0300, Oleg Pykhalov wrote:
>> * gnu/packages/iso-codes.scm (python-iso3166): New public variable.
>
>> +    (synopsis "Self-contained ISO 3166-1 country definitions")
>> +    (description "This package provides a ISO 3166-1 country definitions.")
>                                            |
> Please replace ---------------------------'a' with 'the'.
>
> LGTM with that change!

OK, done.

Also I fixed another lint warning:
--8<---------------cut here---------------start------------->8---
/home/natsu/src/guix-wip-streamlink/gnu/packages/iso-codes.scm:92:2:
python-iso3166@0.8: permanent redirect from
http://github.com/deactivated/python-iso3166 to
https://github.com/deactivated/python-iso3166
--8<---------------cut here---------------end--------------->8---


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH 2/4] gnu: Add python-iso3166. --]
[-- Type: text/x-patch, Size: 1329 bytes --]

From 2d71acfbb99e272808b6ffb44d38a6d32975ee02 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Fri, 19 Jan 2018 23:09:05 +0300
Subject: [PATCH] gnu: Add python-iso3166.

* gnu/packages/iso-codes.scm (python-iso3166): New public variable.
---
 gnu/packages/iso-codes.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm
index 929bb5826..9f67cf286 100644
--- a/gnu/packages/iso-codes.scm
+++ b/gnu/packages/iso-codes.scm
@@ -87,3 +87,23 @@ groups.")
 
 (define-public python2-iso639
   (package-with-python2 python-iso639))
+
+(define-public python-iso3166
+  (package
+    (name "python-iso3166")
+    (version "0.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "iso3166" version))
+       (sha256
+        (base32
+         "0cs9w507dj93jj9z9di93lx2fplf8pma4jkrsvvb258dv6z1gszv"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/deactivated/python-iso3166")
+    (synopsis "Self-contained ISO 3166-1 country definitions")
+    (description "This package provides the ISO 3166-1 country definitions.")
+    (license license:expat)))
+
+(define-public python2-iso3166
+  (package-with-python2 python-iso3166))
-- 
2.15.1


[-- Attachment #1.3: Type: text/plain, Size: 7 bytes --]


Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30211] [PATCH 2/4] gnu: Add python-iso3166.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

Oleg Pykhalov <go.wigust@gmail.com> writes:

> Leo Famulari <leo@famulari.name> writes:

[...]

>>> +    (description "This package provides a ISO 3166-1 country definitions.")
>>                                            |
>> Please replace ---------------------------'a' with 'the'.
>>
>> LGTM with that change!
>
> OK, done.
>
> Also I fixed another lint warning:
>
> /home/natsu/src/guix-wip-streamlink/gnu/packages/iso-codes.scm:92:2:
> python-iso3166@0.8: permanent redirect from
> http://github.com/deactivated/python-iso3166 to
> https://github.com/deactivated/python-iso3166

Pushed as da061b84d65b6365ae673114fbbd1dd738a9df5b


Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30211] gnu: Add streamlink (program to extract streams from various services).

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 618 bytes --]

On Mon, Jan 22, 2018 at 10:33:53PM +0300, Oleg Pykhalov wrote:
> From 12f249e717b023a7de3c34763a9a0d7889bbf481 Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Fri, 19 Jan 2018 22:58:01 +0300
> Subject: [PATCH 1/4] gnu: Add python-iso639.
> 
> * gnu/packages/iso-codes.scm (python-iso639): New public variable.

Thanks!

> +    (synopsis "Python library for ISO 639 standard")
> +    (description "This package provides a Python library for ISO 639
> +standard.")

Can you add a sentence describing this standard? I guess it has
something to do with the names of languages?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30211] gnu: Add streamlink (program to extract streams from various services).

[Oleg Pykhalov]

[-- Attachment #1.1: Type: text/plain, Size: 506 bytes --]

Leo Famulari <leo@famulari.name> writes:

[...]

>> +    (synopsis "Python library for ISO 639 standard")
>> +    (description "This package provides a Python library for ISO 639
>> +standard.")
>
> Can you add a sentence describing this standard? I guess it has
> something to do with the names of languages?

I guess the following is good enough

    "This package provides a Python library for ISO 639 standard
    that is concerned with representation of names for languages and language
    groups."


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH 1/4] gnu: Add python-iso639. --]
[-- Type: text/x-patch, Size: 1807 bytes --]

From 19bdc67d3a5ce1456174f632cb60cbffccbf141e Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Fri, 19 Jan 2018 22:58:01 +0300
Subject: [PATCH] gnu: Add python-iso639.

* gnu/packages/iso-codes.scm (python-iso639): New public variable.
---
 gnu/packages/iso-codes.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm
index ccd07706c..929bb5826 100644
--- a/gnu/packages/iso-codes.scm
+++ b/gnu/packages/iso-codes.scm
@@ -23,6 +23,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python))
@@ -64,3 +65,25 @@ infrastructure.  Moreover, the programmer does not need to follow
 changes in the ISO standard and will not work with outdated
 information.")
     (license license:gpl2+)))           ; some bits use the lgpl2
+
+(define-public python-iso639
+  (package
+    (name "python-iso639")
+    (version "0.4.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "iso-639" version))
+       (sha256
+        (base32
+         "0jffmh4m20q8j27xb2fqbnlghjj0cx8pgsbzqisdg65qh2wd976w"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/noumar/iso639")
+    (synopsis "Python library for ISO 639 standard")
+    (description "This package provides a Python library for ISO 639 standard
+that is concerned with representation of names for languages and language
+groups.")
+    (license license:agpl3+)))
+
+(define-public python2-iso639
+  (package-with-python2 python-iso639))
-- 
2.15.1


[-- Attachment #1.3: Type: text/plain, Size: 7 bytes --]


Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30211] gnu: Add streamlink (program to extract streams from various services).

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 641 bytes --]

On Tue, Jan 23, 2018 at 01:47:39PM +0300, Oleg Pykhalov wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> [...]
> 
> >> +    (synopsis "Python library for ISO 639 standard")
> >> +    (description "This package provides a Python library for ISO 639
> >> +standard.")
> >
> > Can you add a sentence describing this standard? I guess it has
> > something to do with the names of languages?
> 
> I guess the following is good enough
> 
>     "This package provides a Python library for ISO 639 standard
>     that is concerned with representation of names for languages and language
>     groups."

Yes, that's perfect!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30211] gnu: Add streamlink (program to extract streams from various services).

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 775 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Tue, Jan 23, 2018 at 01:47:39PM +0300, Oleg Pykhalov wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> 
>> [...]
>> 
>> >> +    (synopsis "Python library for ISO 639 standard")
>> >> +    (description "This package provides a Python library for ISO 639
>> >> +standard.")
>> >
>> > Can you add a sentence describing this standard? I guess it has
>> > something to do with the names of languages?
>> 
>> I guess the following is good enough
>> 
>>     "This package provides a Python library for ISO 639 standard
>>     that is concerned with representation of names for languages and language
>>     groups."
>
> Yes, that's perfect!

OK, pushed as 3cf3836244c4fc49ff4d4513509b9d9f55ceda66


Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]