From a801c7379a534a2896a03a1a6f8b47eb92691b00 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 15:52:39 -0500 Subject: gnu: Remove QT 4. For more information, see: https://lists.gnu.org/archive/html/guix-devel/2016-02/msg00596.html https://bugs.gnu.org/45704 * gnu/packages/qt.scm (qt-4, python2-pyqt-4): Remove variables. * gnu/packages/engineering.scm (qucs, qucs-s): Remove variables. * gnu/packages/messaging.scm (pybitmessage): Remove variable. * gnu/packages/password-utils.scm (keepassx): Remove variable. * gnu/packages/pdf.scm (poppler-qt4): Remove variable. --- gnu/packages/messaging.scm | 93 ---------------------------------------------- 1 file changed, 93 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a967ac31c2..5c55e08fb2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1616,99 +1616,6 @@ guidelines. It provides an easy to use application that allows you to connect with friends and family without anyone else listening in.") (license license:gpl3+))) -(define-public pybitmessage - (package - (name "pybitmessage") - (version "0.6.3.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Bitmessage/PyBitmessage") - (commit version))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35")))) - (propagated-inputs - ;; TODO: - ;; Package "pyopencl", required in addition to numpy for OpenCL support. - ;; Package "gst123", required in addition to alsa-utils and - ;; mpg123 for sound support. - `(("python2-msgpack" ,python2-msgpack) - ("python2-pythondialog" ,python2-pythondialog) - ("python2-pyqt-4" ,python2-pyqt-4) - ("python2-sip" ,python2-sip) - ("python2-pysqlite" ,python2-pysqlite) - ("python2-pyopenssl" ,python2-pyopenssl))) - (native-inputs - `(("openssl" ,openssl))) - (build-system python-build-system) - (arguments - `(#:modules ((guix build python-build-system) - (guix build utils)) - #:tests? #f ;no test target - #:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-unmatched-python-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/bitmessagemain.py" - (("#!/usr/bin/env python2.7") - (string-append "#!" (which "python")))) - (substitute* "src/bitmessagecli.py" - (("#!/usr/bin/env python2.7.x") - (string-append "#!" (which "python")))) - #t)) - (add-after 'unpack 'fix-depends - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/depends.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so"))) - #t)) - (add-after 'unpack 'fix-local-files-in-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/proofofwork.py" - (("bitmsghash.so") - (string-append (assoc-ref outputs "out") - "/lib/bitmsghash.so"))) - #t)) - (add-after 'unpack 'fix-pyelliptic - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/pyelliptic/openssl.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so")) - (("libssl.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libssl.so"))) - #t)) - (add-after 'unpack 'noninteractive-build - ;; This applies upstream commit 4c597d3f7cf9f83a763472aa165a1a4292019f20 - (lambda _ - (substitute* "setup.py" - (("except NameError") - "except EOFError, NameError")) - #t)) - ;; XXX: python setup.py does not build and install bitmsghash, - ;; without it PyBitmessage tries to compile it at first run - ;; in the store, which due to obvious reasons fails. Do it - ;; and place it in /lib. - (add-after 'unpack 'build-and-install-bitmsghash - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "src/bitmsghash" - (system* "make") - (install-file "bitmsghash.so" - (string-append (assoc-ref outputs "out") "/lib"))) - #t))))) - (license license:expat) - (description - "Distributed and trustless peer-to-peer communications protocol -for sending encrypted messages to one person or many subscribers.") - (synopsis "Distributed peer-to-peer communication") - (home-page "https://bitmessage.org/"))) - (define-public ytalk (package (name "ytalk") -- cgit v1.2.3 From 685fa3f55f242d7884a3b6fac3fe4bbf9409064c Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:44 +0100 Subject: gnu: Add python-zulip. * gnu/packages/python-xyz.scm (python-zulip): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 5c55e08fb2..329b5f3322 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020, 2021 Robert Karszniewicz +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +90,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages matrix) #:use-module (gnu packages mono) #:use-module (gnu packages mpd) #:use-module (gnu packages ncurses) @@ -2859,4 +2861,51 @@ social and chat platform.") designed for experienced users.") (license license:gpl2+))) +(define-public python-zulip + (package + (name "python-zulip") + (version "0.7.1") + (source + (origin + ;; There is no source on Pypi. + (method git-fetch) + (uri (git-reference + (url "https://github.com/zulip/python-zulip-api") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0da1ki1v252avy27j6d7snnc0gyq0xa9fypm3qdmxhw2w79d6q36")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'cd-to-zulip-dir + (lambda _ + (chdir "zulip") + #t)) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (let ((test-zulip "../tools/test-zulip")) + (when tests? + (add-installed-pythonpath inputs outputs) + (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) + (patch-shebang test-zulip) + (invoke test-zulip)) + #t)))))) + (propagated-inputs + `(("python-matrix-client" ,python-matrix-client) + ("python-pyopenssl" ,python-pyopenssl) + ("python-requests" ,python-requests) + ("python-six" ,python-six))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-distro" ,python-distro) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/zulip/python-zulip-api") + (synopsis "Zulip's API Python bindings") + (description + "This package provides Python bindings to Zulip's API.") + (license license:asl2.0))) + ;;; messaging.scm ends here -- cgit v1.2.3 From 673031c7628ed7ad9accfb98aa45f3da7cbc75ce Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:45 +0100 Subject: gnu: Add zulip-term. * gnu/packages/messaging.scm (zulip-term): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 329b5f3322..388e7f2ead 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -103,6 +103,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -2908,4 +2909,55 @@ designed for experienced users.") "This package provides Python bindings to Zulip's API.") (license license:asl2.0))) +(define-public zulip-term + (package + (name "zulip-term") + (version "0.5.2") + (source + (origin + ;; Pypi package doesn't ship tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/zulip/zulip-terminal") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "setup.py" + (("\\=\\=1\\.7") ">=1.7") ; pytest-mock + (("\\=\\=2\\.5") ">=2.5") ; pytest-cov + (("4\\.5\\.2") "4.4.2")) ; lxml + #t)))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Delete failing tests. + (delete-file "tests/cli/test_run.py") + (invoke "pytest")) + #t))))) + (inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-lxml" ,python-lxml) + ("python-mypy-extensions" ,python-mypy-extensions) + ("python-urwid" ,python-urwid) + ("python-urwid-readline" ,python-urwid-readline) + ("python-zulip" ,python-zulip))) + (native-inputs + `(("python-distro" ,python-distro) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-mock" ,python-pytest-mock))) + (home-page "https://github.com/zulip/zulip-terminal") + (synopsis "Zulip's official terminal client") + (description "This package contains Zulip's official terminal client.") + (license license:asl2.0))) + ;;; messaging.scm ends here -- cgit v1.2.3 From 8d89d3c9bf7cacd9c79b4aacf348044d4fe7800b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Apr 2021 23:14:13 +0200 Subject: gnu: pidgin: Update to 2.14.2. * gnu/packages/messaging.scm (pidgin): Update to 2.14.2. [source]: Remove pidgin-vv-gst.patch. * gnu/packages/patches/pidgin-vv-gst.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/messaging.scm | 8 ++---- gnu/packages/patches/pidgin-vv-gst.patch | 48 -------------------------------- 3 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 gnu/packages/patches/pidgin-vv-gst.patch (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 0d472072ae..26976f73cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1525,7 +1525,6 @@ dist_patch_DATA = \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ - %D%/packages/patches/pidgin-vv-gst.patch \ %D%/packages/patches/pinball-const-fix.patch \ %D%/packages/patches/pinball-cstddef.patch \ %D%/packages/patches/pinball-missing-separators.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 388e7f2ead..e8b67c03bc 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -788,7 +788,7 @@ authentication.") (define-public pidgin (package (name "pidgin") - (version "2.14.1") + (version "2.14.2") (source (origin (method url-fetch) @@ -796,11 +796,9 @@ authentication.") (string-append "mirror://sourceforge/pidgin/Pidgin/" version "/pidgin-" version ".tar.gz")) (sha256 - (base32 "1c4dzxg9c3d9zfqqa7jwijj9rv9fm6w95igmpljwy88lxq7v5w11")) + (base32 "19r297ynxizdj357ihmy0sgpgfikdzblkszlwlqnsr3lvbjhhsg1")) (patches - (search-patches - "pidgin-add-search-path.patch" - "pidgin-vv-gst.patch")) + (search-patches "pidgin-add-search-path.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/pidgin-vv-gst.patch b/gnu/packages/patches/pidgin-vv-gst.patch deleted file mode 100644 index e0553dd119..0000000000 --- a/gnu/packages/patches/pidgin-vv-gst.patch +++ /dev/null @@ -1,48 +0,0 @@ -Name: Gary Kramlich -Date: 2020-07-12 -Source: https://keep.imfreedom.org/pidgin/pidgin/rev/39ac50435cfb - -diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c ---- a/libpurple/mediamanager.c -+++ b/libpurple/mediamanager.c -@@ -2231,6 +2231,7 @@ - purple_media_manager_unregister_gst_device(PurpleMediaManager *manager, - GstDevice *device) - { -+#ifdef USE_VV - GList *i; - gchar *name; - gchar *device_class; -@@ -2277,6 +2278,7 @@ - - g_free(name); - g_free(device_class); -+#endif /* USE_VV */ - } - - static gboolean -@@ -2304,7 +2306,7 @@ - static void - purple_media_manager_init_device_monitor(PurpleMediaManager *manager) - { --#if GST_CHECK_VERSION(1, 4, 0) -+#if GST_CHECK_VERSION(1, 4, 0) && defined(USE_VV) - GstBus *bus; - GList *i; - -@@ -2334,6 +2336,7 @@ - PurpleMediaElementType type) - { - GList *result = NULL; -+#ifdef USE_VV - GList *i; - - for (i = manager->priv->elements; i; i = i->next) { -@@ -2347,6 +2350,7 @@ - result = g_list_prepend(result, info); - } - } -+#endif /* USE_VV */ - - return result; - } -- cgit v1.2.3 From 8615e21a8cfb01882b4785c950ccb89edc9c4bcc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 18:23:50 +0200 Subject: gnu: pidgin: Update to 2.14.3. * gnu/packages/messaging.scm (pidgin): Update to 2.14.3. [arguments]: Add an 'eat-leftovers phase. --- gnu/packages/messaging.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e8b67c03bc..64aada69f5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -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 + ;; . + (lambda _ + ;; Remove a lingering [broken] oscar reference. + (substitute* "libpurple/tests/check_libpurple.c" + ((".*oscar_util_suite.*") ""))))))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 2323a38b0170453f1942372f8bbae58c5660d20f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Apr 2021 15:07:37 +0300 Subject: gnu: hangups: Loosen version restrictions further. * gnu/packages/messaging.scm (hangups)[arguments]: Adjust custom 'relax-dependencies phase to allow more dependency versions. --- gnu/packages/messaging.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 64aada69f5..fa08a33d8f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2015, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur @@ -2428,7 +2428,8 @@ QMatrixClient project.") ;; Relax overly strict package version specifications. (lambda _ (substitute* "setup.py" - (("==") ">=")) + (("==") ">=") + ((",<.*'") "'")) #t))))) (propagated-inputs `(("python-aiohttp" ,python-aiohttp) -- cgit v1.2.3 From 29f205f7e060c70895f34521995c147f77bba9eb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Apr 2021 15:14:12 +0300 Subject: gnu: hangups: Run test suite. * gnu/packages/messaging.scm (hangups)[arguments]: Use custom 'check phase. --- gnu/packages/messaging.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fa08a33d8f..1cb78aa9b3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2430,6 +2430,11 @@ QMatrixClient project.") (substitute* "setup.py" (("==") ">=") ((",<.*'") "'")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "hangups")) #t))))) (propagated-inputs `(("python-aiohttp" ,python-aiohttp) -- cgit v1.2.3