--- Begin Message ---
|
Subject: |
[PATCH] gnu: streamlink: Update to 3.2.0. |
|
Date: |
Mon, 21 Mar 2022 20:49:55 -0400 |
* gnu/packages/video.scm (streamlink): Update to 3.2.0.
[inputs]: Add python-lxml and python-pycountry, remove python-iso3166 and
python-iso639.
[arguments]<#:phases>{check}: Use pytest and skip some failing tests.
* gnu.packages/xml.scm (python-lxml): Update to 4.7.1.
---
gnu/packages/video.scm | 23 +++++++++++++++++------
gnu/packages/xml.scm | 4 ++--
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc05c0a222..a9ba40e302 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -60,6 +60,7 @@
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2022 Bird <birdsite@airmail.cc>
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
+;;; Copyright © 2022 Chadwain Holness <chadwainholness@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3135,28 +3136,38 @@ (define-public xvid
(define-public streamlink
(package
(name "streamlink")
- (version "2.0.0")
+ (version "3.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "streamlink" version))
(sha256
(base32
- "1nv2kj1k42a1b20ws8sdzlxk3wh1qz6pg5mxp75433b3c7lxksn0"))))
+ "09nrspga15svzi0hmakcarbciav0nzf30hg1ff53gia473cd4w4p"))))
(build-system python-build-system)
- (home-page "https://github.com/streamlink/streamlink";)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'skip-failing-tests
+ (lambda _ (substitute* "tests/utils/test_l10n.py"
+ (("^import streamlink" all)
+ (string-append "import pytest\n" all))
+ (("(\\s*)def
(test_equivalent|test_equivalent_remap|test_get_language|test_language_a3_no_a2|test_language_en)\\b"
all indent)
+ (string-append indent "@pytest.mark.skip(\"Skipped by
Guix.\")\n" all)))))
+ (replace 'check
+ (lambda _ (invoke "python" "-m" "pytest"))))))
(native-inputs
- (list python-freezegun python-pytest python-mock
+ (list python-freezegun python-mock python-pytest
python-requests-mock))
(propagated-inputs
(list python-pysocks
python-websocket-client
- python-iso3166
- python-iso639
python-isodate
+ python-lxml
+ python-pycountry
python-pycryptodome
python-requests
python-urllib3))
+ (home-page "https://github.com/streamlink/streamlink";)
(synopsis "Extract streams from various services")
(description "Streamlink is command-line utility that extracts streams
from sites like Twitch.tv and pipes them into a video player of choice.")
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 49275c3e0c..50f552e048 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2500,13 +2500,13 @@ (define-public python-elementpath
(define-public python-lxml
(package
(name "python-lxml")
- (version "4.6.3")
+ (version "4.7.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "lxml" version))
(sha256
- (base32 "0s14r1w2x9sdlcsw8mxiqgw4rz5zs5lpqpxrfyn4a1mkndqqbdrr"))
+ (base32 "090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1"))
;; Adapt a test to libxml2 2.9.12, taken from this commit:
;; https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047e
(modules '((guix build utils)))
--
2.35.1
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: bug#54515: [PATCH] gnu: streamlink: Update to 3.2.0. |
|
Date: |
Fri, 15 Apr 2022 19:20:19 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) |
Hi!
I ended up with a middleground solution in commit
ff3355dcbf155fcdb3ff1502efe13d969c5d6979.
Let me know if anything’s amiss.
Thanks,
Ludo’.
--- End Message ---