From fab455840ea883237d2715bde313e07558f4bfba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 11:33:39 +0100 Subject: gnu: libtoxcore: Remove custom bootstrap phase. * gnu/packages/messaging.scm (libtoxcore)[arguments]: Remove autoconf phase. --- gnu/packages/messaging.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index de33d737e2..1a7560bd72 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -855,13 +855,7 @@ protocols.") `(("libsodium" ,libsodium) ("opus" ,opus) ("libvpx" ,libvpx))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))) - #:tests? #f)) ; FIXME: Testsuite fails, reasons unspecific. + (arguments `(#:tests? #f)) ; FIXME: Testsuite fails, reasons unspecific. (synopsis "Library for the Tox encrypted messenger protocol") (description "C library implementation of the Tox encrypted messenger protocol.") -- cgit v1.2.3 From a311f42e1bcb71b59e3ce51ee3c8f6148d939168 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sun, 11 Nov 2018 12:26:03 +0100 Subject: gnu: python-nbxmpp: Update to 0.6.8. * gnu/packages/messaging.scm (python-nbxmpp): Update to 0.6.8. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1a7560bd72..987426794b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -549,14 +549,14 @@ simultaneously and therefore appear under the same nickname on IRC.") (define-public python-nbxmpp (package (name "python-nbxmpp") - (version "0.6.7") + (version "0.6.8") (source (origin (method url-fetch) (uri (pypi-uri "nbxmpp" version)) (sha256 (base32 - "0fas4iawjfdmkz8vr042wpq6b2qispi6fy35g4a62jw50jb1saav")))) + "1iip8ijxp86fx4bl1h67p2lp02p2zm1ga2p3q43nv30smj54nawc")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests -- cgit v1.2.3 From 992a496503a49ef7977f097a1390f8536b06dee4 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Thu, 8 Nov 2018 10:13:44 +0100 Subject: gnu: gajim: Update to 1.1.0. * gnu/packages/messaging.scm (gajim): Update to 1.1.0. [arguments]: Set #:test-target to "test_nogui". Remove the 'remove-test-resolver' and 'start-xserver' phases. [inputs]: Remove python-pyasn1. Add python-cssutils, python-keyring and python-precis-i18n. --- gnu/packages/messaging.scm | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 987426794b..5f1aa7ce58 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -574,7 +574,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (define-public gajim (package (name "gajim") - (version "1.0.3") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://gajim.org/downloads/" @@ -582,10 +582,11 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") "/gajim-" version ".tar.bz2")) (sha256 (base32 - "0ds4rqwfrpj89a489w6yih8gx5zi7qa4ffgld950fk7s0qxvcfnb")))) + "1qis8vs7y7g1zn5i5dshwrszidc22qpflycwb4nixvp9lbmkq0va")))) (build-system python-build-system) (arguments - `(#:phases + `(#:test-target "test_nogui" + #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) @@ -598,20 +599,6 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) '("gajim" "gajim-remote" "gajim-history-manager"))) #t)) - (add-before 'check 'remove-test-resolver - ;; This test requires network access. - (lambda _ - (substitute* "test/runtests.py" - (("'integration.test_resolver',") "")) - #t)) - (add-before 'check 'start-xserver - ;; Tests require a running X server. - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (display ":1")) - (setenv "DISPLAY" display) - (zero? (system (string-append xorg-server "/bin/Xvfb " - display " &")))))) (add-after 'install 'install-icons (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -648,12 +635,14 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") ("hicolor-icon-theme" ,hicolor-icon-theme) ("libsecret" ,libsecret) ("python-axolotl" ,python-axolotl) + ("python-cssutils" ,python-cssutils) ("python-dbus" ,python-dbus) ("python-docutils" ,python-docutils) ("python-gnupg" ,python-gnupg) + ("python-keyring" ,python-keyring) ("python-nbxmpp" ,python-nbxmpp) ("python-pillow" ,python-pillow) - ("python-pyasn1" ,python-pyasn1) + ("python-precis-i18n" ,python-precis-i18n) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) ("python-pyopenssl" ,python-pyopenssl) -- cgit v1.2.3 From 60c5b4448961ce1745b7f0bfada1e7620f238ea0 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sun, 11 Nov 2018 15:34:06 +0100 Subject: gnu: gajim: Get the second 'wrap-program' phase to return #t. * gnu/packages/messaging.scm (gajim)[arguments]: Get the second 'wrap-program' phase to return #t. --- gnu/packages/messaging.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 5f1aa7ce58..c276bc03ea 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -623,7 +623,8 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") ;; For GtkFileChooserDialog. `("GSETTINGS_SCHEMA_DIR" = (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas"))))))))) + "/share/glib-2.0/schemas")))) + #t))))) (native-inputs `(("intltool" ,intltool) ("xorg-server" ,xorg-server))) -- cgit v1.2.3 From 37a350eccee7b36cba779c6a6841448b8deaed72 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sun, 11 Nov 2018 15:24:00 +0100 Subject: gnu: gajim: Move python-docutils from inputs to native-inputs. * gnu/packages/messaging.scm (gajim): Move python-docutils from inputs to native-inputs. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c276bc03ea..9d652486f2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -627,6 +627,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") #t))))) (native-inputs `(("intltool" ,intltool) + ("python-docutils" ,python-docutils) ("xorg-server" ,xorg-server))) (inputs `(("adwaita-icon-theme" ,adwaita-icon-theme) @@ -638,7 +639,6 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") ("python-axolotl" ,python-axolotl) ("python-cssutils" ,python-cssutils) ("python-dbus" ,python-dbus) - ("python-docutils" ,python-docutils) ("python-gnupg" ,python-gnupg) ("python-keyring" ,python-keyring) ("python-nbxmpp" ,python-nbxmpp) -- cgit v1.2.3 From aaf0e47f6dbe4245ef5d38f69e0e4eb2855de15b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 20:50:30 +0100 Subject: gnu: libtoxcore: Update to 0.0.0-2.bf69b54. * gnu/packages/messaging.scm (libtoxcore): Update to 0.0.0-2.bf69b54. [native-inputs]: Add check. --- gnu/packages/messaging.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9d652486f2..a7b868ccc0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -818,8 +818,8 @@ protocols.") (license license:x11))) (define-public libtoxcore - (let ((revision "1") - (commit "755f084e8720b349026c85afbad58954cb7ff1d4")) + (let ((revision "2") + (commit "bf69b54f64003d160d759068f4816b2d9b2e1e21")) (package (name "libtoxcore") (version (string-append "0.0.0" "-" @@ -832,20 +832,19 @@ protocols.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0ap1gvlyihnfivv235dbrgsxsiiz70bhlmlr5gn1027w3h5kqz8w")))) + "11lqra4yd7v293cp286ynff5lqz1pprzg8vn3wq6vryj08g88zqb")))) (build-system gnu-build-system) + (arguments `(#:tests? #f)) ; FIXME: tests hang, some fail. (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) - ;; TODO: Add when test suite is capable of passing. - ;; ("check" ,check) + ("check" ,check) ("pkg-config" ,pkg-config))) (inputs `(("libsodium" ,libsodium) ("opus" ,opus) ("libvpx" ,libvpx))) - (arguments `(#:tests? #f)) ; FIXME: Testsuite fails, reasons unspecific. (synopsis "Library for the Tox encrypted messenger protocol") (description "C library implementation of the Tox encrypted messenger protocol.") -- cgit v1.2.3 From 6018683683ac49765ee0eda4cb09606f1d3689fe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Nov 2018 10:51:21 +0100 Subject: gnu: c-toxcore: Fetch sources from git. * gnu/packages/messaging.scm (c-toxcore)[source]: Fetch from git. --- gnu/packages/messaging.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a7b868ccc0..c22cacfd36 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -860,13 +860,14 @@ protocols.") (version "0.2.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/TokTok/c-toxcore/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/TokTok/c-toxcore.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0qlkimlvbd24nlj7w9b5rpz1r807magqxmfylc1mlxsqhmfi5zj7")))) + "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm")))) (arguments `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable ; for now. -- cgit v1.2.3