diff options
author | Mark H Weaver <mhw@netris.org> | 2016-01-24 21:04:54 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-01-24 21:04:54 -0500 |
commit | 412bee5e2931a53066ae593808935608d54a4345 (patch) | |
tree | 28b297694296115f056ead6de81d24bbd98d75f5 /gnu/packages/messaging.scm | |
parent | 68716289995d106c7adc779548eebc5df324e6cf (diff) | |
parent | 880d647d0f1a0ea0aea2af84fa2e99e3286b65a1 (diff) | |
download | guix-patches-412bee5e2931a53066ae593808935608d54a4345.tar guix-patches-412bee5e2931a53066ae593808935608d54a4345.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/messaging.scm')
-rw-r--r-- | gnu/packages/messaging.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 956045d420..23c7a0bbdd 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> @@ -425,7 +425,7 @@ was initially a fork of xmpppy, but is using non-blocking sockets.") (define-public gajim (package (name "gajim") - (version "0.16.4") + (version "0.16.5") (source (origin (method url-fetch) (uri (string-append "https://gajim.org/downloads/" @@ -433,10 +433,17 @@ was initially a fork of xmpppy, but is using non-blocking sockets.") "/gajim-" version ".tar.bz2")) (sha256 (base32 - "0zyfs7q1qg8iqszr8l1gb18gqla6zrrfsgpmbxblpi9maqxas5i1")))) + "14fhcqnkqygh91132dnf1idayj4r3iqbwb44sd3mxv20n6ribh55")))) (build-system gnu-build-system) (arguments - `(#:phases + `(;; The only check done by gajim-0.16.x is to check that the + ;; translations are up-to-date, and in 0.16.5 they are not, so + ;; "make check" fails. Therefore, we disable tests for now. + ;; + ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later. + ;; + #:tests? #f + #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) |