summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2018-11-08 10:13:44 +0100
committerClément Lassieur <clement@lassieur.org>2018-11-11 15:59:07 +0100
commit992a496503a49ef7977f097a1390f8536b06dee4 (patch)
treedfbca861ee7027c8d06abb06092c9b74f97abcde
parenta311f42e1bcb71b59e3ce51ee3c8f6148d939168 (diff)
downloadpatches-992a496503a49ef7977f097a1390f8536b06dee4.tar
patches-992a496503a49ef7977f097a1390f8536b06dee4.tar.gz
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.
-rw-r--r--gnu/packages/messaging.scm25
1 files changed, 7 insertions, 18 deletions
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)