diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-04-13 16:36:03 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-04-13 16:36:03 +0200 |
| commit | b13ef6ee7489b78be7f700489792ea672de13d36 (patch) | |
| tree | 36ccb42dc688901c6419130479ef851d46addb79 /gnu/packages/messaging.scm | |
| parent | 533a893cc6b03f100566760d6e0c8e0500ed7082 (diff) | |
| parent | b5607d830c917c49ca9a7993962bd2b7c7be953c (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'gnu/packages/messaging.scm')
| -rw-r--r-- | gnu/packages/messaging.scm | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e8b67c03bc..1cb78aa9b3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2015, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org> @@ -788,7 +788,7 @@ authentication.") (define-public pidgin (package (name "pidgin") - (version "2.14.2") + (version "2.14.3") (source (origin (method url-fetch) @@ -796,7 +796,7 @@ authentication.") (string-append "mirror://sourceforge/pidgin/Pidgin/" version "/pidgin-" version ".tar.gz")) (sha256 - (base32 "19r297ynxizdj357ihmy0sgpgfikdzblkszlwlqnsr3lvbjhhsg1")) + (base32 "0vdfnm96m1kh4gm6xn6i7s9c5zjh1p18jg4595k4p5bplvd6fmm8")) (patches (search-patches "pidgin-add-search-path.patch")) (modules '((guix build utils))) @@ -875,7 +875,16 @@ authentication.") "/lib") (string-append "--with-tkconfig=" (assoc-ref %build-inputs "tk") - "/lib")))) + "/lib")) + #:phases + (modify-phases %standard-phases + (add-before 'check 'eat-leftovers + ;; XXX Remove when updating beyond 2.14.3. Equivalent to + ;; <https://keep.imfreedom.org/pidgin/pidgin/rev/d4d72fde60c2>. + (lambda _ + ;; Remove a lingering [broken] oscar reference. + (substitute* "libpurple/tests/check_libpurple.c" + ((".*oscar_util_suite.*") ""))))))) (native-search-paths (list (search-path-specification @@ -2419,7 +2428,13 @@ QMatrixClient project.") ;; Relax overly strict package version specifications. (lambda _ (substitute* "setup.py" - (("==") ">=")) + (("==") ">=") + ((",<.*'") "'")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "hangups")) #t))))) (propagated-inputs `(("python-aiohttp" ,python-aiohttp) |